search for: changeuid

...Just code motion, adapting v2v in the process. --- docs/C_SOURCE_FILES | 2 +- mllib/Makefile.am | 5 ++++- mllib/exit-c.c | 33 +++++++++++++++++++++++++++++++++ mllib/exit.ml | 19 +++++++++++++++++++ mllib/exit.mli | 20 ++++++++++++++++++++ v2v/Makefile.am | 1 - v2v/changeuid-c.c | 33 --------------------------------- v2v/changeuid.ml | 7 ++----- 8 files changed, 79 insertions(+), 41 deletions(-) create mode 100644 mllib/exit-c.c create mode 100644 mllib/exit.ml create mode 100644 mllib/exit.mli delete mode 100644 v2v/changeuid-c.c diff --git a/docs/C_SOURC...

The 'may' function is a higher-order function (HOF) that replaces: match x with | None -> () | Some x -> f x with: may f x The idea comes from lablgtk (OCaml Gtk bindings) where it is widely used. If this change is clearer than previous code, then this could be used in many more places. However I previously steered clear from using HOFs like this because they can be

...ools/tools_utils.ml | 6 ++--- customize/customize_main.ml | 4 ++-- daemon/inspect_types.ml | 52 ++++++++++++++++++++--------------------- dib/dib.ml | 4 ++-- resize/resize.ml | 6 ++--- sysprep/sysprep_operation.ml | 16 ++++++------- v2v/changeuid.ml | 4 ++-- v2v/cmdline.ml | 6 ++--- v2v/input_libvirt_vddk.ml | 3 ++- v2v/parse_libvirt_xml.ml | 6 ++--- v2v/types.ml | 7 +++--- v2v/v2v.ml | 6 ++--- 17 files changed, 107 insertions(+), 99 deletions(-...

...---------- common/mlstdutils/std_utils.mli | 12 +++++++++++ common/mltools/tools_utils.ml | 39 +++++++++++++++++----------------- dib/dib.ml | 9 ++++---- generator/bindtests.ml | 26 ++++++++++++----------- generator/utils.ml | 14 ++++--------- v2v/changeuid.ml | 7 +------ v2v/copy_to_local.ml | 4 +--- v2v/input_libvirt_vddk.ml | 9 ++++---- v2v/input_ova.ml | 46 +++++++++++++++++++++-------------------- v2v/output_local.ml | 4 +--- v2v/output_qemu.ml | 29 +++++++++++++----...

You can now use -o rhv (-o rhev is supported for compatibility). --- v2v/Makefile.am | 8 +- v2v/OVF.ml | 30 +++---- v2v/OVF.mli | 2 +- v2v/changeuid.mli | 4 +- v2v/cmdline.ml | 12 +-- v2v/convert_windows.ml | 2 +- v2v/{output_rhev.ml => output_rhv.ml} | 26 +++--- v2v/{output_rhev.mli => output_rhv.mli} | 8 +- v2v/output_vdsm.ml...

...ty). --- p2v/gui.c | 5 +- p2v/virt-p2v.pod | 13 ++- v2v/Makefile.am | 8 +- v2v/OVF.ml | 30 +++---- v2v/OVF.mli | 2 +- v2v/changeuid.mli | 4 +- v2v/cmdline.ml | 12 +-- v2v/convert_windows.ml | 2 +- v2v/{output_rhev.ml => output_rhv.ml} | 26 +++--- v2v/{output_rhev.mli => output_rhv.mli} | 8 +- v2v/output_vdsm.ml...

v2: - Fix virt-p2v messages too. Rich.

