virt-manager/virtinst-s390x-disable-graphics.patch
Charles Arnold 6bbd8f8c21 - Update to virt-manager 1.3.0
virt-manager-1.3.0.tar.bz2
  * Git hosting moved to http://github.com/virt-manager/virt-manager
  * Switch translation infrastructure from transifex to fedora.zanata.org
  * Add dogtail UI tests and infrastructure
  * Improved support for s390x kvm (Kevin Zhao)
  * virt-install and virt-manager now remove created disk images if VM install startup fails
  * Replace urlgrabber usage with requests and urllib2
  * virt-install: add –network virtualport support for openvswitch (Daniel P. Berrange)
  * virt-install: support multiple –security labels
  * virt-install: support –features kvm_hidden=on|off (Pavel Hrdina)
  * virt-install: add –features pmu=on|off
  * virt-install: add –features pvspinlock=on|off (Abhijeet Kasurde)
  * virt-install: add –events on_lockfailure=on|off (Abhijeet Kasurde)
  * virt-install: add –network link_state=up|down
  * virt-install: add –vcpu placement=static|auto
- Dropped
  virt-manager-1.2.1.tar.bz2
  34db1af7-fix-adding-iscsi-pools.patch
  360fe110-add-s390x-arch-support.patch
  4970615f-fix-qemu-vs-lxc-detection.patch
  590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch
  5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch
  601a82cb-fix-console_type-if-xen.patch
  76bad650-fix-virt-xml-define-and-update.patch
  77423e7a-connection-catch-more-errors-in-filter_nodedevs.patch
  8dbe96fc-add-s390x-arch-support.patch
  a9b303fb-fix-copy-host-cpu-definition.patch
  aebebbf8-report-an-error-for-pxe-install-without-network.patch
  cde2f0ef-Suppress-gi-warnings-about-lack-of-require_version.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=283
2015-11-25 23:27:12 +00:00

55 lines
1.9 KiB
Diff

Reference: bnc#869024
Disable graphics on s390x
Index: virt-manager-1.3.0/virtinst/guest.py
===================================================================
--- virt-manager-1.3.0.orig/virtinst/guest.py
+++ virt-manager-1.3.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
@@ -662,7 +665,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
@@ -700,6 +703,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:
@@ -708,7 +713,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))
@@ -1052,7 +1057,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