search for: optarg

Hi, This series fix two bad commit ids referenced in commit messages, by first reverting the two commits and then re-applying them with correct commit ids referenced. No big problem, but for clarity. Hu Tao (4): Revert "Update gobject/Makefile.inc and POTFILES" Revert "Update gobject/Makefile.inc and POTFILES" Update gobject/Makefile.inc and POTFILES Update

...guestfs-gobject-struct-xattr.h \ - guestfs-gobject-struct-inotify_event.h \ - guestfs-gobject-struct-partition.h \ - guestfs-gobject-struct-application.h \ - guestfs-gobject-struct-isoinfo.h \ - guestfs-gobject-struct-mdstat.h \ - guestfs-gobject-struct-btrfssubvolume.h \ - guestfs-gobject-optargs-test0.h \ - guestfs-gobject-optargs-add_drive_opts.h \ - guestfs-gobject-optargs-add_domain.h \ - guestfs-gobject-optargs-inspect_get_icon.h \ - guestfs-gobject-optargs-mount_local.h \ - guestfs-gobject-optargs-umount_local.h \ - guestfs-gobject-optargs-mkfs_opts.h \ - guestfs-gobject-optar...

...;localdir"], []; + style = RErr, [Pathname "remotepath"; String "localdir"], [OBool "numericowner"; OStringList "excludes"; OBool "xattrs"; OBool "selinux"; OBool "acls"]; visibility = VPublicNoFish; + once_had_no_optargs = true; shortdesc = "copy remote files or directories out of an image"; longdesc = "\ C<guestfs_copy_out> copies remote files or directories recursively @@ -3449,7 +3450,39 @@ To download to the current directory, use C<.> as in: C<guestfs_copy_out>...

