virt-manager/virtinst-s390x-disable-graphics.patch
Charles Arnold ff660c61ba - Update to virt-manager version 1.4.0
virt-manager-1.4.0.tar.bz2
  virtman-dont-specify-vte-version.patch
  * virt-manager: spice GL console support (Marc-André Lureau, Cole Robinson)
  * Bump gtk and pygobject deps to 3.14
  * virt-manager: add checkbox to forget keyring password (Pavel Hrdina)
  * cli: add --graphics gl= (Marc-André Lureau)
  * cli: add --video accel3d= (Marc-André Lureau)
  * cli: add --graphics listen=none (Marc-André Lureau)
  * cli: add --transient flag (Richard W.M. Jones)
  * cli: --features gic= support, and set a default for it (Pavel Hrdina)
  * cli: Expose --video heads, ram, vram, vgamem
  * cli: add --graphics listen=socket
  * cli: add device address.type/address.bus/...
  * cli: add --disk seclabelX.model (and .label, .relabel)
  * cli: add -cpu cellX.id (and .cpus, and .memory)
  * cli: add --network rom_bar= and rom_file=
  * cli: add --disk backing_format=
  * Many bug fixes and improvements
 - Dropped the following
  virt-manager-1.3.2.tar.bz2
  89c3638b-fix-detection-that-libvirtd-is-stopped.patch
  21fd079e-replace-unar-with-other-archivers.patch
  eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
  1c221fd0-suse-ovmf-paths.patch
  f11eb00b-virt-convert-decompress-gz-files-before-converting.patch
  8ba48f52-add-virtio-device-model-and-accel3d-attribute.patch
  f454798b-virtman-fix-making-screenshot.patch
  5ecc2b44-dont-clear-recommended-machine-if-none-is-selected.patch
  de9cd87f-return-recommended-machine-for-XEN.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=319
2016-06-21 22:34:03 +00:00

55 lines
1.9 KiB
Diff

Reference: bnc#869024
Disable graphics on s390x
Index: virt-manager-1.4.0/virtinst/guest.py
===================================================================
--- virt-manager-1.4.0.orig/virtinst/guest.py
+++ virt-manager-1.4.0/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
@@ -605,7 +608,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
@@ -643,6 +646,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:
@@ -651,7 +656,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))
@@ -979,7 +984,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