similar to: [PATCH] v2v: -o libvirt: dump XML for libvirt if verbose

There's a standardized libosinfo namespace for libvirt domain metadata. For now it supports the id of the OS only. However that is still a very helpful feature that is already supported in gnome-boxes and virt-manager (at least). The discussion happened here: https://www.redhat.com/archives/libosinfo/2018-September/msg00003.html So let's add the support to local and libvirt outputs.

When creating the XML for the new guest, always put the name of the pool containing the disks, even when -os specified a pool UUID: libvirt does not handle pool UUIDs for storage, but only names. --- v2v/output_libvirt.ml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 5fa338f..e934335 100644 ---

Pass -q to virsh if virt-v2v was run with -q, to reduce its output in quiet mode. Unfortunately this does not currently work in virsh as it should, see RHBZ#1358179, so only after that bug is fixed this change can actually take effect. --- v2v/output_libvirt.ml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml

Create the correct tags for <video> in the libvirtxml, so all the attributes are in a <model> child of <video> instead of <video> itself. Adapt the XML of test-v2v-i-ova to the different expected XML. --- v2v/output_libvirt.ml | 9 +++++---- v2v/test-v2v-i-ova.xml | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/v2v/output_libvirt.ml

Now that we have a Libvirt.Pool object for the output storage pool, query it to get its name instead of reading it from the XML. The result is unchanged. --- v2v/output_libvirt.ml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 0247e5ad..dfd5d1a3 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@

Implement what old virt-v2v did (from lib/Sys/VirtConvert/Connection/LibVirtTarget.pm) Thanks: Tingting Zheng, Matthew Booth --- v2v/output_libvirt.ml | 118 ++++++++++++++++++++++++++++++++++++++++++++++--- v2v/output_libvirt.mli | 2 +- v2v/output_local.ml | 13 +++++- v2v/test-v2v-i-ova.xml | 5 ++- 4 files changed, 128 insertions(+), 10 deletions(-) diff --git

On Fri, Nov 23, 2018 at 12:39:44PM +0100, Martin Kletzander wrote: > There's a standardized libosinfo namespace for libvirt domain metadata. For now > it supports the id of the OS only. However that is still a very helpful feature > that is already supported in gnome-boxes and virt-manager (at least). > > The discussion happened here: > >

There's a standardized libosinfo namespace for libvirt domain metadata. For now it supports the id of the OS only. However that is still a very helpful feature that is already supported in gnome-boxes and virt-manager (at least). The discussion happened here: https://www.redhat.com/archives/libosinfo/2018-September/msg00003.html So let's add the support to local and libvirt outputs.

Store the Libvirt.Connect.t object as instance variable, so it can be used also outside of prepare_targets. Use a private method to access it, so there is no need to directly use the Lazy object. --- v2v/output_libvirt.ml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 30857c572..e62e43bb8 100644 ---

Add a common debug function for printing debugging messages. It only emits the debug message when the verbose (-v) flag is used on the command line. It sends the output to stderr, which is flushed immediately after the message is printed (to help with debugging unexpected crashes). There are good arguments for sending the debug to either stdout or stderr, and almost all existing debug messages

Avoids a lengthy conversion followed by failure if we discover at the end that OVMF is not installed. This also changes the order of the methods in -o libvirt and -o qemu so that it matches the order in the class interface, and also logically makes more sense. Partial fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1429506 Thanks: Christopher Brown --- v2v/output_libvirt.ml | 4 ++--

Now that we have a proper libvirt connection object, use it directly to refresh the storage pool, and define the final guest. This avoids spawning a new virsh process twice, with no possibility to even share a possible authentication required. --- v2v/output_libvirt.ml | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/v2v/output_libvirt.ml

Add a Common_utils.debug function for printing messages only when in verbose mode. Rich.

Add a simple helper to run a command from a sequence of arguments, without using a shell: this should help reducing the amount of quoting ineeded, since arguments are passed straight as such. Make use of it in the places currently using shell_command, and which don't assume they can run anything (so no shell redirections, `env`, etc). --- builder/builder.ml | 62

Create two temporary directories for all the files created during the virt-v2v run: 1) tmpdir, created as $TMPDIR/virt-v2v.XXXXXX, for all the small files 2) cachedir, created as $LIBGUESTFS_CACHEDIR/virt-v2v.XXXXXX, for the big files (e.g. disks) This way there is no need to manually schedule all the temporary files and directories for removal when the application quits. --- v2v/input_ova.ml

In verbose mode, print the generated libvirt XML to stderr for debugging, just like -o libvirt does. --- v2v/output_local.ml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/v2v/output_local.ml b/v2v/output_local.ml index 4e1088afc..c70428134 100644 --- a/v2v/output_local.ml +++ b/v2v/output_local.ml @@ -68,7 +68,13 @@ class output_local dir = object let name =

Add an optional parameter to disable this behaviour, so the Curl module in v2v won't print user-sensible data (like passwords). --- builder/checksums.ml | 1 - builder/downloader.ml | 1 - builder/sigchecker.ml | 1 - mllib/common_utils.ml | 4 +++- mllib/common_utils.mli | 7 +++++-- v2v/curl.ml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git

Enhance the Libvirt_utils module with libvirt connection objects, and read-only and read-writen open functions for them; adapt the rest of the mini-binding to use these objects, instead of opening + closing libvirt connections every time. This has different improvements: a) a libvirt connection is reused for different API calls, improving the communication with remote (input) servers b)

https://bugzilla.redhat.com/show_bug.cgi?id=889082

This function will allow more OCaml-ish processing of XPath queries with multiple results. --- common/mltools/xpath_helpers.ml | 9 +++++++ common/mltools/xpath_helpers.mli | 4 +++ v2v/output_libvirt.ml | 11 ++------ v2v/test-harness/v2v_test_harness.ml | 51 +++++++++++------------------------- 4 files changed, 30 insertions(+), 45 deletions(-) diff --git