search for: optgroup_

..."\n"; + pr "#include <caml/mlvalues.h>\n"; pr "\n"; pr "#include \"daemon.h\"\n"; pr "#include \"optgroups.h\"\n"; @@ -999,7 +1003,24 @@ let generate_daemon_optgroups_c () = pr " { \"%s\", optgroup_%s_available },\n" group group ) optgroups_names_all; pr " { NULL, NULL }\n"; - pr "};\n" + pr "};\n"; + pr "\n"; + pr "/* Wrappers so these functions can be called from OCaml code. */\n"; + List.iter ( + fun group -> + if...

...mon.ml index 7ffea7b..d1689e1 100644 --- a/generator/daemon.ml +++ b/generator/daemon.ml @@ -732,19 +732,15 @@ and generate_daemon_optgroups_c () = pr " return 1;\n"; pr "}\n"; pr "\n"; - - List.iter ( - fun group -> - pr "#define optgroup_%s_available dummy_available\n" group; - ) optgroups_retired; - - pr "\n"; ); pr "struct optgroup optgroups[] = {\n"; List.iter ( fun group -> - pr " { \"%s\", optgroup_%s_available },\n" group group + if List.mem group...

...ded (commit a86eb0e0d2c67e2) at a time when we > thought it would be a good idea to have the daemon run on Windows. > Since no one thinks that's a good idea any longer, I think you could > prepend this commit with one which removes tests for realpath / > HAVE_REALPATH and hard-codes optgroup_realpath_available() == 1. I didn't know the story behind this, and went for the conservative route. Interesting enough, realpath has been unconditionally used already, so I will pull the plug to the conditional usage in some other parts, then. > Is it possible to make this change more ge...

On 02/03/16 18:24, Richard W.M. Jones wrote: > On Wed, Mar 02, 2016 at 05:59:32PM +0200, noxdafox wrote: >> One of the patches I'm talking about would add TSK (The Sleuth Kit) >> as a dependency within the appliance. >> >> This would bring new APIs such as: >> 'fls' more powerful 'ls' command allowing to get list of deleted >> files or

...e); \ + return (errcode); \ + } while (0) + +#define IF_NOT_AVAILABLE_ERROR(feature,errcode) \ + do { \ + if (! optgroup_##feature##_available ()) \ + NOT_AVAILABLE(feature,errcode); \ + } while (0) #ifndef __attribute__ # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) diff --git a/daemon/grub.c b/daemon/grub.c index 9cd4f6e...

..."#include <caml/mlvalues.h>\n"; + pr "\n"; pr "#include \"daemon.h\"\n"; pr "#include \"optgroups.h\"\n"; pr "\n"; @@ -752,7 +1072,22 @@ let generate_daemon_optgroups_c () = pr " { \"%s\", optgroup_%s_available },\n" group group ) optgroups_names_all; pr " { NULL, NULL }\n"; - pr "};\n" + pr "};\n"; + pr "\n"; + pr "/* Wrappers so these functions can be called from OCaml code. */\n"; + List.iter ( + fun group -> + pr...

...quot; (String.uppercase_ascii name); pr " %s_stub (xdr_in);\n" name; pr " break;\n" ) (actions |> daemon_functions); @@ -819,7 +820,8 @@ let generate_daemon_optgroups_h () = "; List.iter ( fun (group, fns) -> - pr "#define OPTGROUP_%s_NOT_AVAILABLE \\\n" (String.uppercase group); + pr "#define OPTGROUP_%s_NOT_AVAILABLE \\\n" + (String.uppercase_ascii group); List.iter ( fun { name = name; style = ret, args, optargs } -> let style = ret, args @ args_of_optargs optargs, [...

..._nr } -> + | { name; proc_nr = Some proc_nr } -> pr " [%d] = \"%s\",\n" proc_nr name | { proc_nr = None } -> assert false ) (actions |> daemon_functions |> sort); @@ -1124,7 +1124,7 @@ let generate_daemon_optgroups_h () = pr "#define OPTGROUP_%s_NOT_AVAILABLE \\\n" (String.uppercase_ascii group); List.iter ( - fun { name = name; style = ret, args, optargs } -> + fun { name; style = ret, args, optargs } -> let style = ret, args @ args_of_optargs optargs, [] in pr " &quo...

Previously posted as part of the mega utilities/inspection series here: https://www.redhat.com/archives/libguestfs/2017-June/msg00232.html What I've done is to extract just the parts related to rewriting daemon APIs in OCaml, rebase them on top of the current master, fix a few things, and recompile and test everything. Rich.

Per my previous email: https://www.redhat.com/archives/libguestfs/2017-September/msg00203.html I'd like to talk about requiring a more modern version of the OCaml compiler. These commits show some of the code changes which would be possible with OCaml >= 3.12 [which it turns out we already require by accident] and also with OCaml >= 4.02. The latter is my favoured option. Rich.

v2 was here: https://www.redhat.com/archives/libguestfs/2017-June/msg00008.html This series gets as far as a working (and faster) reimplementation of ‘guestfs_list_filesystems’. I also have another patch series on top of this one which reimplements the inspection APIs inside the daemon, but that needs a bit more work still, since inspection turns out to be a very large piece of code. Rich.

I think this fixes everything mentioned: - Added the Optgroups module as suggested. - Remove command temporary files. - Replace command ~flags with ?fold_stdout_on_stderr. - Nest _with_mounted function. - Rebase & retest. Rich.

...ossible. - daemon/lvm.ml: Readd the comment above lvs_has_S_opt which was accidentally dropped during conversion. - daemon/lvm.ml: Optimize handling of prefix in convert_lvm_output. - daemon/optgroups.c: Remove unnecessary <stdio.h>, <stdlib.h> additions. - daemon/optgroups.c: Use optgroup_names so we don't need to check for non-retired groups. - daemon/btrfs.ml: Rewrite ‘with_mounted’ helper to use Mkdtemp. - daemon/btrfs.ml: Filter empty lines. - daemon/listfs.ml: Use StringSet to simplify filtering the devices. - daemon/parted.ml: Fix print_partition_table and add a com...

This is a combination of: https://www.redhat.com/archives/libguestfs/2017-June/msg00046.html [PATCH 00/12] Refactor utility functions. plus: https://www.redhat.com/archives/libguestfs/2017-June/msg00023.html [PATCH v3 00/19] Allow APIs to be implemented in OCaml. with the second patches rebased on top of the utility refactoring, and some other adjustments and extensions. This passes

v6 was posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00103.html and this requires the utilities refactoring posted here: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html Inspection is now complete[*], although not very well tested. I'm intending to compare the output of many guests using old & new virt-inspector to see if I can find any

v5: https://www.redhat.com/archives/libguestfs/2017-June/msg00065.html Since v5, this now implements inspection almost completely for Linux and Windows guests. Rich.

v7 was: https://www.redhat.com/archives/libguestfs/2017-June/msg00169.html https://www.redhat.com/archives/libguestfs/2017-June/msg00184.html I believe this addresses all comments received so far. Also it now passes a test where I compared about 100 disk images processed with old and new virt-inspector binaries. The output is identical in all cases except one which is caused by a bug in blkid