...), 68 deletions(-) diff --git a/generator/generator b/generator/generator index 78c6ca6..5823686 100755 --- a/generator/generator +++ b/generator/generator @@ -865,7 +865,7 @@ and arg = | UInt32 of string (* 32 bit unsigned int *) | UInt64 of string (* 64 bit unsigned int *) and optarg = -| OFlags of string (* NBD_CMD_FLAG_* flags *) +| OFlags of string * flags (* optional flags, uint32_t in C *) and ret = | RBool (* return a boolean, or error *) | RStaticString (* return a static string (must be located in @@ -890,6 +890,10 @@ and cbarg =...

...--- lib/rw.c | 45 -------------------------------------- 8 files changed, 67 insertions(+), 96 deletions(-) diff --git a/generator/API.ml b/generator/API.ml index 42eeac0..b212e95 100644 --- a/generator/API.ml +++ b/generator/API.ml @@ -55,7 +55,7 @@ and arg = | UInt64 of string and optarg = | OClosure of closure -| OFlags of string * flags +| OFlags of string * flags * string list option and ret = | RBool | RStaticString @@ -1485,7 +1485,11 @@ Future NBD extensions may result in additional C<size_type> values. "pread", { default_call with args = [ By...

...FILES | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/po/POTFILES b/po/POTFILES index 2b4b586..789279a 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -131,6 +131,45 @@ fish/time.c fish/virt.c format/format.c fuse/guestmount.c +gobject/guestfs-gobject-optargs-add_domain.c +gobject/guestfs-gobject-optargs-add_drive_opts.c +gobject/guestfs-gobject-optargs-btrfs_filesystem_resize.c +gobject/guestfs-gobject-optargs-compress_device_out.c +gobject/guestfs-gobject-optargs-compress_out.c +gobject/guestfs-gobject-optargs-copy_device_to_device.c +gobject/guestfs...

This is only lightly tested at the moment. For context see: https://bugzilla.redhat.com/show_bug.cgi?id=1138203#c40 https://bugzilla.redhat.com/show_bug.cgi?id=1075143 https://bugzilla.redhat.com/show_bug.cgi?id=1075164 Note this is not a complete fix. At least one more libguestfs patch is required (to implement virDomainPtr in the python bindings). Plus a virt-manager patch. Rich.

...), 11 deletions(-) diff --git a/generator/generator b/generator/generator index 8cf95b6..8f15786 100755 --- a/generator/generator +++ b/generator/generator @@ -867,6 +867,7 @@ and arg = | UInt32 of string (* 32 bit unsigned int *) | UInt64 of string (* 64 bit unsigned int *) and optarg = +| OClosure of closure (* optional closure *) | OFlags of string * flags (* optional flags, uint32_t in C *) and ret = | RBool (* return a boolean, or error *) @@ -3184,16 +3185,6 @@ end = struct (* Check the API definition. *) let () = - (* Currently optargs can o...

On 2020-02-06 at 13:28 +1100, Darren Tucker wrote: > Like this. > --- a/sshd_config.5 > +++ b/sshd_config.5 The ssh_config.5 also has a copy of this and presumably needs the same change, unless I've misunderstood. -Phil

Matt, I don't know if it worries you or not, but the new scheme does create rather a lot of header files directly in /usr/include: /usr/include/guestfs-gobject-optargs-add_domain.h /usr/include/guestfs-gobject-optargs-add_drive_opts.h /usr/include/guestfs-gobject-optargs-btrfs_filesystem_resize.h /usr/include/guestfs-gobject-optargs-compress_device_out.h /usr/include/guestfs-gobject-optargs-compress_out.h /usr/include/guestfs-gobject-optargs-copy_...

In libguestfs generator we have the concept of optargs which is different from plain arguments. These are mapped to optional arguments in languages that support them such as Python. This commit adds a new concept of optargs. At the moment it is simply limited to handling the optional (in some bindings) flags parameter which is used to handle the NB...

...), 10 deletions(-) diff --git a/generator/generator b/generator/generator index 01da1c3..3add9a4 100755 --- a/generator/generator +++ b/generator/generator @@ -867,6 +867,7 @@ and arg = | UInt32 of string (* 32 bit unsigned int *) | UInt64 of string (* 64 bit unsigned int *) and optarg = +| OClosure of closure (* optional closure *) | OFlags of string * flags (* optional flags, uint32_t in C *) and ret = | RBool (* return a boolean, or error *) @@ -3184,16 +3185,6 @@ end = struct (* Check the API definition. *) let () = - (* Currently optargs can o...

...| 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/generator/generator_c.ml b/generator/generator_c.ml index 4324ec0..9cfb2b7 100644 --- a/generator/generator_c.ml +++ b/generator/generator_c.ml @@ -1187,7 +1187,7 @@ trace_send_line (guestfs_h *g) let n = name_of_optargt argt in let uc_shortname = String.uppercase shortname in let uc_n = String.uppercase n in - pr " if ((optargs->bitmask & GUESTFS_%s_%s_BITMASK))\n" + pr " if (optargs->bitmask & GUESTFS_%s_%s_BITMASK)\n"...

...uestfs, * hence no "."-relative names. *) - style = RStringList "paths", [Pathname "pattern"], []; + style = RStringList "paths", [Pathname "pattern"], [OBool "nodirectoryslash"]; proc_nr = Some 113; + once_had_no_optargs = true; tests = [ InitScratchFS, Always, TestResult ( [["mkdir_p"; "/glob_expand/b/c"]; ["touch"; "/glob_expand/b/c/d"]; ["touch"; "/glob_expand/b/c/e"]; - ["glob_expand"; "/...

...int printlabel, int projid32bit, int printuuid, + int lazycounter, const char *label, const char *uuid) +{ + int r; + char *out = NULL, *err = NULL; + const char *argv[MAX_ARGS]; + size_t i = 0; + + ADD_ARG (argv, i, "xfs_admin"); + + /* Optional arguments */ + if (!(optargs_bitmask & GUESTFS_XFS_ADMIN_EXTUNWRITTEN_BITMASK)) + extunwritten = 0; + if (!(optargs_bitmask & GUESTFS_XFS_ADMIN_IMGFILE_BITMASK)) + imgfile = 0; + if (!(optargs_bitmask & GUESTFS_XFS_ADMIN_V2LOG_BITMASK)) + v2log = 0; + if (!(optargs_bitmask & GUESTFS_XFS_ADMIN_PRINT...

This completes the implementation on the libguestfs side, allowing python-libvirt dom pointers to be passed to guestfs_add_libvirt_dom. For context see: https://bugzilla.redhat.com/show_bug.cgi?id=1138203#c40 https://bugzilla.redhat.com/show_bug.cgi?id=1075143 https://bugzilla.redhat.com/show_bug.cgi?id=1075164 Rich.

...t drv **drvsp) drv->uri.password = uri.password; drv->uri.format = format; drv->uri.orig_uri = arg; + drv->uri.blocksize = blocksize; } drv->next = *drvsp; @@ -137,6 +140,10 @@ add_drives_handle (guestfs_h *g, struct drv *drv, size_t drive_index) ad_optargs.bitmask |= GUESTFS_ADD_DRIVE_OPTS_DISCARD_BITMASK; ad_optargs.discard = drv->a.discard; } + if (drv->a.blocksize) { + ad_optargs.bitmask |= GUESTFS_ADD_DRIVE_OPTS_BLOCKSIZE_BITMASK; + ad_optargs.blocksize = drv->a.blocksize; + } r = guestfs...

....c +daemon/errnostring_gperf.c daemon/ext2.c daemon/fallocate.c daemon/file.c @@ -97,6 +98,7 @@ erlang/erl-guestfs.c fish/alloc.c fish/cmds-gperf.c fish/cmds.c +fish/cmds_gperf.c fish/completion.c fish/config.c fish/copy.c @@ -135,6 +137,7 @@ format/format.c fuse/guestmount.c gobject/src/optargs-add_domain.c gobject/src/optargs-add_drive.c +gobject/src/optargs-add_drive_opts.c gobject/src/optargs-btrfs_filesystem_resize.c gobject/src/optargs-btrfs_fsck.c gobject/src/optargs-compress_device_out.c @@ -150,12 +153,15 @@ gobject/src/optargs-internal_test.c gobject/src/optargs-md_create.c...

A hopefully cleaner implementation this time. It doesn't require any special insights into how libvirt-python is implemented. Instead, it requires a change to libvirt-python to add a .c_pointer() method: https://www.redhat.com/archives/libvir-list/2014-December/msg00615.html Rich.

...v: *const Raw%s);\n" c_name name; + pr " #[allow(dead_code)]\n"; + pr " fn guestfs_free_%s_list(l: *const RawList<Raw%s>);\n" c_name name; + ) external_structs; + pr "}\n"; + + (* [Outline] There are three types for each optional structs: SOptArgs, + * CExprSOptArgs, RawSOptArgs. + * SOptArgs: for Rust bindings' API. This can be seen by bindings' users. + * CExprSOptArgs: Each field has C expression(e.g. CString, *const c_char) + * RawSOptArgs: Each field has raw pointers or integer values + * + * SOptArgs ---try_into()-...