Hello community, here is the log from the commit of package virt-v2v for openSUSE:Factory checked in at 2013-09-12 14:28:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-v2v (Old) and /work/SRC/openSUSE:Factory/.virt-v2v.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-v2v" Changes: -------- --- /work/SRC/openSUSE:Factory/virt-v2v/virt-v2v.changes 2013-08-27 21:22:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes 2013-09-12 14:28:38.000000000 +0200 @@ -1,0 +2,33 @@ +Mon Sep 9 23:11:48 UTC 2013 - mlati...@suse.com + +- Added support for packages to be installed prior to the conversion +- Added progress messages to virt-v2v + * add_progress_messages.patch +- Finalized virt-v2v.db changes to support pre-convert installation + of packages (specifically grubby). +- Merged add_suse_v2v_conf.patch and add_suse_capabilities.patch +- Reworked package installation code to provide better status updates +- Corrected i686 to i586 +- Added warning for (hd0) issue with older perl-Bootloaders (bnc#836521) + +------------------------------------------------------------------- +Wed Aug 28 21:51:38 UTC 2013 - mlati...@suse.com + +- Updated SUSE.pm conversion module to allow kernel updates during + conversion through zypper +- Added fix for multiple grub entries on RedHat machines + * fix_redhat_dup_grub_entries.patch +- Added SUSE examples to /etc/virt-v2v.conf + * add_suse_v2v_conf.patch + +------------------------------------------------------------------- +Fri Aug 16 23:03:41 UTC 2013 - mlati...@suse.com + +- Removed iface=ide option, which does not work with libvirt + * remove_ide_iface.patch +- Added SUSE to the list of environments which support libvirt + * add_suse_capabilities.patch +- Added menu.lst to the list of files which need root and resume + devices modified (in a PV environment) + +------------------------------------------------------------------- New: ---- add_suse_capabilities.patch add_verbose_messaging.patch fix_redhat_dup_grub_entries.patch remove_ide_iface.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-v2v.spec ++++++ --- /var/tmp/diff_new_pack.cZyGCa/_old 2013-09-12 14:28:39.000000000 +0200 +++ /var/tmp/diff_new_pack.cZyGCa/_new 2013-09-12 14:28:39.000000000 +0200 @@ -26,7 +26,11 @@ Url: http://git.fedorahosted.org/git/virt-v2v.git Source0: %{name}-v%{version}.tar.gz Source1: %{name}-rpmlintrc -Patch0: add_suse_converter.patch +Patch0: add_suse_capabilities.patch +Patch1: add_suse_converter.patch +Patch2: remove_ide_iface.patch +Patch3: fix_redhat_dup_grub_entries.patch +Patch4: add_verbose_messaging.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Backported upstream patches @@ -93,6 +97,7 @@ Requires: /usr/bin/ssh #Additional requirements to run on openSUSE 12.3 +Requires: guestfs-tools >= 1.22 Requires: perl-DateTime >= 0.72 Requires: perl-Term-ProgressBar >= 2.10 Requires: perl-XML-DOM >= 1.44 @@ -109,6 +114,10 @@ %setup -q -n %{name}-v%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build %{__perl} Build.PL @@ -145,7 +154,6 @@ # virt-v2v. It isn't packaged, though, so we need to delete it. find %{buildroot} -name .packlist -type f | xargs rm - %check ./Build test ++++++ add_suse_capabilities.patch ++++++ The following modifications are required to adds conversion capabilities to the virt-v2v.db for SLES and openSUSE through: - Adding virtio capabilities for SLES10/11 and openSUSE 10/11/12. - Designating the rpm containing the cirrus video driver in SLES/openSUSE - Adding a 'pre-convert' capability to install 'grubby' prior to beginning the convert process. This patch also adds the following SUSE examples to /etc/virt-v2v.conf: - A 'user-install' example for SLES 11. - Sample network conversion using SUSE naming defaults (br0 -> default). --- virt-v2v.conf | 8 +++++++ virt-v2v.db | 61 ++++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 57 insertions(+), 12 deletions(-) diff -Nurp a/v2v/virt-v2v.conf b/v2v/virt-v2v.conf --- a/v2v/virt-v2v.conf 2013-09-09 15:00:54.628956517 -0600 +++ b/v2v/virt-v2v.conf 2013-09-09 16:10:04.253725981 -0600 @@ -40,12 +40,20 @@ configuration data in /var/lib/virt-v2v/ <capability os='linux' distro='rhel' major='6' name='user-install'> <dep name='mypackage'/> </capability> + + <capability os='linux' distro='sles' major='11' name='user-install'> + <dep name='mypackage'/> + </capability> --> <!-- Networks --> <!-- Mappings for the defaults in Xen, ESX and libvirt/KVM to the default in libvirt/KVM --> <!-- + <network type='bridge' name='br0'> + <network type='network' name='default'/> + </network> + <network type='bridge' name='xenbr1'> <network type='network' name='default'/> </network> diff -Nurp a/v2v/virt-v2v.db b/v2v/virt-v2v.db --- a/v2v/virt-v2v.db 2013-09-09 15:01:02.198933701 -0600 +++ b/v2v/virt-v2v.db 2013-09-09 16:10:12.272696566 -0600 @@ -11,39 +11,62 @@ the modifications or additions to /etc/v <!-- Capabilities --> <!-- RHEL 6 has always supported virtio --> <capability os='linux' distro='rhel' major='6' name='virtio'/> - <capability os='linux' distro='rhel' major='5' name='virtio'> <dep name='kernel' minversion='2.6.18-128.el5'/> <dep name='lvm2' minversion='2.02.40-6.el5'/> <dep name='selinux-policy-targeted' minversion='2.4.6-203.el5' ifinstalled='yes'/> </capability> - <capability os='linux' distro='rhel' major='4' name='virtio'> <dep name='kernel' minversion='2.6.9-89.EL'/> </capability> - <!-- RHEL 5+ packages the cirrus driver in xorg-x11-drv-cirrus --> <capability os='linux' distro='rhel' major='6' name='cirrus'> <dep name='xorg-x11-drv-cirrus'/> </capability> - <capability os='linux' distro='rhel' major='5' name='cirrus'> <dep name='xorg-x11-drv-cirrus'/> </capability> - <!-- RHEL 4 bundles the cirrus driver with the main X package --> <capability os='linux' distro='rhel' major='4' name='cirrus'/> <!-- All current versions of Fedora support VirtIO --> <capability os='linux' distro='fedora' name='virtio'/> - <!-- All current versions of fedora package the cirrus driver in xorg-x11-drv-cirrus --> <capability os='linux' distro='fedora' name='cirrus'> <dep name='xorg-x11-drv-cirrus'/> </capability> + <!-- SLES 11 has always supported virtio --> + <capability os='linux' distro='sles' major='11' name='virtio'/> + <capability os='linux' distro='sles' major='10' name='virtio'> + <dep name='kernel' minversion='2.6.16.60-0.85.1'/> + </capability> + <!-- SLES packages the cirrus driver in xorg-x11-driver-video --> + <capability os='linux' distro='sles' name='cirrus'> + <dep name='xorg-x11-driver-video'/> + </capability> + <!-- Packages required for SLES conversions --> + <capability os='linux' distro='sles' name='pre-convert'> + <dep name='grubby'/> + </capability> + + <!-- openSUSE 11/12 has always supported virtio --> + <capability os='linux' distro='opensuse' major='12' name='virtio'/> + <capability os='linux' distro='opensuse' major='11' name='virtio'/> + <capability os='linux' distro='opensuse' major='10' name='virtio'> + <dep name='kernel' minversion='2.6.25.5-1.1'/> + </capability> + <!-- openSUSE packages the cirrus driver in xorg-x11-driver-video --> + <capability os='linux' distro='opensuse' name='cirrus'> + <dep name='xorg-x11-driver-video'/> + </capability> + <!-- Packages required for openSUSE conversions --> + <capability os='linux' distro='opensuse' name='pre-convert'> + <dep name='grubby'/> + </capability> + <!-- RHEL clones: copied from above with distro altered --> <!-- CentOS --> <capability os='linux' distro='centos' major='6' name='virtio'/> @@ -83,12 +106,6 @@ the modifications or additions to /etc/v </capability> <capability os='linux' distro='scientificlinux' major='4' name='cirrus'/> - <!-- All current versions of fedora package the cirrus driver in - xorg-x11-drv-cirrus --> - <capability os='linux' distro='fedora' name='cirrus'> - <dep name='xorg-x11-drv-cirrus'/> - </capability> - <!-- This is a place-holder for the 'user-custom' capability, which allows the user to install custom packages during linux conversions. Don't edit this entry; instead add a more specific match rule containing custom @@ -184,6 +201,26 @@ the modifications or additions to /etc/v <path>rhel/4/kernel-largesmp-2.6.9-89.EL.x86_64.rpm</path> </app> + <!-- SLES + These RPMs are available from the openSUSE Build Service + (https://build.opensuse.org) --> + <app os='linux' distro='sles' major='11' arch='x86_64' name='grubby'> + <path>sles/11/grubby-8.25-10.1.x86_64.rpm</path> + </app> + <app os='linux' distro='sles' major='11' arch='i586' name='grubby'> + <path>sles/11/grubby-8.25-10.1.i586.rpm</path> + </app> + + <!-- openSUSE + These RPMs are available from the openSUSE Build Service + (https://build.opensuse.org) --> + <app os='linux' distro='opensuse' major='12' arch='x86_64' name='grubby'> + <path>sles/11/grubby-8.25-10.1.x86_64.rpm</path> + </app> + <app os='linux' distro='opensuse' major='12' arch='i586' name='grubby'> + <path>sles/11/grubby-8.25-10.1.i586.rpm</path> + </app> + <!-- Windows --> <!-- Each of these should point to the directory containing the appropriate ++++++ add_suse_converter.patch ++++++ ++++ 1053 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/virt-v2v/add_suse_converter.patch ++++ and /work/SRC/openSUSE:Factory/.virt-v2v.new/add_suse_converter.patch ++++++ add_verbose_messaging.patch ++++++ >From d80387d896f946498067eef5c0250ea73e667abe Mon Sep 17 00:00:00 2001 From: Mike Latimer <mlati...@suse.com> Date: Fri, 6 Sep 2013 09:18:24 -0600 Subject: [PATCH V2] virt-v2v: Add verbose message logging This patch adds basic verbose messages in the main virt-v2v code. The usefulness of these messages is limited as the time spent outside of data copying is trivial. However, when converting smaller guests, these messages can act as progress markers and show where time is being spent. --- v2v/virt-v2v.pl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl index 3832f67..5756296 100755 --- a/v2v/virt-v2v.pl +++ b/v2v/virt-v2v.pl @@ -354,6 +354,17 @@ my $list_profiles = 0; Display a list of target profile names specified in the configuration file. +=cut + +my $verbose; + +=item B<-v | --verbose> + +Enable verbose message logging. Specifying this parameter multiple times +increases verbosity by adding LIBGUESTFS_TRACE=1, and then LIBGUESTFS_DEBUG=1. + +=cut + =item B<--help> Display brief help. @@ -388,6 +399,13 @@ GetOptions ("help|?" => sub { print "$Sys::VirtConvert::VERSION\n"; exit(0); }, + "v|verbose+" => \$verbose, + "vv" => sub { + $verbose += 2; + }, + "vvv" => sub { + $verbose += 3; + }, "c|connect" => sub { # -c|--connect is the default for other virt tools. Be nice to # the user and point out that virt-v2v is different. @@ -437,6 +455,14 @@ GetOptions ("help|?" => sub { "list-profiles" => \$list_profiles ) or pod2usage(2); +# Enable higher levels of verbose logging +if ((defined($verbose)) and ($verbose > 1)) { + $ENV{LIBGUESTFS_TRACE} = '1'; + if ($verbose > 2) { + $ENV{LIBGUESTFS_DEBUG} = '1'; + } +} + # Set the default configuration files if none are specified if (@config_files == 0) { push(@config_files, '/etc/virt-v2v.conf') if -r '/etc/virt-v2v.conf'; @@ -521,6 +547,10 @@ else { # Get an appropriate Source my $source; +if (defined($verbose)) { + logmsg NOTICE, __x('Connecting to input '. + '({input})', input => $input_method) +} if ($input_method eq "libvirtxml") { my $path = shift(@ARGV) or pod2usage({ -message => __"You must specify a filename", @@ -574,6 +604,10 @@ else { # Decide the name of the guest target. $output_name = $source->get_name() unless defined $output_name; +if (defined($verbose)) { + logmsg NOTICE, __x('Validating guest: {output}', + output => $output_name) +} # Check that the guest doesn't already exist on the target v2vdie __x('Domain {name} already exists on the target.', @@ -593,9 +627,14 @@ v2vdie __('Guest doesn\'t define any storage devices') unless @{$meta->{disks}} > 0; # Copy source storage to target +if (defined($verbose)) { + logmsg NOTICE, __x('Copying virtual machine storage to target '. + '({output})', output => $output_method) +} $source->copy_storage($target, $output_format, $output_sparse); # Open a libguestfs handle on the guest's storage devices +if (defined($verbose)) { logmsg NOTICE, __x('Starting guestfs') } my @disks = map { [ $_->{device}, $_->{dst}->get_path(), $_->{dst}->get_format() ] } @{$meta->{disks}}; @@ -623,13 +662,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); + # Create the guest + if (defined($verbose)) { logmsg NOTICE, __x('Creating guest') } $target->create_guest($g, $root, $meta, $config, $guestcaps, $output_name); }; -- 1.8.1.4 ++++++ fix_redhat_dup_grub_entries.patch ++++++ Change an integer comparison to a string comparison to prevent duplicate grub entries from being created. --- RedHat.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/lib/Sys/VirtConvert/Converter/RedHat.pm 2013-08-28 10:47:12.704576442 -0600 +++ b/lib/Sys/VirtConvert/Converter/RedHat.pm 2013-08-28 10:47:38.254508340 -0600 @@ -247,7 +247,7 @@ sub check my $grub_path = $1; # Nothing to do if the kernel already has a grub entry - return if $g->aug_match("/files$grub_conf/title/kernel[. = '$grub_path']") > 0; + return if $g->aug_match("/files$grub_conf/title/kernel[. = '$grub_path']") ne ''; my $kernel = Sys::VirtConvert::Converter::RedHat::_inspect_linux_kernel($g, $path); ++++++ remove_ide_iface.patch ++++++ Using "iface:ide" in guestfs is not supported against a libvirt backend. When used against a direct (appliance) backend, the ata_piix module is required. Currently, this mode is slow, and the virtio-scsi method is preferable. As older guests which require this are not supported, the patch removes the ide:iface parameter. This is mentioned at: https://bugzilla.redhat.com/show_bug.cgi?id=895898 https://www.redhat.com/archives/libguestfs/2013-February/msg00057.html --- GuestfsHandle.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff -Nurp a/lib/Sys/VirtConvert/GuestfsHandle.pm b/lib/Sys/VirtConvert/GuestfsHandle.pm --- a/lib/Sys/VirtConvert/GuestfsHandle.pm 2013-08-14 15:33:58.509972041 -0600 +++ b/lib/Sys/VirtConvert/GuestfsHandle.pm 2013-08-14 15:36:07.033802316 -0600 @@ -73,21 +73,18 @@ sub new # Open a guest handle my $g; my $open = sub { - my $interface = "ide"; - $g = Sys::Guestfs->new(); foreach my $disk (@{$disks}) { my ($name, $path, $format) = @$disk; $g->add_drive_opts($path, format => $format, - iface => $interface, name => $name); } # Add the transfer iso if there is one $g->add_drive_opts($transfer, - format => 'raw', iface => $interface, readonly => 1) + format => 'raw', readonly => 1) if defined($transfer); # Enable networking in the guest -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
