From 1b3429711de7543d18049a0640ee9b2ac93179ed Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Tue, 10 May 2016 18:05:11 +0000
Subject: [PATCH] - bsc#978173 - Cannot install sles-10-sp4 on sles-12-sp1 host
   virtinst-use-xenpae-kernel-for-32bit.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=310
---
 virt-manager.changes                       |  6 ++++++
 virt-manager.spec                          |  2 ++
 virtinst-use-xenpae-kernel-for-32bit.patch | 25 ++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 virtinst-use-xenpae-kernel-for-32bit.patch

diff --git a/virt-manager.changes b/virt-manager.changes
index eb21bac2..a295f593 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 10 11:57:19 MDT 2016 - carnold@suse.com
+
+- bsc#978173 - Cannot install sles-10-sp4 on sles-12-sp1 host
+  virtinst-use-xenpae-kernel-for-32bit.patch
+
 -------------------------------------------------------------------
 Fri May  6 15:50:12 MDT 2016 - carnold@suse.com
 
diff --git a/virt-manager.spec b/virt-manager.spec
index 58dd9acc..f70456eb 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -80,6 +80,7 @@ Patch161:       virtinst-xenbus-disk-index-fix.patch
 Patch162:       virtinst-refresh_before_fetch_pool.patch
 Patch163:       virtinst-fix-sle12sp1-detection.patch
 Patch164:       virtinst-fix-tumbleweed-detection.patch
+Patch165:       virtinst-use-xenpae-kernel-for-32bit.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -204,6 +205,7 @@ machine).
 %patch162 -p1
 %patch163 -p1
 %patch164 -p1
+%patch165 -p1
 
 %build
 %if %{qemu_user}
diff --git a/virtinst-use-xenpae-kernel-for-32bit.patch b/virtinst-use-xenpae-kernel-for-32bit.patch
new file mode 100644
index 00000000..4897629a
--- /dev/null
+++ b/virtinst-use-xenpae-kernel-for-32bit.patch
@@ -0,0 +1,25 @@
+References: bsc#978173
+The 32bit versions of the media contain a xenpae version along with
+a non pae version. The sles10 sp4 32bit kernel will only boot para-
+virtualized if the pae kernel is selected.
+Note that sles12 and newer has no 32bit release.
+
+Index: virt-manager-1.3.2/virtinst/urlfetcher.py
+===================================================================
+--- virt-manager-1.3.2.orig/virtinst/urlfetcher.py
++++ virt-manager-1.3.2/virtinst/urlfetcher.py
+@@ -999,8 +999,12 @@ class SuseDistro(Distro):
+                                            "boot/%s/initrd" % self.arch))
+ 
+             # Matches Opensuse > 10.2 and sles 10
+-            self._xen_kernel_paths = [("boot/%s/vmlinuz-xen" % self.arch,
+-                                        "boot/%s/initrd-xen" % self.arch)]
++            if self.arch == "i386":
++                self._xen_kernel_paths = [("boot/%s/vmlinuz-xenpae" % self.arch,
++                                            "boot/%s/initrd-xenpae" % self.arch)]
++            else:
++                self._xen_kernel_paths = [("boot/%s/vmlinuz-xen" % self.arch,
++                                            "boot/%s/initrd-xen" % self.arch)]
+ 
+     def _variantFromVersion(self):
+         distro_version = self.version_from_content[1].strip()