similar to: [PATCH] Check for, and uninstall, VMware Tools installed from tarball

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

Removing xen kernels during conversion is tidier, but occasionally problematic. For example, if the kernel has dependent kmods which prevent its uninstallation, the code to remove it reliably across multiple versions of RHEL becomes tricky. The existing code doesn't handle this at all, and the conversion will fail in this case. As it isn't strictly necessary to remove xen kernels, this

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

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

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

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

From: Qixiang Wan <qwan at redhat.com> Commit 0973765674abd773ad04a99ddfdff8e81693e1ff introduced a regression which caused the OVF file not to be generated when outputting to RHEV. Fixes RHBZ#602067 --- lib/Sys/VirtV2V/Target/RHEV.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/VirtV2V/Target/RHEV.pm b/lib/Sys/VirtV2V/Target/RHEV.pm index

mkinitrd needs to mount files using loop. loop might be a module, so try to load it first. --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 0e469f5..08027b6 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -1114,6

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

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

Building on EL-5 fails when the result of File::Temp->new() is passed to open3(). tmpfile() works consistently. --- lib/Sys/VirtV2V/ExecHelper.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Sys/VirtV2V/ExecHelper.pm b/lib/Sys/VirtV2V/ExecHelper.pm index 110ae9f..f577ff6 100644 --- a/lib/Sys/VirtV2V/ExecHelper.pm +++ b/lib/Sys/VirtV2V/ExecHelper.pm @@ -20,7

This will allow use of raw data from os description in addition to libvirt XML when writing guest output. --- lib/Sys/VirtV2V/Target/LibVirt.pm | 2 +- lib/Sys/VirtV2V/Target/RHEV.pm | 2 +- v2v/virt-v2v.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Sys/VirtV2V/Target/LibVirt.pm b/lib/Sys/VirtV2V/Target/LibVirt.pm index

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

--- 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(); +

--- lib/Sys/VirtV2V/HVTarget/Linux.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/VirtV2V/HVTarget/Linux.pm b/lib/Sys/VirtV2V/HVTarget/Linux.pm index 53784ea..dc546de 100644 --- a/lib/Sys/VirtV2V/HVTarget/Linux.pm +++ b/lib/Sys/VirtV2V/HVTarget/Linux.pm @@ -349,7 +349,7 @@ sub _configure_kernel } # If we didn't install a new kernel, pick the

This is belt and braces, because we've already added it to scsi_hostadapter. --- lib/Sys/VirtV2V/Converter/Linux.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/VirtV2V/Converter/Linux.pm b/lib/Sys/VirtV2V/Converter/Linux.pm index 375da48..d5a93a7 100644 --- a/lib/Sys/VirtV2V/Converter/Linux.pm +++ b/lib/Sys/VirtV2V/Converter/Linux.pm @@ -341,7 +341,7 @@

--- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index cd2f8e6..380dacb 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -862,6 +862,9 @@ sub remove_application $g->command(['rpm', '-e',

--- lib/Sys/VirtV2V/ExecHelper.pm | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/Sys/VirtV2V/ExecHelper.pm b/lib/Sys/VirtV2V/ExecHelper.pm index 87f6d06..110ae9f 100644 --- a/lib/Sys/VirtV2V/ExecHelper.pm +++ b/lib/Sys/VirtV2V/ExecHelper.pm @@ -68,25 +68,17 @@ sub run my $self = {}; bless($self, $class); - $self->{output} =

--- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index a973c19..6dc4c95 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -686,7 +686,7 @@ sub _get_installed error => $error))); } -