similar to: [PATCH] sparsify, v2v: use Common_utils.absolute_path

Simple code motion. --- v2v/Makefile.am | 2 ++ v2v/input_disk.ml | 21 ++------------------- v2v/name_from_disk.ml | 41 +++++++++++++++++++++++++++++++++++++++++ v2v/name_from_disk.mli | 24 ++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 v2v/name_from_disk.ml create mode 100644 v2v/name_from_disk.mli diff --git a/v2v/Makefile.am

Don't use "default", choose a better default name if <Name> is not present in the OVF. Rich.

In disk input mode, to determine the guest name strip the extension from the filename only if it's a very well extension for disk images. --- v2v/input_disk.ml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 17ad61d..d56c476 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -42,9 +42,23 @@ class

In disk input mode, to determine the guest name strip the extension from the filename only if it's a very well extension for disk images. --- v2v/input_disk.ml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 17ad61d..939a16b 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -42,9 +42,13 @@ class input_disk

This makes them visible in the help text of -i and -o. --- v2v/input_disk.ml | 5 ++++- v2v/output_local.ml | 5 ++++- v2v/output_rhev.ml | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 17ad61d..508f16a 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -101,4 +101,7 @@ class input_disk input_format disk = object

Instead of creating Guestfs handles and manually apply common options (e.g. debug and trace), use the open_guestfs in Common_utils. This also applies the common options to handles which didn't set them before, so we can inspect also their messages if needed. --- builder/builder.ml | 8 ++------ customize/customize_main.ml | 4 +--- dib/dib.ml | 4 +---

It mimics a bit in OCaml the logic used in commit a95214b1985e694946e3426120a6fdc13a3f081f (for the main library) and commit 588af1953e5f7ab74009b9175cc5d3efb8bb651a (in disk-create), so in OCaml tools direct calls to qemu/qemu-img with filenames provided by the user can properly handle filenames with e.g. ':'. --- mllib/common_utils.ml | 13 +++++++++++++ mllib/common_utils.mli | 8

Use the common open_guestfs to open Guestfs handles, so we get debugging, tracing, and other common options set. --- v2v/convert_windows.ml | 4 +--- v2v/input_disk.ml | 2 +- v2v/input_libvirt_other.ml | 2 +- v2v/input_ova.ml | 2 +- v2v/output_glance.ml | 2 +- v2v/output_null.ml | 2 +- v2v/output_rhev.ml | 2 +- v2v/output_vdsm.ml | 2 +-

On Tue, Nov 21, 2017 at 3:55 AM, Pino Toscano <ptoscano@redhat.com> wrote: > Hi, > > On Monday, 20 November 2017 22:57:04 CET David Kaylor wrote: > > I was trying out virt-builder and noticed that in some directories I > > receive an error when the image is resized. > > > > For example, if I run the following command from my home directory it > works >

Doing this allows us to remove the Customize_utils module completely, since it becomes empty. Rich.

Don't pass these flags to dozens of functions. --- builder/builder.ml | 47 +++++++++-------- builder/cache.ml | 4 +- builder/cache.mli | 2 +- builder/cmdline.ml | 13 ++--- builder/downloader.ml | 14 +++-- builder/downloader.mli

This still isn't working at the moment. See: http://marc.info/?t=139457409300003&r=1&w=2 This set of patches: - Adds new APIs to support discard in libguestfs. - Adds discard support to virt-format. - Adds discard support to virt-sysprep. - Implements virt-sparsify --in-place. Rich.

Only do this if running as root and if the backend is set to libvirt. --- v2v/input_ova.ml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml index 4f848e2..bb9cb1b 100644 --- a/v2v/input_ova.ml +++ b/v2v/input_ova.ml @@ -104,6 +104,19 @@ object (* Exploded path must be absolute (RHBZ#1155121). *) let exploded = absolute_path exploded

Mostly modelled after a snippet implemented in dib, it is an helper function to run multiple commands in parallel, waiting for all of them at once, and returning all their exit codes. It is possible to pass custom descriptors for collecting stdout and stderr of each command. Common_utils.run_command is adapted to use it, so all the existing code using it keeps working. Add a simple unit tests

virt-v2v moves guests, it doesn't clone them. Therefore we should try to preserve the VM Generation ID (genid) as much as possible. This has the ability to read the genid from VMware VMX files and libvirt XML (but note RHBZ#1598348). It can also write the genid to libvirt (‘-o libvirt’, ‘-o local’) and QEMU (‘-o qemu’). We are missing support currently for all OVF-based formats (hence ‘-i

This enhances the existing VMX input support allowing it to be used over SSH to the ESXi server. The original command (for local .vmx files) was: $ virt-v2v -i vmx guest.vmx -o local -os /var/tmp Adding ‘-it ssh’ and using an SSH remote path gives the new syntax: $ virt-v2v \ -i vmx -it ssh \ "root@esxi.example.com:/vmfs/volumes/datastore1/guest/guest.vmx" \ -o local

Just refactoring, no change. --- sparsify/cmdline.ml | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/sparsify/cmdline.ml b/sparsify/cmdline.ml index ce2b913..bd49e71 100644 --- a/sparsify/cmdline.ml +++ b/sparsify/cmdline.ml @@ -98,6 +98,7 @@ read the man page virt-sparsify(1). let check_tmpdir = !check_tmpdir in let

The new module ‘Std_utils’ contains only functions which are pure OCaml and depend only on the OCaml stdlib. Therefore these functions may be used by the generator. The new module is moved to ‘common/mlstdutils’. This also removes the "<stdlib>" hack, and the code which copied the library around. Also ‘Guestfs_config’, ‘Libdir’ and ‘StringMap’ modules are moved since these are

On Monday, 12 September 2016 11:53:26 CEST Richard W.M. Jones wrote: > Only do this if running as root and if the backend is set > to libvirt. > --- > v2v/input_ova.ml | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml > index 4f848e2..bb9cb1b 100644 > --- a/v2v/input_ova.ml > +++ b/v2v/input_ova.ml > @@

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.