virt-manager/virtinst-s390x-disable-graphics.patch
Charles Arnold 0ac26d8208 - bsc#971825 - virt-manager needs to use grub.xen installing a PV
Tumbleweed VM
  virtinst-pvgrub2-bootloader.patch

- fate#320353 - Add the ability for virt-convirt to decompress
  compressed files in an OVA
  f11eb00b-virt-convert-decompress-gz-files-before-converting.patch

- bsc#951726 - Error - 'wrong number of arguments (3 for 1) ...'
  when attempting to create DomU through the yast
  virt-manager.spec

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=301
2016-03-18 21:27:01 +00:00

55 lines
1.9 KiB
Diff

Reference: bnc#869024
Disable graphics on s390x
Index: virt-manager-1.3.2/virtinst/guest.py
===================================================================
--- virt-manager-1.3.2.orig/virtinst/guest.py
+++ virt-manager-1.3.2/virtinst/guest.py
@@ -123,7 +123,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
@@ -663,7 +666,7 @@ class Guest(XMLBuilder):
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
@@ -701,6 +704,8 @@ class Guest(XMLBuilder):
dev.target_type = "virtio"
dev.target_name = dev.CHANNEL_NAME_QEMUGA
self.add_device(dev)
+ elif self.os.is_s390x():
+ dev.target_type = "sclp"
def add_default_graphics(self):
if self.skip_default_graphics:
@@ -709,7 +714,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))
@@ -1035,7 +1040,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