search for: inspect_guest

...od eq 'rhev' ); +# Get the name of the appliance's transfer device, if it has one +my $transferdev; +if (defined($transferiso)) { + my @devices = $g->list_devices(); + $transferdev = pop(@devices); +} + my $guestcaps; my $desc; eval { # Inspect the guest - $desc = inspect_guest($g); + $desc = inspect_guest($g, $transferdev); # Modify the guest and its metadata $guestcaps = @@ -559,9 +566,18 @@ sub signal_exit sub inspect_guest { my $g = shift; + my $transferdev = shift; # Get list of roots, sorted. my @roots = $g->inspect_os (); + +...

...tem Sys::VirtConvert::Converter->convert(g, config, root, meta) Instantiate an appropriate backend and call convert on it. @@ -65,9 +65,9 @@ A libguestfs handle to the target. An initialised Sys::VirtConvert::Config object. -=item desc +=item root -The OS description (see virt-v2v.pl:inspect_guest). +The root device of the os to be converted. =item meta @@ -81,18 +81,37 @@ sub convert { my $class = shift; - my ($g, $config, $desc, $meta) = @_; + my ($g, $config, $root, $meta) = @_; croak("convert called without g argument") unless defined($g); croak(&qu...

...physical block device, and tried to do fuzzy matching on its interface. --- v2v/virt-v2v.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl index 7c0d7d6..fe07ae9 100755 --- a/v2v/virt-v2v.pl +++ b/v2v/virt-v2v.pl @@ -604,7 +604,7 @@ sub inspect_guest # Choose the first one. $root_dev = $roots[0]; } - elsif ($root_choice =~ m|^/dev/[hsv]d(.*)|) { + elsif ($root_choice =~ m|^/dev/[hsv]d([a-z]+[0-9]*)$|) { # Choose the named root. my $partnum = $1; foreach (@ro...

...1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl index 726cd50..9008ad6 100755 --- a/v2v/virt-v2v.pl +++ b/v2v/virt-v2v.pl @@ -370,16 +370,29 @@ if ($output_method eq 'rhev') { $> = "0"; } -# Inspect the guest -my $os = inspect_guest($g); +my $os; +my $guestcaps; +eval { + # Inspect the guest + $os = inspect_guest($g); + + # Instantiate a GuestOS instance to manipulate the guest + my $guestos = Sys::VirtV2V::GuestOS->new($g, $os, $dom, $config); -# Instantiate a GuestOS instance to manipulate the guest -my $gue...

...$_->{dst}->get_path(), $_->{dst}->get_format() ] } @{$meta->{disks}}; @@ -623,13 +664,17 @@ my $guestcaps; my $root; eval { # Inspect the guest + if (defined($verbose)) { logmsg NOTICE, __x('Inspecting guest') } $root = inspect_guest($g, $transferdev); # Modify the guest and its metadata + if (defined($verbose)) { logmsg NOTICE, __x('Converting guest') } $guestcaps = Sys::VirtConvert::Converter->convert($g, $config, $root, $meta, \%options); +...

...; 1 }) if (defined($bridge)); $bridge = $value; }, + "root=s" => \$root_choice, "p|profile=s" => \$profile, "list-profiles" => \$list_profiles ) or pod2usage(2); @@ -539,20 +579,74 @@ sub inspect_guest my $oses = inspect_operating_systems ($g, \%fses); - # Only work on single-root operating systems. + # Get list of roots, sorted. my $root_dev; - my @roots = keys %$oses; + my @roots = sort (keys %$oses); if(@roots == 0) { v2vdie __('No root device foun...

...refix Sys::VirtV2V::UserMessage->set_identifier('virt-v2v'); @@ -362,9 +370,6 @@ if ($output_method eq 'rhev') { $> = "0"; } -$SIG{'INT'} = \&close_guest_handle; -$SIG{'QUIT'} = \&close_guest_handle; - # Inspect the guest my $os = inspect_guest($g); @@ -425,6 +430,12 @@ sub close_guest_handle } } +sub signal_exit +{ + close_guest_handle(); + exit(1); +} + sub get_guestfs_handle { my ($storage, $transferiso) = @_; -- 1.7.0.1

...f omitted, this defaults to qemu:///system. +B<N.B.> virt-v2v can currently automatically obtain guest storage from local +libvirt connections, ESX connections, and connections over SSH. Other types of +connection are not supported. + =cut my $input_transport; @@ -429,14 +433,11 @@ sub inspect_guest =head1 PREPARING TO CONVERT A GUEST -=head2 Xen guests - -The following steps are required before converting a Xen guest. Note that only -local Xen guests are currently supported. These steps are not required for -conversions from ESX, and will not be required for remote Xen guests when we -su...

