d8b1788c9f
virt-manager-2.2.1.tar.bz2 * CVE-2019-10183: Replace –unattended user-password and admin-password with user-password-file and admin-password-file (Fabiano Fidêncio) * Consistent –memballoon default across non-x86 (Andrea Bolognani) * virt-install: add –numatune memnode.* (Athina Plaskasoviti) * Drop hard dep on gtksourceview4, gtksourceview3 is fine as well - Drop patches no longer needed 033e9702-xmleditor-Handle-gtksourceview3-as-well-as-gtksourceview4.patch 51d28f04-unattended-Dont-log-user-admin-passwords.patch 5312a961-virt-install-Revive-wait-0-as-alias-for-noautoconsole.patch 58c68764-unattended-Read-the-passwords-from-a-file.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=477
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
Reference: bnc#869024
|
|
Disable graphics on s390x
|
|
Index: virt-manager-2.2.1/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-2.2.1.orig/virtinst/guest.py
|
|
+++ virt-manager-2.2.1/virtinst/guest.py
|
|
@@ -225,7 +225,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.disable_default_memballoon = False
|
|
self.x86_cpu_default = self.cpu.SPECIAL_MODE_APP_DEFAULT
|
|
@@ -480,7 +483,7 @@ class Guest(XMLBuilder):
|
|
if not os_support:
|
|
return False
|
|
|
|
- if self.os.is_x86():
|
|
+ if self.os.is_x86() or self.os.is_s390x():
|
|
return True
|
|
|
|
return False
|
|
@@ -860,7 +863,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.devices.video:
|
|
return
|
|
@@ -927,7 +930,7 @@ class Guest(XMLBuilder):
|
|
return
|
|
if self.os.is_container() and not self.conn.is_vz():
|
|
return
|
|
- if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le"]:
|
|
+ if self.os.arch not in ["x86_64", "i686", "ppc64", "ppc64le", "s390x"]:
|
|
return
|
|
self.add_device(DeviceGraphics(self.conn))
|
|
|