search for: s_args

This is a series of simplifications to the stubs code. It's all refactoring, there is no functional change. Rich.

Hi Rich, I've changed part of generator.ml to look like this: (match snd style with | [] -> () | args -> pr " memset (&args, 0, sizeof args);\n"; pr "\n"; pr " if (!xdr_guestfs_%s_args (xdr_in, &args)) {\n" name; pr " reply_with_error (\"%%s: daemon failed to decode procedure arguments\", \"%s\");\n" name; pr " return;\n"; pr " }\n"; List.iter ( function...

--- generator/generator_c.ml | 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

...l arguments\");\n"; - pr " goto done;\n"; + pr " goto done_no_free;\n"; pr " }\n"; ); pr "\n"; @@ -339,6 +339,7 @@ and generate_daemon_actions () = pr " xdr_free ((xdrproc_t) xdr_guestfs_%s_args, (char *) &args);\n" name ); + pr "done_no_free:\n"; pr " return;\n"; pr "}\n\n"; ) daemon_functions; -- 1.7.9

...~ } ~ // now we do the actual rsync from the system into the latest snapshot (notice that ~ // rsync behaves like cp --remove-destination by default, so the destination ~ // is unlinked first. If it were not so, this would copy over the other snapshot(s) too! ~ $s_args = "$exclude_args $tmp_rsyncArgs " . ~ "$s_fullPath$s_backupType.0 2>&1"; ~ $s_cmd = $s_rsync . ' ' . $s_args; ~ if ($b_debug) { ~ writeln('Executing rsync command: ' . $s_cmd); ~ } ~ $s_log .= `$s_cm...

These 3 patches implement support for APIs which must accept a mountable, but don't update apis which must return mountables. Matt

Tested with 'make check-release'. tests/parallel (in check-slow) failed, although it does regularly and that seems to be because of libvirt. Rich.

This rather complex set of patches allow non-optargs functions to gain optional arguments, while preserving source and binary backwards compatibility. The problem is that we cannot add an optional argument to an existing function. For example, we might want to add flags to the 'lvresize' API which currently has no optional arguments.

...| FileIn n | FileOut n | Key n | BufferIn n -> diff --git a/generator/daemon.ml b/generator/daemon.ml index 9362b3f..a075bdc 100644 --- a/generator/daemon.ml +++ b/generator/daemon.ml @@ -111,7 +111,7 @@ and generate_daemon_actions () = pr " struct guestfs_%s_args args;\n" name; List.iter ( function - | Device n | Dev_or_Path n + | Device n | Mountable n | Dev_or_Path n | Pathname n | String n | Key n @@ -205,7 +205,7 @@ and generate_daemon_actions () = pr_args n;...

This started as a simple warning-elimination change. I'll get back to that series shortly ;-) It turned into a factorization and constification exercise during which I got a taste of ocaml. Thanks to Rich Jones for help with a few snippets in generator.ml. The overall result is that many previously-manually-maintained bits from daemon/*.c functions are now hoisted into the automatically-

..."; + pr "typedef struct guestfs_int_%s guestfs_int_%s_list<>;\n" typ typ; + pr "\n"; ) structs; List.iter ( @@ -4101,58 +4101,58 @@ and generate_xdr () = (match snd style with | [] -> () | args -> - pr "struct %s_args {\n" name; - List.iter ( - function - | String n -> pr " string %s<>;\n" n - | OptString n -> pr " str *%s;\n" n - | StringList n -> pr " str %s<>;\n" n - | Bool n -> pr " bool %s;\n" n - | Int...

In the kernel and qemu communities it is routine for patches that will be backported to stable branches to be posted for review. I'm proposing we do the same for libguestfs stable branches. All of the attached have been tested with 'make check-release'. Rich.

This map was originally included just for the java bindings, but is generally useful to any binding which uses camel case by requirement or convention. --- generator/generator_haskell.ml | 4 ++-- generator/generator_java.ml | 10 +++++----- generator/generator_main.ml | 2 +- generator/generator_structs.ml | 12 +++++------- generator/generator_structs.mli | 8 ++++---- 5

...(String.uppercase name); + (String.uppercase_ascii name); pr " progress_hint, %s,\n" (if optargs <> [] then "optargs->bitmask" else "0"); pr " (xdrproc_t) xdr_guestfs_%s_args, (char *) &args);\n" @@ -1989,7 +1991,7 @@ and generate_client_actions actions () = pr "\n"; pr " if (guestfs_int_check_reply_header (g, &hdr, GUESTFS_PROC_%s, serial) == -1) {\n" - (String.uppercase name); + (String.uppercase_ascii name);...

Very large but mechanical change to the generator. Rich.

...false | _ -> true) - args_passed_to_daemon in + List.filter (function String ((FileIn|FileOut), _) -> false | _ -> true) + args_passed_to_daemon in (match args_passed_to_daemon with | [] -> () | args -> pr "struct %s_args {\n" name; List.iter ( function - | Pathname n | Device n | Mountable n | Dev_or_Path n - | Mountable_or_Path n | String n - | Key n | GUID n -> + | String (_, n) -> pr " string %s<>;\n" n |...