31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
|
Subject: virt-install: Do not warn about consoles on s390x
|
||
|
|
From: Christian Borntraeger borntraeger@de.ibm.com Thu Mar 14 09:50:11 2019 +0100
|
||
|
|
Date: Thu Mar 14 18:21:51 2019 +0100:
|
||
|
|
Git: 5bc847ebb032864bb20859c98660e85b5a0b50f2
|
||
|
|
|
||
|
|
s390x guests usually detect the sclp or virtio console. The current
|
||
|
|
warning might actually break setups. Let us disable the warning.
|
||
|
|
|
||
|
|
Reported-by: Andre Wild <wild1@linux.ibm.com>
|
||
|
|
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
||
|
|
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
||
|
|
|
||
|
|
Index: virt-manager-2.1.0/virt-install
|
||
|
|
===================================================================
|
||
|
|
--- virt-manager-2.1.0.orig/virt-install
|
||
|
|
+++ virt-manager-2.1.0/virt-install
|
||
|
|
@@ -432,9 +432,9 @@ def _show_nographics_warnings(options, g
|
||
|
|
console_type = serial_arm_arg
|
||
|
|
if guest.devices.console[0].target_type in ["virtio", "xen"]:
|
||
|
|
console_type = hvc_arg
|
||
|
|
- if guest.os.is_ppc64() or guest.os.is_arm_machvirt():
|
||
|
|
- # Later arm/ppc kernels figure out console= automatically, so don't
|
||
|
|
- # warn about it.
|
||
|
|
+ if guest.os.is_ppc64() or guest.os.is_arm_machvirt() or guest.os.is_s390x():
|
||
|
|
+ # Later arm/ppc/s390x kernels figure out console= automatically, so
|
||
|
|
+ # don't warn about it.
|
||
|
|
return
|
||
|
|
|
||
|
|
for args in (options.extra_args or []):
|