...aniv Kaul, Michal Skrivanek. --- v2v/output_rhev.ml | 4 ---- v2v/output_vdsm.ml | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index e45043b..3280150 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -248,10 +248,6 @@ object Changeuid.func changeuid_t ( fun () -> let g = open_guestfs ~identifier:"rhev_disk_create" () in - (* For qcow2, override v2v-supplied compat option, because RHEL 6 - * nodes cannot handle qcow2 v3 (RHBZ#1145582). - *) - let compat = if format <&g...

...t = Mkdtemp.temp_dir ~base_dir "null." "" in rmdir_on_exit t; t in diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index 4b46f83..2878e13 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -262,7 +262,7 @@ object ?clustersize path format size = Changeuid.func changeuid_t ( fun () -> - let g = new Guestfs.guestfs () in + let g = open_guestfs () in g#set_identifier "rhev_disk_create"; (* For qcow2, override v2v-supplied compat option, because RHEL 6 * nodes cannot handle qcow2 v3 (RHBZ#114...

..._c_api.ml | 6 +++--- get-kernel/get_kernel.ml | 4 +--- ocaml/t/guestfs_100_launch.ml | 2 +- resize/resize.ml | 12 +++++------- sparsify/utils.ml | 2 +- sysprep/main.ml | 4 +--- sysprep/sysprep_operation.ml | 8 ++++---- v2v/changeuid.ml | 2 +- v2v/input_ova.ml | 2 +- v2v/output_glance.ml | 2 +- v2v/output_qemu.ml | 4 ++-- v2v/output_rhv.ml | 2 +- v2v/output_vdsm.ml | 2 +- v2v/utils.ml | 2 +- v2v/v2v.ml...

...to create a new Guestfs handle, with common options (e.g. debug, tracing) already set. *) diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index 2878e13..2b8d989 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -262,8 +262,7 @@ object ?clustersize path format size = Changeuid.func changeuid_t ( fun () -> - let g = open_guestfs () in - g#set_identifier "rhev_disk_create"; + let g = open_guestfs ~identifier:"rhev_disk_create" () in (* For qcow2, override v2v-supplied compat option, because RHEL 6 * node...

Fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1354507 Main explanation is in patch #3. Rich.

...uot; "" in > rmdir_on_exit t; > t in > diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml > index 4b46f83..2878e13 100644 > --- a/v2v/output_rhev.ml > +++ b/v2v/output_rhev.ml > @@ -262,7 +262,7 @@ object > ?clustersize path format size = > Changeuid.func changeuid_t ( > fun () -> > - let g = new Guestfs.guestfs () in > + let g = open_guestfs () in > g#set_identifier "rhev_disk_create"; > (* For qcow2, override v2v-supplied compat option, because RHEL 6 > * nodes ca...

...akefile.am +++ b/v2v/Makefile.am @@ -23,6 +23,7 @@ generator_built = \ BUILT_SOURCES = \ $(generator_built) \ + config.ml \ output_rhv_upload_createvm_source.ml \ output_rhv_upload_plugin_source.ml \ output_rhv_upload_precheck_source.ml @@ -48,6 +49,7 @@ EXTRA_DIST = \ SOURCES_MLI = \ changeuid.mli \ cmdline.mli \ + config.mli \ convert_linux.mli \ convert_windows.mli \ create_libvirt_xml.mli \ @@ -100,6 +102,7 @@ SOURCES_MLI = \ windows_virtio.mli SOURCES_ML = \ + config.ml \ types.ml \ uefi.ml \ utils.ml \ @@ -697,6 +700,7 @@ v2v_unit_tests_LINK = \ .depend: \ $(sr...

This is just a bit of preparatory refactoring ... 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: - 1/3: same as in previous version - 2/3: add check for libvirt version - 3/3: restore the disabled test The libvirt patch [2] that should fix our problem with 'raw' driver that is mentioned in [1] was merged. To realy fix things, there is at least one thing we have to change on our side. We have to be explicit about the driver in the JSON we generate. [1]

...t = vdsm_ovf_output; + compat_11 = vdsm_compat_11; } in Output_vdsm.output_vdsm os vdsm_params output_alloc in diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index e45043b..3280150 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -248,10 +248,6 @@ object Changeuid.func changeuid_t ( fun () -> let g = open_guestfs ~identifier:"rhev_disk_create" () in - (* For qcow2, override v2v-supplied compat option, because RHEL 6 - * nodes cannot handle qcow2 v3 (RHBZ#1145582). - *) - let compat = if format <&g...

..._output = vdsm_ovf_output; + compat = vdsm_compat; } in Output_vdsm.output_vdsm os vdsm_params output_alloc in diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index e45043b..3280150 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -248,10 +248,6 @@ object Changeuid.func changeuid_t ( fun () -> let g = open_guestfs ~identifier:"rhev_disk_create" () in - (* For qcow2, override v2v-supplied compat option, because RHEL 6 - * nodes cannot handle qcow2 v3 (RHBZ#1145582). - *) - let compat = if format <&g...

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.