virtinst-add-s390x-ppc64-arch-support.patch

virtinst-s390x-disable-graphics.patch

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

virt-manager.changes

@@ -3,7 +3,8 @@ Thu Sep 10 13:46:12 MDT 2015 - carnold@suse.com
 
 - Add upstream s390x support patch (bnc#869024)
   8dbe96fc-add-s390x-arch-support.patch
-  virtman-s390x-ppc64-arch-support.patch
+  virtinst-add-s390x-ppc64-arch-support.patch
+  virtinst-s390x-disable-graphics.patch
   Drop virtman-add-s390x-arch-support.patch
   Drop virtman-s390x-default-to-vminstall.patch
 

virt-manager.spec

@@ -65,16 +65,17 @@ Patch102:       virtman-default-to-xen-pv.patch
 Patch103:       virtman-autoyast-support.patch
 Patch104:       virtman-packages.patch
 Patch105:       virtman-load-stored-uris.patch
-Patch106:       virtman-s390x-ppc64-arch-support.patch
+Patch106:       virtman-add-connect-default.patch
-Patch107:       virtman-add-connect-default.patch
 Patch120:       virtinst-storage-ocfs2.patch
 Patch121:       virtinst-default-xen-to-qcow2-format.patch
-Patch123:       virtinst-detect-oes-distros.patch
+Patch122:       virtinst-detect-oes-distros.patch
-Patch124:       virtinst-modify-gui-defaults.patch
+Patch123:       virtinst-modify-gui-defaults.patch
-Patch125:       virtinst-vol-default-nocow.patch
+Patch124:       virtinst-vol-default-nocow.patch
-Patch126:       virtinst-set-cache-mode-unsafe-for-install.patch
+Patch125:       virtinst-set-cache-mode-unsafe-for-install.patch
-Patch127:       virtinst-add-default-rng-device.patch
+Patch126:       virtinst-add-default-rng-device.patch
-Patch128:       virtinst-set-qemu-emulator.patch
+Patch127:       virtinst-set-qemu-emulator.patch
+Patch128:       virtinst-add-s390x-ppc64-arch-support.patch
+Patch129:       virtinst-s390x-disable-graphics.patch
 # Bug Fixes
 Patch150:       virtman-supported-disk-formats.patch
 Patch151:       virtman-prevent-double-click-starting-vm-twice.patch
@@ -197,15 +198,16 @@ machine).
 %patch104 -p1
 %patch105 -p1
 %patch106 -p1
-%patch107 -p1
 %patch120 -p1
 %patch121 -p1
+%patch122 -p1
 %patch123 -p1
 %patch124 -p1
 %patch125 -p1
 %patch126 -p1
 %patch127 -p1
 %patch128 -p1
+%patch129 -p1
 # Bug Fixes
 %patch150 -p1
 %patch151 -p1

virtinst-add-default-rng-device.patch

@@ -12,7 +12,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py
  
  
  class Guest(XMLBuilder):
-@@ -675,6 +676,15 @@ class Guest(XMLBuilder):
+@@ -670,6 +671,15 @@ class Guest(XMLBuilder):
              return
          self.add_device(VirtualGraphics(self.conn))
  
@@ -28,7 +28,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py
      def add_default_devices(self):
          self.add_default_graphics()
          self.add_default_video_device()
-@@ -682,6 +692,7 @@ class Guest(XMLBuilder):
+@@ -677,6 +687,7 @@ class Guest(XMLBuilder):
          self.add_default_console_device()
          self.add_default_usb_controller()
          self.add_default_channels()

virtinst-add-s390x-ppc64-arch-support.patch

@@ -1,56 +1,9 @@
 Reference: bnc#869024
-Add s390x support
+Add s390x and ppc64 support
-Index: virt-manager-1.2.1/virtinst/guest.py
+Index: virt-manager-1.2.1/virtinst/urlfetcher.py
 ===================================================================
