search for: reply_with_error_errno

...changed, 6 insertions(+) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index 62bdac7..9b52aa8 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2270,6 +2270,12 @@ do_btrfs_filesystem_show (const char *device) } else if (STRPREFIX (lines[i], "\t*** Some devices missing")) { reply_with_error_errno (ENODEV, "%s: missing devices", device); return NULL; + } else if (STRPREFIX (lines[i], "btrfs-progs v")) { + /* Older versions of btrfs-progs output also the version string + * (the same as `btrfs --version`. This has been fixed upstream + * since v4...

...sertions(+), 1 deletion(-) diff --git a/daemon/btrfs.c b/daemon/btrfs.c index d18f518..23513a9 100644 --- a/daemon/btrfs.c +++ b/daemon/btrfs.c @@ -2268,7 +2268,8 @@ do_btrfs_filesystem_show (const char *device) } else if (STRPREFIX (lines[i], "\t*** Some devices missing")) { reply_with_error_errno (ENODEV, "%s: missing devices", device); return NULL; - } else if (STRPREFIX (lines[i], "btrfs-progs v")) { + } else if (STRPREFIX (lines[i], "btrfs-progs v") || + STRPREFIX (lines[i], "Btrfs v")) { /* Older versions of btrfs...

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v4: introduce get_random_uuid improve testcases squash internal API patches v3.1: fix typos v3: set errno if feature is not available. Chen Hanxiao (7):

...> /* Send the magic length message which indicates that > * userspace is up inside the guest. > */ > @@ -1205,3 +1212,46 @@ cleanup_free_mountable (mountable_t *mountable) > free (mountable->volume); > } > } > + > +/* Convert an OCaml exception to a reply_with_error_errno call > + * as best we can. > + */ > +extern void ocaml_exn_to_reply_with_error (const char *func, value exn); > + > +void > +ocaml_exn_to_reply_with_error (const char *func, value exn) > +{ Shouldn't this use CAMLparam1 + CAMLreturn? > diff --git a/daemon/sysroot-c.c b...

In data mercoledì 24 giugno 2015 15:54:03, Chen Hanxiao ha scritto: > btrfs-progs v4.1 add support to change uuid of btrfs fs. > > Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com> > --- > v2: put btrfs operation back to daemon/btrfs.c > move tests to tests/btrfs > > daemon/btrfs.c | 60 ++++++++++++++++++++++++++++++++++++++++++ >

...om (device); + + else if (STREQ (vfs_type, "xfs")) + r = xfs_set_uuid_random (device); + + else if (STREQ (vfs_type, "swap")) + r = swap_set_uuid_random (device); + + else if (STREQ (vfs_type, "btrfs")) + r = btrfs_set_uuid_random (device); + + else { + reply_with_error_errno (ENOTSUP, "don't know how to set the random UUID for '%s' filesystems", + vfs_type); + r = -1; + } + + return r; +} diff --git a/generator/actions.ml b/generator/actions.ml index 372e50e..52404ab 100644 --- a/generator/actions.ml +++ b/generator/actio...

...;err, argv); if (r == -1) { - reply_with_error ("%s", err); + /* If the error is about the kernel operation not being supported + * for this filesystem type, then return errno ENOTSUP here. + */ + if (strstr (err, "discard operation is not supported")) + reply_with_error_errno (ENOTSUP, "%s", err); + else + reply_with_error ("%s", err); return -1; } -- 2.7.4

...a variant that takes a > generic (unit -> unit) function (called 'fn', maybe?), and have 'f' > use it: > > let f t fun arg = > f (fun () -> fun arg) I'm a bit confused, do you have a compilable example? > > +/* Convert an OCaml exception to a reply_with_error_errno call > > + * as best we can. > > + */ > > +extern void ocaml_exn_to_reply_with_error (const char *func, value exn); > > + > > +void > > +ocaml_exn_to_reply_with_error (const char *func, value exn) > > +{ > > Shouldn't this use CAMLparam1 + CAMLre...

