[libvirt] [PATCH 1/3] Prevent default creation of usb controller on s390 and s390x

Since s390 does not support usb the default creation of a usb controller for a domain should not occur. Signed-off-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com&gt; Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com&gt; --- src/qemu/qemu_command.c | 4 +++- src/qemu/qemu_domain.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8e864ab..d9ed96a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9001,7 +9001,9 @@ qemuBuildCommandLine(virConnectPtr conn, } } - if (usbcontroller == 0 && !qemuDomainMachineIsQ35(def)) + if (usbcontroller == 0 && + !qemuDomainMachineIsQ35(def) && + !ARCH_IS_S390(def->os.arch)) virCommandAddArg(cmd, "-usb"); for (i = 0; i < def->nhubs; i++) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 99c46d4..bd9d4f2 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -979,6 +979,12 @@ qemuDomainDefPostParse(virDomainDefPtr def, case VIR_ARCH_SH4EB: addPCIRoot = true; break; + case VIR_ARCH_S390: + addDefaultUSB = false; + break; + case VIR_ARCH_S390X: + addDefaultUSB = false; + break; default: break; } -- 2.1.4