---- virt-manager-1.2.1.orig/virtinst/guest.py
+--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
-+++ virt-manager-1.2.1/virtinst/guest.py
++++ virt-manager-1.2.1/virtinst/urlfetcher.py
-@@ -120,7 +120,10 @@ class Guest(XMLBuilder):
-         self.skip_default_channel = False
-         self.skip_default_sound = False
-         self.skip_default_usbredir = False
--        self.skip_default_graphics = False
-+        if self.os.is_s390x():
-+            self.skip_default_graphics = True
-+        else:
-+            self.skip_default_graphics = False
-         self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY
- 
-         self.__os_object = None
-@@ -605,11 +608,13 @@ class Guest(XMLBuilder):
-             self.conn.check_support(
-             self.conn.SUPPORT_CONN_VIRTIO_CONSOLE)):
-             dev.target_type = "virtio"
-+        elif self.os.is_s390x():
-+            dev.target_type = "sclp"
- 
-         self.add_device(dev)
- 
-     def add_default_video_device(self):
--        if self.os.is_container():
-+        if self.os.is_container() or self.os.is_s390x():
-             return
-         if self.get_devices("video"):
-             return
-@@ -654,7 +659,7 @@ class Guest(XMLBuilder):
-             return
-         if self.os.is_container():
-             return
--        if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le", "ia64"]:
-+        if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le", "ia64", "s390x"]:
-             return
-         self.add_device(VirtualGraphics(self.conn))
- 
-@@ -957,7 +962,7 @@ class Guest(XMLBuilder):
-         if self._hv_only_supports_virtio():
-             return True
- 
--        if self.os.is_x86():
-+        if self.os.is_x86() or self.os.is_s390x():
-             return True
- 
-         if (self.os.is_arm_vexpress() and
---- virt-manager-1.2.1/virtinst/urlfetcher.py.orig	2015-09-10 15:05:22.973065632 -0600
-+++ virt-manager-1.2.1/virtinst/urlfetcher.py	2015-09-10 15:07:15.127199219 -0600
 @@ -371,6 +371,12 @@ def _distroFromSUSEContent(fetcher, arch
              arch = "x86_64"
          elif cbuf.find("i586") != -1:
@@ -64,8 +17,8 @@ Index: virt-manager-1.2.1/virtinst/guest.py
  
      dclass = GenericDistro
      if distribution:
-@@ -383,6 +389,10 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -387,6 +393,10 @@ def _distroFromSUSEContent(fetcher, arch
-             dclass = SLEDDistro
+             dclass = SLESDistro
              if distro_version is None:
                  distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
 +        elif re.match(".*Open Enterprise Server*", distribution[1]):
@@ -75,7 +28,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py
          elif re.match(".*openSUSE.*", distribution[1]):
              dclass = OpensuseDistro
              if distro_version is None:
-@@ -936,16 +946,23 @@ class SuseDistro(Distro):
+@@ -940,16 +950,23 @@ class SuseDistro(Distro):
              oldkern += "64"
              oldinit += "64"
  
@@ -109,7 +62,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py
  
      def _variantFromVersion(self):
          distro_version = self.version_from_content[1].strip()
-@@ -973,6 +990,13 @@ class SuseDistro(Distro):
+@@ -977,6 +994,13 @@ class SuseDistro(Distro):
          self._variantFromVersion()
  
          self.os_variant = self._detect_osdict_from_url()

virtinst-detect-oes-distros.patch

@@ -4,8 +4,8 @@ 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
-@@ -393,6 +393,10 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -383,6 +383,10 @@ def _distroFromSUSEContent(fetcher, arch
-             dclass = SLESDistro
+             dclass = SLEDDistro
              if distro_version is None:
                  distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
 +        elif re.match(".*Open Enterprise Server*", distribution[1]):

virtinst-s390x-disable-graphics.patch

@@ -0,0 +1,52 @@
+Reference: bnc#869024
+Disable graphics on s390x
+Index: virt-manager-1.2.1/virtinst/guest.py
+===================================================================
+--- virt-manager-1.2.1.orig/virtinst/guest.py
++++ virt-manager-1.2.1/virtinst/guest.py
+@@ -120,7 +120,10 @@ class Guest(XMLBuilder):
+         self.skip_default_channel = False
+         self.skip_default_sound = False
+         self.skip_default_usbredir = False
+-        self.skip_default_graphics = False
++        if self.os.is_s390x():
++            self.skip_default_graphics = True
++        else:
++            self.skip_default_graphics = False
+         self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY
+ 
+         self.__os_object = None
+@@ -605,11 +608,13 @@ class Guest(XMLBuilder):
+             self.conn.check_support(
+             self.conn.SUPPORT_CONN_VIRTIO_CONSOLE)):
+             dev.target_type = "virtio"
++        elif self.os.is_s390x():
++            dev.target_type = "sclp"
+ 
+         self.add_device(dev)
+ 
+     def add_default_video_device(self):
+-        if self.os.is_container():
++        if self.os.is_container() or self.os.is_s390x():
+             return
+         if self.get_devices("video"):
+             return
+@@ -654,7 +659,7 @@ class Guest(XMLBuilder):
+             return
+         if self.os.is_container():
+             return
+-        if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le", "ia64"]:
++        if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le", "ia64", "s390x"]:
+             return
+         self.add_device(VirtualGraphics(self.conn))
+ 
+@@ -957,7 +962,7 @@ class Guest(XMLBuilder):
+         if self._hv_only_supports_virtio():
+             return True
+ 
+-        if self.os.is_x86():
++        if self.os.is_x86() or self.os.is_s390x():
+             return True
+ 
+         if (self.os.is_arm_vexpress() and
+

virtinst-set-cache-mode-unsafe-for-install.patch

@@ -12,7 +12,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py
  
  
  class Guest(XMLBuilder):
-@@ -357,6 +358,14 @@ class Guest(XMLBuilder):
+@@ -354,6 +355,14 @@ class Guest(XMLBuilder):
  
          self._set_osxml_defaults()
  
@@ -27,7 +27,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py
          self.bootloader = None
          if (not install and
              self.os.is_xenpv() and
-@@ -374,7 +383,10 @@ class Guest(XMLBuilder):
+@@ -371,7 +380,10 @@ class Guest(XMLBuilder):
                  self.bootloader = "/usr/bin/pygrub"
                  self.os.clear()
  

virtinst-set-qemu-emulator.patch

@@ -13,7 +13,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py
  import logging
  
  import urlgrabber.progress as progress
-@@ -811,14 +812,29 @@ class Guest(XMLBuilder):
+@@ -806,14 +807,29 @@ class Guest(XMLBuilder):
              self.emulator = None
              return