search for: remap_block_devices

...----------- 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 _remap_block_devices { my ($guestos, $dom, $desc, $virtio) = @_; - die("remap_block_devices called without guestos argument") - unless defined($guestos); - die("remap_block_devices called without dom argument") - unless defined($dom); - die("remap_block_devices call...

remap_block_devices was modifying the global device list while remapping device names for libata guests (which includes RHEL 6). This caused a failure later when the renamed devices were not present in the original XML. Fixes RHBZ#641869 --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 14 +++++++++++++- 1 files changed, 1...

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

...estOS/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, "/dev/".$map{$name}.$part); } $g->aug_save(); + + # Delete cached (and now out of date) blkid info if it exists + foreach my $blkidtab ('/etc/blkid/blkid.tab', '/etc/blkid.tab') { + $g->rm($blkidtab) if ($g->ex...

...onvert called without devices argument") unless defined($devices); # Un-configure HV specific attributes which don't require a direct # replacement @@ -117,7 +118,7 @@ sub convert # Configure the rest of the system _configure_display_driver($guestos, $virtio); - _remap_block_devices($guestos, $dom, $desc, $virtio); + $guestos->remap_block_devices($devices, $virtio); _configure_kernel_modules($guestos, $desc, $virtio); _configure_boot($guestos, $kernel, $virtio); @@ -130,32 +131,6 @@ sub convert return \%guestcaps; } -sub _remap_block_devices -{ - m...

..._rm path)) (List.rev paths) - ); + ; (* Display a warning about any leftover Xen modules which we * haven't converted. These are likely to cause an error when @@ -1215,7 +1222,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = !modpath - and remap_block_devices virtio = + and remap_block_devices block_type = (* This function's job is to iterate over boot configuration * files, replacing "hda" with "vda" or whatever is appropriate. * This is mostly applicable to old guests, since newer OSes use @@ -1238,7 +1245,9 @...

...ernel modules weren't updated foreach my $module (keys(%hvs_modules)) { diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 3f5d90a..8664c2d 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -964,54 +964,52 @@ sub remap_block_devices # same names as used by the guest. However, if the guest is using libata, # IDE drives could be renamed. - # Look for IDE and SCSI devices in fstab for the guest - my %guestif; - foreach my $spec ($g->aug_match('/files/etc/fstab/*/spec')) { - my $device = $g-&...

..._rm path)) (List.rev paths) - ); + ; (* Display a warning about any leftover Xen modules which we * haven't converted. These are likely to cause an error when @@ -1215,7 +1222,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = !modpath - and remap_block_devices virtio = + and remap_block_devices block_type = (* This function's job is to iterate over boot configuration * files, replacing "hda" with "vda" or whatever is appropriate. * This is mostly applicable to old guests, since newer OSes use @@ -1238,7 +1245,9 @...

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

...;aug_load(); }; - # Propagate command failure - die($@) if($@); - - # Reload augeas in case the rpm installation changed anything - $g->aug_load(); + $self->_augeas_error($@) if($@); } # Get full, local path of a file on the transfer mount @@ -1049,13 +1113,17 @@ sub remap_block_devices if ($libata) { # Look for IDE and SCSI devices in fstab for the guest my %guestif; - foreach my $spec ($g->aug_match('/files/etc/fstab/*/spec')) { - my $device = $g->aug_get($spec); + eval { + foreach my $spec ($g->aug_matc...

...etc/modules.conf"; "/etc/conf.modules" ] in - !modpath + try + List.find (g#is_file ~followsymlinks:true) paths + with Not_found -> + error (f_"unable to find any valid modprobe configuration file such as /etc/modprobe.conf"); + ) and remap_block_devices block_type = (* This function's job is to iterate over boot configuration -- 2.5.5

...ys/VirtV2V/Converter/Linux.pm +++ b/lib/Sys/VirtV2V/Converter/Linux.pm @@ -112,6 +112,7 @@ sub convert my $virtio = $guestos->supports_virtio($kernel); # Configure the rest of the system + _configure_console($g); _configure_display_driver($guestos, $virtio); $guestos->remap_block_devices($devices, $virtio); _configure_kernel_modules($guestos, $desc, $virtio); @@ -193,6 +194,51 @@ sub _configure_kernel_modules } } +# We configure a console on ttyS0. Make sure existing console references use it. +sub _configure_console +{ + my ($g) = @_; + + # Look for gettys which...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...quot;; "/etc/modules.conf"; "/etc/conf.modules" ] in - - try - List.find (g#is_file ~followsymlinks:true) paths - with Not_found -> - error (f_"unable to find any valid modprobe configuration file such as /etc/modprobe.conf"); - ) - and remap_block_devices block_type = (* This function's job is to iterate over boot configuration * files, replacing "hda" with "vda" or whatever is appropriate. -- 2.9.3

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

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

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...elf->{config}->get_transfer_iso())) { - # Find the transfer device - my @devices = $g->list_devices(); - my $transfer = $devices[$#devices]; - - $g->mount_ro($transfer, $self->{transfer_mount}); - $self->{transfer_mounted} = 1; - } -} - =item remap_block_devices(devices, virtio) See BACKEND INTERFACE in L<Sys::VirtV2V::GuestOS> for details. @@ -1830,19 +1797,6 @@ sub supports_virtio return 1; } -sub DESTROY -{ - my $self = shift; - - my $g = $self->{g}; - - # Remove the transfer mount point if it was used - $g->umount($se...

...my $g = $self->{g}; + + # Find the transfer device + my @devices = $g->list_devices(); + my $transfer = $devices[$#devices]; + + $self->{transfer_mount} = $g->mkdtemp("/tmp/transferXXXXXX"); + $g->mount_ro($transfer, $self->{transfer_mount}); +} + +sub remap_block_devices +{ + my $self = shift; + my %map = @_; + + my $g = $self->{g}; + + # Iterate over fstab. Any entries with a spec in the the map, replace them + # with their mapped values + eval { + foreach my $spec ($g->aug_match('/etc/fstab/*/spec')) { + my $devic...