virt-manager/virtinst-s390x-disable-graphics.patch
Charles Arnold 544164a095 - Update to virt-manager 1.4.1
virt-manager-1.4.1.tar.bz2
  * storage/nodedev event API support (Jovanka Gulicoska)
  * UI options for enabling spice GL (Marc-André Lureau)
  * Add default virtio-rng /dev/urandom for supported guest OS
  * Cloning and rename support for UEFI VMs (Pavel Hrdina)
  * libguestfs inspection UI improvements (Pino Toscano)
  * virt-install: Add –qemu-commandline
  * virt-install: Add –network vhostuser (Chen Hanxiao)
  * virt-install: Add –sysinfo (Charles Arnold)
- Dropped the following patches contained in new tarball
  0425975f-use-virDomainMigrate3-API.patch
  0910c8dc-black-display-if-graphic-mode-vnc-and-listen-type-none.patch
  1d2cd306-Fix-incorrect-usage-of-virtio-input.patch
  2df8dc39-detect-whether-IP-address-comes-from-DHCP-server.patch
  559e813b-xmlbuilder-02.patch
  561f5cd3-drop-xenmigr-scheme-from-Xen-migration-URI.patch
  5a11cf07-virt-manager-generates-invalid-guest-XML.patch
  617b9271-dont-return-virtio1.0-net-as-valid-device-name.patch
  63784f4d-document-new-sysinfo-option.patch
  6daff68a-fix-italian-lang-file.patch
  7962672c-fix-error-checking-extra_args.patch
  835ddc5f-xmlbuilder-04.patch
  a3206f89-Add-the-sysinfo-option.patch
  a931a1a6-xmlbuilder-03.patch
  b08647c2-xmlbuilder-05.patch
  b31c0b44-Add-classes-for-defining-SMBios-information.patch
  b4858842-fix-bad-version-check-regression.patch
  b8dccf6a-fix-connection-to-remote-spice-with-password.patch
  c5ce0ab5-connection-fix-transport-detection.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=341
2017-03-09 19:10:48 +00:00

55 lines
1.9 KiB
Diff

Reference: bnc#869024
Disable graphics on s390x
Index: virt-manager-1.4.1/virtinst/guest.py
===================================================================
--- virt-manager-1.4.1.orig/virtinst/guest.py
+++ virt-manager-1.4.1/virtinst/guest.py
@@ -124,7 +124,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.skip_default_rng = False
self.x86_cpu_default = self.cpu.SPECIAL_MODE_HOST_MODEL_ONLY
@@ -619,7 +622,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
@@ -657,6 +660,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:
@@ -665,7 +670,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))
@@ -1003,7 +1008,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