search for: list_al

...ertions(+), 2 deletions(-) diff --git a/info/nbdinfo.c b/info/nbdinfo.c index 1afdf98..2b22f51 100644 --- a/info/nbdinfo.c +++ b/info/nbdinfo.c @@ -31,6 +31,8 @@ #include <libnbd.h> +#define MIN(a,b) ((a) < (b) ? (a) : (b)) + static const char *progname; static FILE *fp; static bool list_all = false; @@ -267,7 +269,7 @@ main (int argc, char *argv[]) fprintf (fp, "%" PRIi64 "\n", size); } else if (map) { /* --map (!list_all) */ - uint64_t offset, prev_offset; + uint64_t offset, prev_offset, align, max_len; /* Did we get the reque...

This is a rough-and-ready implementation of nbdinfo --map option, to display the allocation and other metadata of NBD exports. I only tested it lightly against nbdkit. It needs at least some tests. Command like these should work: nbdinfo --map nbd://localhost nbdinfo --map=qemu:dirty-bitmap nbd://localhost Rich.

...ro + 327680 131072 0 allocated + 458752 589824 3 hole,zero" ]; then + echo "$0: unexpected output from nbdinfo --map" + exit 1 +fi diff --git a/info/nbdinfo.c b/info/nbdinfo.c index 647a24c..ff060aa 100644 --- a/info/nbdinfo.c +++ b/info/nbdinfo.c @@ -34,6 +34,7 @@ static bool list_all = false; static bool probe_content, content_flag, no_content_flag; static bool json_output = false; +static const char *map = NULL; static bool size_only = false; static struct export_list { @@ -49,6 +50,10 @@ static void list_one_export (struct nbd_handle *nbd, const char *desc, static voi...