...+++ b/daemon/btrfs.c @@ -874,6 +874,27 @@ btrfs_set_uuid (const char *device, const char *uuid) return 0; } +int +btrfs_set_uuid_random (const char *device) +{ + CLEANUP_FREE char *err = NULL; + int r; + int has_uuid_opts = test_btrfstune_uuid_opt(); + + if (has_uuid_opts <= 0) { + reply_with_error_errno (ENOTSUP, "btrfs filesystems' UUID cannot be changed"); + return -1; + } + + r = commandr (NULL, &err, str_btrfstune, "-f", "-u", device, NULL); + if (r == -1) { + reply_with_error ("%s: %s", device, err); + return -1; + } + + return 0;...

...en calling more more than a single-parameter function, it is slightly easier to read (IMHO, of course): let res = Chroot.f chroot (fun () -> ...) in than let res = Chroot.f chroot (fun () -> ...) () in This is mostly syntactic sugar. > > > +/* Convert an OCaml exception to a reply_with_error_errno call > > > + * as best we can. > > > + */ > > > +extern void ocaml_exn_to_reply_with_error (const char *func, value exn); > > > + > > > +void > > > +ocaml_exn_to_reply_with_error (const char *func, value exn) > > > +{ > > > &g...

...svalue) { @@ -807,6 +845,28 @@ do_btrfs_set_seeding (const char *device, int svalue) return 0; } +int +btrfs_set_uuid (const char *device, const char *uuid) +{ + CLEANUP_FREE char *err = NULL; + int r; + int has_uuid_opts = test_btrftune_uuid_opt (); + + if (has_uuid_opts <= 0) { + reply_with_error_errno (ENOTSUP, "btrfs filesystems' UUID cannot be changed"); + return -1; + } + + r = commandr (NULL, &err, str_btrfstune, "-f", "-U", uuid, device, NULL); + + if (r == -1) { + reply_with_error ("%s: %s", device, err); + return -1; + } + + re...

...value) { @@ -807,6 +845,28 @@ do_btrfs_set_seeding (const char *device, int svalue) return 0; } +int +btrfs_set_uuid (const char *device, const char *uuid) +{ + CLEANUP_FREE char *err = NULL; + int r; + int has_uuid_opts = test_btrfstune_uuid_opt (); + + if (has_uuid_opts <= 0) { + reply_with_error_errno (ENOTSUP, "btrfs filesystems' UUID cannot be changed"); + return -1; + } + + r = commandr (NULL, &err, str_btrfstune, "-f", "-U", uuid, device, NULL); + + if (r == -1) { + reply_with_error ("%s: %s", device, err); + return -1; + } + + re...

...value) { @@ -814,6 +852,28 @@ do_btrfs_set_seeding (const char *device, int svalue) return 0; } +int +btrfs_set_uuid (const char *device, const char *uuid) +{ + CLEANUP_FREE char *err = NULL; + int r; + int has_uuid_opts = test_btrfstune_uuid_opt (); + + if (has_uuid_opts <= 0) { + reply_with_error_errno (ENOTSUP, "btrfs filesystems' UUID cannot be changed"); + return -1; + } + + r = commandr (NULL, &err, str_btrfstune, "-f", "-U", uuid, device, NULL); + + if (r == -1) { + reply_with_error ("%s: %s", device, err); + return -1; + } + + re...

...; + const char *end; + if (!p) + continue; + + p += strlen (" path "); + end = strchrnul (p, ' '); + add_sprintf (&ret, "%.*s", (int) (end - p), p); + } else if (STRPREFIX (lines[i], "\t*** Some devices missing")) { + reply_with_error_errno (ENODEV, "%s: missing devices", device); + return NULL; + } else { + reply_with_error ("unrecognized line in output from 'btrfs filesystem show': %s", lines[i]); + return NULL; + } + } + + end_stringsbuf (&ret); + + return take_stringsbuf (&am...

version 2: - Turn the "unrecognised disk label" error into errno == EINVAL - Fix virt-alignment-scan - Rework the fix for virt-v2v bug 1232192 (see description of patch 3/3)

...- a/daemon/scrub.c +++ b/daemon/scrub.c @@ -54,12 +54,34 @@ do_scrub_device (const char *device) int do_scrub_file (const char *file) { + CLEANUP_FREE char *rp = NULL; CLEANUP_FREE char *buf = NULL; CLEANUP_FREE char *err = NULL; int r; + if (! optgroup_realpath_available ()) { + reply_with_error_errno (ENOTSUP, + "feature '%s' is not available in this\n" + "build of libguestfs. Read 'AVAILABILITY' in the guestfs(3) man page for\n" + "how to check for the availability of features.", + "realpath"); + return -1; +...

...for <= 0 here, to consider errors in test_btrftune_uuid_opt > on the safe side. > > > + reply_with_error ("btrfstune do not support '-u'"); > > reply_with_error ("btrfs filesystems' UUID cannot be changed"); How about: errcode = ENOTSUP; reply_with_error_errno (errcode, " btrfs filesystems' UUID cannot be changed"); Then we got the errno, and set_uuid could tell whether we support this feature. Regards, - Chen > > > + return -1; > > + } > > + > > + r = commandr (NULL, &err, str_btrfstune, "-f&quo...

- Btrfs-progs v4.1 introduced new feature of changing uuid of btrfs partition. This patch add support of this. - Introduce set_uuid_random - uuids.c did a lot of deplicated work for changing uuid of fs. Use existing functions. v3.1: fix typos v3: set errno if feature is not available. Chen Hanxiao (9): uuid: add support to change uuid of btrfs partition uuid: use existing function of

Fix for https://bugzilla.redhat.com/show_bug.cgi?id=1364347

...int errcode = 0; /* Translate "unrecognised disk label" into an errno code. */ - if (msg && strstr (msg, "unrecognised disk label") != NULL) + if (err && strstr (err, "unrecognised disk label") != NULL) errcode = EINVAL; - reply_with_error_errno (errcode, "parted print: %s: %s", device, msg); + reply_with_error_errno (errcode, "parted print: %s: %s", device, err); free (out); return NULL; } @@ -383,93 +346,46 @@ print_partition_table (const char *device, char * do_part_get_parttype (const char *device)...