- Add upstream s390x support patch (bnc#869024)

360fe110-add-s390x-arch-support.patch
  virtinst-add-ppc64-arch-support.patch
  Drop virtinst-add-s390x-ppc64-arch-support.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=264

360fe110-add-s390x-arch-support.patch

@@ -1,23 +1,29 @@
-Reference: bnc#869024
+Subject: virtinst: correctly find the sles s390x kernel and initrd
-Add s390x and ppc64 support
+From: Charles Arnold carnold@suse.com Fri Sep 11 09:41:09 2015 -0600
-Index: virt-manager-1.2.1/virtinst/urlfetcher.py
+Date: Fri Sep 11 12:48:52 2015 -0400:
-===================================================================
+Git: 360fe11040b0d7dc0235aecf10e96536619c616b
---- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
+
-+++ virt-manager-1.2.1/virtinst/urlfetcher.py
+Allow virt-install to correctly find the SLES kernel/initrd on the media
-@@ -371,6 +371,12 @@ def _distroFromSUSEContent(fetcher, arch
+when installing an s390x VM.
+
+Signed-off-by: Charles Arnold <carnold@suse.com>
+
+(crobinso: fix minor pep8 issues)
+
+diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py
+index c48e9d5..40f7c05 100644
+--- a/virtinst/urlfetcher.py
++++ b/virtinst/urlfetcher.py
+@@ -369,6 +369,8 @@ def _distroFromSUSEContent(fetcher, arch, vmtype=None):
              arch = "x86_64"
          elif cbuf.find("i586") != -1:
              arch = "i586"
 +        elif cbuf.find("s390x") != -1:
 +            arch = "s390x"
-+        elif cbuf.find("ppc64") != -1:
-+            arch = "ppc64"
-+        elif cbuf.find("ppc64le") != -1:
-+            arch = "ppc64le"
  
      dclass = GenericDistro
      if distribution:
-@@ -940,16 +946,23 @@ class SuseDistro(Distro):
+@@ -934,16 +936,22 @@ class SuseDistro(Distro):
              oldkern += "64"
              oldinit += "64"
  
@@ -27,15 +33,10 @@ Index: virt-manager-1.2.1/virtinst/urlfetcher.py
 -        # Tested with Opensuse 10.0
 -        self._hvm_kernel_paths.append(("boot/loader/%s" % oldkern,
 -                                       "boot/loader/%s" % oldinit))
--
++        if self.arch == "s390x":
--        # Matches Opensuse > 10.2 and sles 10
++            self._hvm_kernel_paths = [("boot/%s/linux" % self.arch,
--        self._xen_kernel_paths = [("boot/%s/vmlinuz-xen" % self.arch,
++                                       "boot/%s/initrd" % self.arch)]
--                                    "boot/%s/initrd-xen" % self.arch)]
++            # No Xen on s390x
-+        if self.arch == "s390x" or \
-+           self.arch == "ppc64" or self.arch == "ppc64le":
-+            self._hvm_kernel_paths = [ ("boot/%s/linux" % self.arch,
-+                                        "boot/%s/initrd" % self.arch) ]
-+            # No Xen on s390x and ppc
 +            self._xen_kernel_paths = []
 +        else:
 +            # Tested with Opensuse >= 10.2, 11, and sles 10
@@ -44,14 +45,17 @@ Index: virt-manager-1.2.1/virtinst/urlfetcher.py
 +            # Tested with Opensuse 10.0
 +            self._hvm_kernel_paths.append(("boot/loader/%s" % oldkern,
 +                                           "boot/loader/%s" % oldinit))
-+
+ 
+-        # Matches Opensuse > 10.2 and sles 10
+-        self._xen_kernel_paths = [("boot/%s/vmlinuz-xen" % self.arch,
+-                                    "boot/%s/initrd-xen" % 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)]
  
      def _variantFromVersion(self):
          distro_version = self.version_from_content[1].strip()
-@@ -977,6 +990,13 @@ class SuseDistro(Distro):
+@@ -971,6 +979,13 @@ class SuseDistro(Distro):
          self._variantFromVersion()
  
          self.os_variant = self._detect_osdict_from_url()
@@ -59,8 +63,8 @@ Index: virt-manager-1.2.1/virtinst/urlfetcher.py
 +        # Reset kernel name for sle11 source on s390x
 +        if self.arch == "s390x":
 +            if self.os_variant == "sles11" or self.os_variant == "sled11":
-+                self._hvm_kernel_paths = [ ("boot/%s/vmrdr.ikr" % self.arch,
++                self._hvm_kernel_paths = [("boot/%s/vmrdr.ikr" % self.arch,
-+                                            "boot/%s/initrd" % self.arch) ]
++                                           "boot/%s/initrd" % self.arch)]
 +
          return True
  

virt-manager.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 11 11:17:43 MDT 2015 - carnold@suse.com
+
+- Add upstream s390x support patch (bnc#869024)
+  360fe110-add-s390x-arch-support.patch
+  virtinst-add-ppc64-arch-support.patch
+  Drop virtinst-add-s390x-ppc64-arch-support.patch
+
 -------------------------------------------------------------------
 Thu Sep 10 13:46:12 MDT 2015 - carnold@suse.com
 

virt-manager.spec

@@ -48,6 +48,7 @@ Patch8:         aebebbf8-report-an-error-for-pxe-install-without-network.patch
 Patch9:         4970615f-fix-qemu-vs-lxc-detection.patch
 Patch10:        eb92178e-virtinst-fix-storage-pool-lookup.patch
 Patch11:        5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch
+Patch12:        360fe110-add-s390x-arch-support.patch
 # SUSE Only
 Patch70:        virtman-desktop.patch
 Patch71:        virtman-kvm.patch
@@ -74,7 +75,7 @@ Patch124:       virtinst-vol-default-nocow.patch
 Patch125:       virtinst-set-cache-mode-unsafe-for-install.patch
 Patch126:       virtinst-add-default-rng-device.patch
 Patch127:       virtinst-set-qemu-emulator.patch
-Patch128:       virtinst-add-s390x-ppc64-arch-support.patch
+Patch128:       virtinst-add-ppc64-arch-support.patch
 Patch129:       virtinst-s390x-disable-graphics.patch
 # Bug Fixes
 Patch150:       virtman-supported-disk-formats.patch
@@ -180,6 +181,7 @@ machine).
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 # SUSE Only
 %patch70 -p1
 %patch71 -p1

virtinst-add-ppc64-arch-support.patch

@@ -0,0 +1,32 @@
+Reference: bnc#869024
+Add s390x and ppc64 support
+Index: virt-manager-1.2.1/virtinst/urlfetcher.py
+===================================================================
+--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
++++ virt-manager-1.2.1/virtinst/urlfetcher.py
+@@ -373,6 +373,10 @@ def _distroFromSUSEContent(fetcher, arch
+             arch = "i586"
+         elif cbuf.find("s390x") != -1:
+             arch = "s390x"
++        elif cbuf.find("ppc64") != -1:
++            arch = "ppc64"
++        elif cbuf.find("ppc64le") != -1:
++            arch = "ppc64le"
+ 
+     dclass = GenericDistro
+     if distribution:
+@@ -942,10 +946,12 @@ class SuseDistro(Distro):
+             oldkern += "64"
+             oldinit += "64"
+ 
+-        if self.arch == "s390x":
++        if self.arch == "s390x" or \
++           self.arch == "ppc64" or self.arch == "ppc64le":
++
+             self._hvm_kernel_paths = [("boot/%s/linux" % self.arch,
+                                        "boot/%s/initrd" % self.arch)]
+-            # No Xen on s390x
++            # No Xen on s390x or ppc64
+             self._xen_kernel_paths = []
+         else:
+             # Tested with Opensuse >= 10.2, 11, and sles 10

virtinst-detect-oes-distros.patch

@@ -4,7 +4,7 @@ Index: virt-manager-1.2.1/virtinst/urlfetcher.py
 ===================================================================
 --- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
 +++ virt-manager-1.2.1/virtinst/urlfetcher.py
-@@ -383,6 +383,10 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -385,6 +385,10 @@ def _distroFromSUSEContent(fetcher, arch
              dclass = SLEDDistro
              if distro_version is None:
                  distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]