...te a model called Category with "has_many :products" Now I should have a one to many link between the products and categories tables? Now I need to edit the Store Controller''s index method to display a list of categories instead of products def index @category = Category.list_all end and in the Category model add a list_all method like this: def self.list_all find(:all) end and finally in the Store index view (/store/index.rhtml) <% for category in @categories -%> <img src="<%= category.image_url %>"/> <h3><%= h(...

Fixes bugs with JSON output in the previous patch, and adds some tests. Rich.

...t;nbd+unix:///?socket=$unixsocket"' > $out ||: +test ! -s $out diff --git a/info/nbdinfo.c b/info/nbdinfo.c index 31e2508..24ec129 100644 --- a/info/nbdinfo.c +++ b/info/nbdinfo.c @@ -32,6 +32,7 @@ #include <libnbd.h> static const char *progname; +static FILE *fp; static bool list_all = false; static bool probe_content, content_flag, no_content_flag; static bool json_output = false; @@ -121,6 +122,8 @@ main (int argc, char *argv[]) int64_t size; const char *protocol; int tls_negotiated; + char *output = NULL; + size_t output_len = 0; progname = argv[0]; @@ -...

...usage (stderr, EXIT_FAILURE); /* You can combine certain options. */ - if (json_output && size_only) { - fprintf (stderr, "%s: you cannot use %s and %s together.\n", - argv[0], "--json", "--size"); - exit (EXIT_FAILURE); - } if (list_all && size_only) { fprintf (stderr, "%s: you cannot use %s and %s together.\n", argv[0], "--list", "--size"); -- 2.28.0

This rounds up the remaining bugs that I originally identified in: https://www.redhat.com/archives/libguestfs/2020-July/msg00153.html Eric Blake (4): api: Permit export list APIs when Connected info: Support --list with serializing servers info: Fix --json output when list size != 1 info: Permit --size --json generator/API.ml | 6 +++--- info/info-list-json.sh | 9 +++++++++

...info-list.sh \ info-list-json.sh \ diff --git a/info/nbdinfo.c b/info/nbdinfo.c index b54dfd4..394f5ac 100644 --- a/info/nbdinfo.c +++ b/info/nbdinfo.c @@ -29,7 +29,6 @@ #include <limits.h> #include <errno.h> -#include <libxml/uri.h> #include <libnbd.h> static bool list_all = false; @@ -422,7 +421,6 @@ static void list_all_exports (struct nbd_handle *nbd1, const char *uri) { int i; - xmlURIPtr xmluri = NULL; int count = nbd_get_nr_list_exports (nbd1); if (count == -1) { @@ -434,49 +432,38 @@ list_all_exports (struct nbd_handle *nbd1, const char *uri)...

.../info/nbdinfo.c @@ -37,7 +37,7 @@ static bool probe_content, content_flag, no_content_flag; static bool json_output = false; static bool size_only = false; -static void list_one_export (struct nbd_handle *nbd); +static void list_one_export (struct nbd_handle *nbd, const char *desc); static void list_all_exports (struct nbd_handle *nbd1, const char *uri); static void print_json_string (const char *); static char *get_content (struct nbd_handle *, int64_t size); @@ -243,7 +243,8 @@ main (int argc, char *argv[]) } if (!list_all) - list_one_export (nbd); + /* XXX We would need...

...name, const char *desc); static void list_one_export (struct nbd_handle *nbd, const char *desc, @@ -207,10 +213,10 @@ main (int argc, char *argv[]) nbd_set_uri_allow_local_file (nbd, true); /* Allow ?tls-psk-file. */ /* Set optional modes in the handle. */ - if (list_all) + if (!map && !size_only) { nbd_set_opt_mode (nbd, true); - if (!map && !size_only) nbd_set_full_info (nbd, true); + } if (map) nbd_add_meta_context (nbd, map); @@ -320,10 +326,32 @@ main (int argc, char *argv[]) } free (export_list.names); free (exp...

Well, I'm not quite done (I still want to get nbdinfo to work on a single nbd connection for all cases when reading the heads of the file is not required), but I'm happy with patches 1-11, and 12-13 show where I'm headed for getting NBD_OPT_INFO to work. Posting now to see if some of the earlier patches are ready to commit while I continue working on the latter half. Eric Blake (13):

This adds coalescing of adjacent extents of the same type, as mentioned by Eric Blake in the commit message here: https://github.com/libguestfs/libnbd/commit/46072f6611f80245846a445766da071e457b00cd The patch series is rather long because it detours through adding the <vector.h> library from nbdkit into libnbd and replacing ad hoc uses of realloc, char ** etc in various places. Rich.

An incremental improvement on top of listing exports. I still think it's worth experimenting with revisiting how our API for list mode should actually work [1] (so that we can reuse a single connection for both grabbing the list and finally using NBD_OPT_GO), but this change was easier to whip together while still thinking about that. [1]

This is a subset of my v2 posting, but limited to just the NBD_OPT_LIST handling. The biggest change since v2 is the addition of added unit testing in all four language bindings (C, python, ocaml, golang). The tests require nbdkit built from git on PATH, and may not be entirely idiomatic, but I at least validated that they catch issues (for example, adding an exit statement near the end of the

...; + char **names; + char **descs; +} export_list; + +static int collect_export (void *opaque, const char *name, + const char *desc); static void list_one_export (struct nbd_handle *nbd, const char *desc, bool first, bool last); static void list_all_exports (struct nbd_handle *nbd1, const char *uri); @@ -196,7 +204,8 @@ main (int argc, char *argv[]) } if (list_all) { - if (nbd_opt_list (nbd) == -1) { + if (nbd_opt_list (nbd, (nbd_list_callback) { + .callback = collect_export, .user_data = &export_list}) == -1) {...

...; + char **names; + char **descs; +} export_list; + +static int collect_export (void *opaque, const char *name, + const char *desc); static void list_one_export (struct nbd_handle *nbd, const char *desc, bool first, bool last); static void list_all_exports (struct nbd_handle *nbd1, const char *uri); @@ -196,7 +204,8 @@ main (int argc, char *argv[]) } if (list_all) { - if (nbd_opt_list (nbd) == -1) { + if (nbd_opt_list (nbd, (nbd_list_callback) { + .callback = collect_export, .user_data = &export_list}) == -1) {...

In v2: ack'ed preliminary patches have been pushed, and I've added a lot of testsuite coverage as well as putting the new API to use in nbdinfo. Eric Blake (2): api: Add nbd_opt_list_meta_context info: List available meta-contexts lib/internal.h | 1 + generator/API.ml | 84 ++++++++-