From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 16 Aug 2017 13:54:10 +0000 (+0200)
Subject: qemu: domain: Don't set default USB model if qemuCaps is missing
X-Git-Tag: v3.7.0-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7808884808acf3b410e22493154566eacdcc8c5b;p=thirdparty%2Flibvirt.git

qemu: domain: Don't set default USB model if qemuCaps is missing

qemuDomainControllerDefPostParse assigns the default USB controller
model when it was not specified by the user. Skip this step if @qemuCaps
is missing so that we don't fill wrong data. This will then be fixes by
re-running the post parse callback.
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 802dd9e39f..e28b373a95 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3438,9 +3438,10 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont,
         break;
 
     case VIR_DOMAIN_CONTROLLER_TYPE_USB:
-        if (cont->model == -1) {
+        if (cont->model == -1 && qemuCaps) {
             /* Pick a suitable default model for the USB controller if none
-             * has been selected by the user.
+             * has been selected by the user and we have the qemuCaps for
+             * figuring out which contollers are supported.
              *
              * We rely on device availability instead of setting the model
              * unconditionally because, for some machine types, there's a