similar to: [PATCH] Fix device name mapping for libata guests

These checks found not to be useful. --- lib/Sys/VirtV2V/Converter/Linux.pm | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) diff --git a/lib/Sys/VirtV2V/Converter/Linux.pm b/lib/Sys/VirtV2V/Converter/Linux.pm index 87eeeb3..1186430 100644 --- a/lib/Sys/VirtV2V/Converter/Linux.pm +++ b/lib/Sys/VirtV2V/Converter/Linux.pm @@ -133,14 +133,6 @@ sub convert sub

Previously we used SCSI when VirtIO wasn't available. KVM's SCSI support is not as mature as its IDE support, and SCSI isn't supported at all in RHEV. --- lib/Sys/VirtV2V/Converter.pm | 50 +++++++++++------- lib/Sys/VirtV2V/Converter/Linux.pm | 19 ++++--- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 100 ++++++++++++++++++++---------------- 3 files changed, 100 insertions(+), 69

We were assuming that guests wouldn't use multiple interfaces, or if they did, drive letters wouldn't clash between the interfaces. An ESX guest with a CDROM device breaks this because hard disks will be presented a SCSI, starting at sda, and CDROM devices are presented as IDE, starting at hda. This is in contrast to QEMU, which starts at hdc by default. Firstly, this change causes disks

--- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 7c41ff6..ba37001 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -1132,6 +1132,11 @@ sub remap_block_devices $g->aug_set($spec,

Add a function to display more complete augeas errors if they occur. Update all uses of augeas in GuestOS::RedHat to use it for error reporting. --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 185 ++++++++++++++++++++++++------------- 1 files changed, 121 insertions(+), 64 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index cf8787d..8b211f0 100644 ---

Add a directory to contain required augeas lenses which aren't yet upstream. Include a new lens for grub's device.map. --- augeas/README.txt | 4 ++++ augeas/device_map.aug | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 augeas/README.txt create mode 100644 augeas/device_map.aug diff --git a/augeas/README.txt

During the conversion process, hd* block devices under Xen are mapped to sd* devices for use under guestfs. These sd devices are later remapped to vd* (or sd/hd) devices, for future use under kvm. The current code fails to track the original hd* device names. This causes subsequent remappings of the block devices (in such places as /etc/fstab, and /boot/grub/menu.lst), to skip the hd* devices,

--- lib/Sys/VirtConvert/Converter/RedHat.pm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/Sys/VirtConvert/Converter/RedHat.pm b/lib/Sys/VirtConvert/Converter/RedHat.pm index 36345e7..fc4f5f0 100644 --- a/lib/Sys/VirtConvert/Converter/RedHat.pm +++ b/lib/Sys/VirtConvert/Converter/RedHat.pm @@ -2234,6 +2234,10 @@ sub _remap_block_devices # Fedora

This change updates a guest which uses Xen's xvc0 to use ttyS0 instead. In a related change, it also makes a console a 'standard device' will always be configured. --- lib/Sys/VirtV2V/Converter.pm | 5 +++- lib/Sys/VirtV2V/Converter/Linux.pm | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletions(-) diff --git

The code for mounting the transfer iso in Converter::Windows didn't do the same level of error checking as the same code in GuestOS::RedHat. This change moves the GuestOS code into Config, and updates both GuestOS::RedHat and Converter::Windows to use Config. Fixes RHBZ#596091 --- lib/Sys/VirtV2V/Config.pm | 51 ++++++++++++++++++++++++ lib/Sys/VirtV2V/Converter/Windows.pm |

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

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 implements the structure and most of the functionality of the initial virt-v2v tool. --- perl/lib/Sys/Guestfs/GuestOS.pm | 97 ++++ perl/lib/Sys/Guestfs/GuestOS/RedHat.pm | 506 +++++++++++++++++++++ perl/lib/Sys/Guestfs/HVSource.pm | 132 ++++++ perl/lib/Sys/Guestfs/HVSource/Xen/Linux.pm | 141 ++++++ perl/lib/Sys/Guestfs/HVTarget.pm

This approach looks great. I think there are a couple of bits to look at (see below), but probably not much. Matt On Wed, 2013-10-02 at 23:46 -0600, Mike Latimer wrote: > This is a proposed patch which changes the RedHat.pm converter to Linux.pm, > and adds support for SUSE guest conversion. This is first approach recommended > by Matt Booth in: > >

If a volume is not an exact multiple of 512 bytes, qemu-img will report its size rounded down to a 512 byte boundary. However, when copying, the file is still read until EOF, which will return more data than was expected. This change prevents that causing a failure in itself. The situation is still not resolved, however, as there are still situations where this will cause a failure. For example,

Give the caller certain control over what kind of interface to use for virtual disks, network and video cards upon conversion. For that, make convert functions accept additional rcaps parameter containing an object with optional capabilities similar to the ones produced on output, with None indicating that the decision is left to the convert function itself. To facilicate review, this patch

Give the caller certain control over what kind of interface to use for virtual disks, network and video cards upon conversion. For that, make convert functions accept additional rcaps parameter containing an object with optional capabilities similar to the ones produced on output, with None indicating that the decision is left to the convert function itself. To facilicate review, this patch

Mike, This is great. I have a couple of minor comments inline, but this looks good. I do have a major concern, though, which is this is basically a fork of RedHat.pm. There are well over 1,000 identical lines of code between the 2 modules. Many of the differences are relatively minor, and could be handled with additional cases. I've also fixed a couple of bits in RedHat.pm since you forked

Hi, due to a broken discover_modpath function, and to a wrong block for a match statement, the modprobe options for virtio/SCSI blocks where not written at all. This series provides a small refactor, and the fixes. Thanks, -- Pino Toscano (2): v2v: fix and implify the internal Convert_linux:discover_modpath v2v: fix priority of match in configure_kernel_modules v2v/convert_linux.ml | 34

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.