From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 23 May 2018 13:06:11 +0000 (+0200)
Subject: qemuDomainDetachDeviceLiveAndConfig: Don't use driver->caps directly
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=604f3ff0c0244c53a84f515f749cd4bd243d0ac8;p=libvirt.git

qemuDomainDetachDeviceLiveAndConfig: Don't use driver->caps directly

Funny, we obtain driver caps at the beginning of the function,
but then for unknown reason access driver->caps directly.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4a8059ebd1..25924d2032 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8724,7 +8724,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr driver,
          * changed even if we failed to attach the device. For example,
          * a new controller may be created.
          */
-        if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) {
+        if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, caps) < 0) {
             ret = -1;
             goto cleanup;
         }
@@ -8732,7 +8732,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr driver,
 
     /* Finally, if no error until here, we can save config. */
     if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
-        ret = virDomainSaveConfig(cfg->configDir, driver->caps, vmdef);
+        ret = virDomainSaveConfig(cfg->configDir, caps, vmdef);
         if (!ret) {
             virDomainObjAssignDef(vm, vmdef, false, NULL);
             vmdef = NULL;