From: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Date: Fri, 29 Apr 2016 13:23:45 +0000 (+0200)
Subject: qemu: merge S390 and S390X default device creation
X-Git-Tag: v1.3.5-rc1~443
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b43ab240c2ba86a2821386d0d8377b95f57b0bcb;p=thirdparty%2Flibvirt.git

qemu: merge S390 and S390X default device creation

Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e0ff7a4ef2..b71c655ec8 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1792,9 +1792,8 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
     case VIR_ARCH_SH4EB:
         addPCIRoot = true;
         break;
+
     case VIR_ARCH_S390:
-        addDefaultUSB = false;
-        break;
     case VIR_ARCH_S390X:
         addDefaultUSB = false;
         break;