From: Shivaprasad G Bhat <shivaprasadbhat@gmail.com>
Date: Wed, 4 May 2016 08:31:05 +0000 (+0530)
Subject: leave out the default USB controller only on i440fx during migration
X-Git-Tag: v1.3.5-rc1~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be1a7e6d31f652a6b279c3c9962262ac42c69d0a;p=thirdparty%2Flibvirt.git

leave out the default USB controller only on i440fx during migration

Further followup discussions in list on commit 192a53e concluded
that we should be leaving out the USB controller only for
i440fx machines as default USB can be used by someone on q35
at random slots.

Signed-off-by: Shivaprasad G Bhat <sbhat@linux.vnet.ibm.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 39a50e6d70..b0eb3b6632 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2932,7 +2932,8 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver,
          *  with libvirt <= 0.9.4. Limitation doesn't apply to other archs
          *  and can cause problems on PPC64.
          */
-        if (ARCH_IS_X86(def->os.arch) && usb && usb->idx == 0 && usb->model == -1) {
+        if (ARCH_IS_X86(def->os.arch) && qemuDomainMachineIsI440FX(def) &&
+            usb && usb->idx == 0 && usb->model == -1) {
             VIR_DEBUG("Removing default USB controller from domain '%s'"
                       " for migration compatibility", def->name);
             toremove++;