Hello community, here is the log from the commit of package virt-v2v for openSUSE:Factory checked in at 2015-07-14 17:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-01-22 21:49:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virt-v2v.new/virt-v2v.changes 2015-07-14 17:44:37.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 2 21:39:36 UTC 2015 - [email protected] + +- Use x86_64 architecture type for i586 and i686 guests (bsc#936920) + use_x86_64_for_i586.patch + +------------------------------------------------------------------- New: ---- use_x86_64_for_i586.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-v2v.spec ++++++ --- /var/tmp/diff_new_pack.FAeVS8/_old 2015-07-14 17:44:39.000000000 +0200 +++ /var/tmp/diff_new_pack.FAeVS8/_new 2015-07-14 17:44:39.000000000 +0200 @@ -42,6 +42,7 @@ Patch13: reset_virtio_after_config.patch Patch14: handle_ova_files.patch Patch15: support_any_opensuse_ver.patch +Patch16: use_x86_64_for_i586.patch Patch50: meta_license_to_list.patch Patch99: remove_esx_examples.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -166,6 +167,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 # Apply meta_license_to_list.patch only for versions > SLES12 %if 0%{?suse_version} >= 1320 %patch50 -p1 ++++++ use_x86_64_for_i586.patch ++++++ All i586 and i686 machines should be treated as x86_64 machines as emulated by qemu. (bsc#936920) Index: virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm =================================================================== --- virt-v2v-0.9.1.orig/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm +++ virt-v2v-0.9.1/lib/Sys/VirtConvert/Connection/LibVirtTarget.pm @@ -538,6 +538,12 @@ sub _configure_capabilities my $arch = $guestcaps->{arch}; + # i586 and i686 architectures should be treated as x86_64 + if ($arch =~ /i[56]86/) { + $guestcaps->{arch} = 'x86_64'; + $arch = 'x86_64'; + } + (my $guestcap) = $caps->findnodes ("/capabilities/guest[arch[\@name='$arch']/domain/\@type='kvm']");
