From 177fbcdfaa11113ece55035954ef735077bd4461 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 13 Jan 2020 09:30:14 +0100 Subject: [PATCH] domain_conf: Do not use USB by default for devices on s390x When trying to specify an input device on s390x without bus like this: ... then libvirt currently complains: error: unsupported configuration: USB is disabled for this domain, but USB devices are present in the domain XML This is somewhat confusing since the user did not specify an USB device here. Since USB is not available on s390x, we should default to the "virtio" bus here instead. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1790189 Signed-off-by: Thomas Huth Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 74b4a933ae..ee57152da7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13428,6 +13428,8 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt, def->type == VIR_DOMAIN_INPUT_TYPE_KBD) && (ARCH_IS_X86(dom->os.arch) || dom->os.arch == VIR_ARCH_NONE)) { def->bus = VIR_DOMAIN_INPUT_BUS_PS2; + } else if (ARCH_IS_S390(dom->os.arch)) { + def->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO; } else { def->bus = VIR_DOMAIN_INPUT_BUS_USB; }