similar to: [PATCH] v2v: -o libvirt: always write pool names (RHBZ#1141631)

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.

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

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 @@

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 ---

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.

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

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

When running in verbose mode, dump the XML we created for libvirt: this way it is easier to debug mismatches between what we want to setup in libvirt, and what actually gets defined. --- v2v/output_libvirt.ml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index abdd410..f86f336 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml

This patch series adds stable bus and slot numbers for removable drives (CDs and floppies) when the guest is converted using virt-v2v or virt-p2v. Previously we were a bit random about this. After this patch series, the bus and slot numbers and preserved if at all possible. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1238053 Rich.

Hi, this series switches virt-2v to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not test all

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 ++--

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

This is just a refactoring and doesn't change the meaning of the code. --- v2v/output_libvirt.ml | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 68af3de..d1cbaa1 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -222,46 +222,44 @@ let create_libvirt_xml

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)

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

Currently virt-v2v has few custom C-based functions for libvirt operations, which are limited in what they do, and there is a lot of duplicated code. Instead, switch to ocaml-libvirt for all the libvirt interaction currently done by the Libvirt_utils module. This has few advantages: - each input & output module now opens a libvirt connection only once, only when needed - no need to pass

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

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

Since this new temporary directory will contain UNIX sockets for communicating with nbdkit, then its path must not be too long. Use the existing directory that libguestfs exposes for this, i.e. sockdir. --- v2v/nbdkit.ml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/v2v/nbdkit.ml b/v2v/nbdkit.ml index 65317f9b..46b20c9d 100644 --- a/v2v/nbdkit.ml +++ b/v2v/nbdkit.ml