similar to: [PATCH] Target::LibVirt: Don't truncate a volume when opening it

Move all target-specific functionality into its own module in preparation for output to RHEV. --- MANIFEST | 1 + lib/Sys/VirtV2V/Connection.pm | 46 ++--- lib/Sys/VirtV2V/Converter.pm | 138 +------------ lib/Sys/VirtV2V/Target/LibVirt.pm | 419 +++++++++++++++++++++++++++++++++++++ lib/Sys/VirtV2V/Transfer/ESX.pm | 91 +++------ po/POTFILES.in

Also changes command line parsing to require a pool to be specified when using libvirt output, meaning storage will always be copied. --- MANIFEST | 1 + lib/Sys/VirtV2V/Connection.pm | 74 +++++++++--------- lib/Sys/VirtV2V/Connection/LibVirt.pm | 18 +++-- lib/Sys/VirtV2V/Connection/LibVirtXML.pm | 11 ++- lib/Sys/VirtV2V/Target/LibVirt.pm

We now always copy a guest during conversion, meaning this tool is no longer required. --- Build.PL | 2 +- MANIFEST | 2 - lib/Sys/VirtV2V.pm | 9 +- lib/Sys/VirtV2V/Connection.pm | 1 - po/POTFILES.in | 1 - snapshot/run-snapshot-locally | 43 -- snapshot/v2v-snapshot.pl | 931

These 2 patches are mostly code motion. They were prompted by an apparent augeas error in BZ 613967 which didn't display useful error message. The error seems to happen in Converter::Linux. GuestOS::RedHat had a handy function which displayed verbose augeas error messages. This function moves into the new module where it can be used by both modules. The second patch is an consequential tidy

Previously, only the LibVirtXML connection translated network and bridge names in imported metadata. This change moves this functionality in Converter, making it available to LibVirt connections as well. At the same time, the format of the config file is switched to XML. The primary driver for this is that the allowable syntax of a foreign network/bridge name is not known. Rather than create a

This patch refactors the data transfer code with several goals: * Have a common read(source)/write(target) loop so that common processing can happen in the middle of it, e.g. format change/progress bar * Provide volume metadata to transfers to allow smarter reading/writing, e.g. of sparse files * Simplify the data transfer code The patch *isn't* NFC because there are some minor behaviour

This change replaces all direct usage of a Sys::Guestfs object in virt-v2v with a Sys::VirtV2V::GuestfsHandle proxy object. The proxy does 3 things: * Holds handle initialisation code * Adds the ability to explicitly close the handle * Adds the ability to register a callback to be executed before close The cleanup code in Sys::VirtV2V::Config is updated to use the new callback mechanism.

Cleanup was not happening properly if a migration to RHEV was killed prematurely with a Ctrl-C. Firstly, the SIGINT and SIGQUIT handlers were not being registered early enough in virt-v2v.pl. Secondly, if Ctrl-C killed the guestfs qemu process first it would deliver a SIGPIPE to v2v, which caused an unclean shutdown without cleanup. Fixes RHBZ#596015 --- v2v/virt-v2v.pl | 17 ++++++++++++++---

Exit with an error if we would overwrite an existing libvirt domain. Fixes RHBZ#617110 --- lib/Sys/VirtV2V/Connection/LibVirt.pm | 4 ++++ lib/Sys/VirtV2V/Target/LibVirt.pm | 31 ++++++++++++++++++++++++++++++- lib/Sys/VirtV2V/Target/RHEV.pm | 11 +++++++++++ 3 files changed, 45 insertions(+), 1 deletions(-) diff --git a/lib/Sys/VirtV2V/Connection/LibVirt.pm

This is my lightly tested patch which allows pre-conversion of Windows guests. You also need to supply rhsrvany.exe and firstboot scripts. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc.

The following patches are where I'm currently at with ESX support. I can now import a domain from ESX along with its storage. Note that I'm not yet doing any conversion. In fact, I've never even tested past the import stage (I just had an exit in there). The meat is really in the 4th patch. The rename of MetadataReader->Connection was because the Connection is now really providing

Previously, only the LibVirtXML connection translated network and bridge names in imported metadata. This change moves this functionality in Converter, making it available to LibVirt connections as well. At the same time, the format of the config file is switched to XML. The primary driver for this is that the allowable syntax of a foreign network/bridge name is not known. Rather than create a

If a user accidentally passed a valid XML document to the LibvirtXML which wasn't actually a libvirt domain XML document, they would end up getting obtuse errors from a libguestfs library. This change does 2 sanity checks: 1. After parsing a the XML document, check /domain/name exists. 2. Check that the domain defines some storage The second check is generally useful, as we can't

We previously wouldn't create a Config object if no config file was specified. This change ensures that a Config object is always created, but will do nothing interesting if there is no config file. Apart from being slightly cleaner, this allows information provided by Config to be later supplied from the command line instead. --- lib/Sys/VirtV2V/Config.pm | 34

rmtree can die instead of returning failure under some circumstances. We don't want this to stop cleanup. --- lib/Sys/VirtV2V/Target/RHEV.pm | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/Sys/VirtV2V/Target/RHEV.pm b/lib/Sys/VirtV2V/Target/RHEV.pm index 295c19d..c9add0c 100644 --- a/lib/Sys/VirtV2V/Target/RHEV.pm +++

With this patchset I have successfully[1] imported a RHEL 5 guest directly from ESX with the following command line: virt-v2v -ic 'esx://yellow.marston/?no_verify=1' -op transfer RHEL5-64 Login details are stored in ~/.netrc Note that this is the only guest I've tested against. I haven't for example, checked that I haven't broken Xen imports. Matt [1] With the exception of

Although I can't reproduce, I seem to have had an incomplete transfer which wasn't picked up by the existing error handling. This change adds some more sanity checks: * Check for error on close() (should have been doing this anyway) * Check that the bytes received == reported content length --- lib/Sys/VirtV2V/Transfer/ESX.pm | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1

Support obtaining guest storage over ssh. The following now works: virt-v2v -f v2v/virt-v2v.conf -ic 'xen+ssh://xen.example.com/system' \ -op transfer rhel54pv64 --- MANIFEST | 1 + lib/Sys/VirtV2V/Connection.pm | 1 + lib/Sys/VirtV2V/Connection/LibVirt.pm | 4 + lib/Sys/VirtV2V/Transfer/SSH.pm | 208

Unfortunately libvirt will not always return volume information for a guest's volume. Specifically, it will not return volume information if the volume is not in a storage pool. Rather than displaying a generic libvirt error in this case, advise the user how they can create an appropriate storage pool. Fixes RHBZ#672498 --- lib/Sys/VirtV2V/Connection/LibVirtSource.pm | 27

This removes another chunk of functionality from GuestOS. --- MANIFEST | 1 + lib/Sys/VirtV2V/Config.pm | 339 +++++++++++++++++++++++++++++++++++++ lib/Sys/VirtV2V/Converter.pm | 56 +----- lib/Sys/VirtV2V/GuestOS.pm | 94 ---------- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 46 ++++-- v2v/virt-v2v.pl | 96 +---------- 6 files