similar to: [PATCH] RHEV: Warn instead of die if rmtree dies during cleanup

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

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

Fixes RHBZ#615182 --- lib/Sys/VirtV2V/Connection/RHEVTarget.pm | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Sys/VirtV2V/Connection/RHEVTarget.pm b/lib/Sys/VirtV2V/Connection/RHEVTarget.pm index c9dd148..b63d956 100644 --- a/lib/Sys/VirtV2V/Connection/RHEVTarget.pm +++ b/lib/Sys/VirtV2V/Connection/RHEVTarget.pm @@ -442,9 +442,7 @@ sub new my $class =

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

I've been experiencing severe stability issues writing large amounts of data to an NFS export (I have never successfully written 8GB of data without having to reboot my machine). This patch alleviates the problem. I have successfully exported an 8GB disk with this patch in place. --- lib/Sys/VirtV2V/Target/RHEV.pm | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23

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

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

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

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

perl's '>' open mode truncates by default, and will create a new file if necessary. We don't want to truncate an existing volume when writing to it, and it's an error if the volume doesn't already exist. Use sysopen to be explicit about this. --- lib/Sys/VirtV2V/Target/LibVirt.pm | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git

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

LibVirtXMLSource was subclassing an invalid class, and consequently didn't have copy_storage defined. Fixes RHBZ#670175 --- lib/Sys/VirtV2V/Connection/LibVirtXMLSource.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/VirtV2V/Connection/LibVirtXMLSource.pm b/lib/Sys/VirtV2V/Connection/LibVirtXMLSource.pm index e62d996..ffb9309 100644 ---

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

--- lib/Sys/VirtV2V/Transfer/SSH.pm | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lib/Sys/VirtV2V/Transfer/SSH.pm b/lib/Sys/VirtV2V/Transfer/SSH.pm index 3b08716..ac5a384 100644 --- a/lib/Sys/VirtV2V/Transfer/SSH.pm +++ b/lib/Sys/VirtV2V/Transfer/SSH.pm @@ -82,6 +82,7 @@ sub transfer my $vol = $target->create_volume($name, $size); $vol->open(); +

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

VMware Tools can be installed by RPM or from a tarball. We were only looking for the RPM. If it was installed by tarball, we would end up leaving it in place. If VMware Tools detects that it is not running on a VMware platform when it starts, it will clumsily try to uninstall itself, leading to misconfiguration. This patch looks for tarball-installed VMware Tools and uninstalls it. Fixes

We were previously forcing the augeas Modprobe lens to match modules.conf and conf.modules. It turns out that the contents of these files are quite different to modprobe.conf, requiring a new lens. This change keeps the logic which looks for where modules should go, but doesn't update the augeas configuration. If there is no augeas lens for /etc/modules.conf, any attempt to parse or modify it

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

For guests registered with Red Hat Network, this patch allows for the conversion process to use RHN to download appropriate kernel package and its dependencies. We use yum on RHEL-5, up2date libraries on RHEL-4. We install matching kernel version whenever possible, latest available kernel version otherwise. _discover_kernel routine has been extended to return version-release of the default