...s] and [deps] sections) -Sys::VirtV2V::GuestOS->configure($config); +# Need to fix GuestOS's usage of config for installing applications +Sys::VirtV2V::GuestOS->configure({}); ############################################################################### @@ -316,7 +321,7 @@ my $os = inspect_guest($g); my $guestos = Sys::VirtV2V::GuestOS->instantiate($g, $os); # Modify the guest and its metadata for the target hypervisor -Sys::VirtV2V::Converter->convert($vmm, $guestos, $dom, $os); +Sys::VirtV2V::Converter->convert($vmm, $guestos, $config, $dom, $os); $g->umount_all(); $g...

...gt; options. I<-op> must be +specified for the libvirt output method. + +=item rhev + +Create a guest on a RHEV 'Export' storage domain, which can later be imported +into RHEV using the UI. I<-osd> must be specified for the rhev output method. =back @@ -478,14 +486,8 @@ sub inspect_guest my %fses = inspect_all_partitions ($g, \@partitions); - #print "fses -----------\n"; - #print Dumper(\%fses); - my $oses = inspect_operating_systems ($g, \%fses); - #print "oses -----------\n"; - #print Dumper($oses); - # Only work on sing...

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

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

...s] and [deps] sections) -Sys::VirtV2V::GuestOS->configure($config); +# Need to fix GuestOS's usage of config for installing applications +Sys::VirtV2V::GuestOS->configure({}); ############################################################################### @@ -316,7 +321,7 @@ my $os = inspect_guest($g); my $guestos = Sys::VirtV2V::GuestOS->instantiate($g, $os); # Modify the guest and its metadata for the target hypervisor -Sys::VirtV2V::Converter->convert($vmm, $guestos, $dom, $os); +Sys::VirtV2V::Converter->convert($vmm, $guestos, $config, $dom, $os); $g->umount_all(); $g...

...# Open a libguestfs handle on the guest's storage devices -my $g = get_guestfs_handle(\@storage, $transferiso); +my $g = get_guestfs_handle($storage, $transferiso); $SIG{'INT'} = \&close_guest_handle; $SIG{'QUIT'} = \&close_guest_handle; @@ -280,7 +280,8 @@ my $os = inspect_guest($g); my $guestos = Sys::VirtV2V::GuestOS->new($g, $os, $dom, $config); # Modify the guest and its metadata for the target hypervisor -Sys::VirtV2V::Converter->convert($vmm, $guestos, $config, $dom, $os); +Sys::VirtV2V::Converter->convert($vmm, $guestos, $config, $dom, $os, +...

...V::Connection::LibVirt->new($input_uri, $name, - $pool); + $target); # Warn if we were given more than 1 argument if(scalar(@_) > 0) { @@ -280,10 +285,20 @@ my $os = inspect_guest($g); my $guestos = Sys::VirtV2V::GuestOS->new($g, $os, $dom, $config); # Modify the guest and its metadata for the target hypervisor -Sys::VirtV2V::Converter->convert($vmm, $guestos, $config, $dom, $os, - $conn->get_storage_devices()); - -$vmm->define...

...storage devices +my @devices = get_guest_devices($dom); -my $oses = inspect_operating_systems ($g, \%fses); +# Open a libguestfs handle on the guest's devices +my $g = get_guestfs_handle(@devices); -#print "oses -----------\n"; -#print Dumper($oses); +# Inspect the guest +my $os = inspect_guest($g); -# Only work on single-root operating systems. -my $root_dev; -my @roots = keys %$oses; -die __"no root device found in this operating system image" if @roots == 0; -die __"multiboot operating systems are not supported by v2v" if @roots > 1; -$root_dev = $roots[0]; +#...

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,

These patches combine HVSource and HVTarget into a single Converter. This should make it more obvious where to hack without losing any practical flexibility. GuestOS remains separate. GuestOS is now a misnomer, because it's really only a Linux distro abstraction. It will be useless for Windows, for example. Functions which you'd expect to be different on a non-RH distro should live in

This is a new conversion module to convert SUSE Linux and openSUSE guests. The converter is based on the RedHat module, and should offer the same functionality on both SUSE and RedHat hosts. There are a few additional messages in this module, such as reporting of packages when installing through zypper or the local virt-v2v repo. These messages don't necessarily flow unless verbose switches