From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 29 May 2015 12:22:23 +0000 (+0200)
Subject: qemu: Refactor qemuDomainGetVcpuPinInfo by reusing virDomainObjGetDefs
X-Git-Tag: v1.2.17-rc1~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=582e8cb908f7ea6b3c30c72bfe9b723b03287a5f;p=thirdparty%2Flibvirt.git

qemu: Refactor qemuDomainGetVcpuPinInfo by reusing virDomainObjGetDefs
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index cdb4a41114..38c98d3d42 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5202,13 +5202,11 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
                          int maplen,
                          unsigned int flags)
 {
-
-    virQEMUDriverPtr driver = dom->conn->privateData;
     virDomainObjPtr vm = NULL;
-    virDomainDefPtr targetDef = NULL;
+    virDomainDefPtr def;
+    virDomainDefPtr targetDef;
     int ret = -1;
     int hostcpus, vcpu;
-    virCapsPtr caps = NULL;
     virBitmapPtr allcpumap = NULL;
 
     virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
@@ -5220,18 +5218,11 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
     if (virDomainGetVcpuPinInfoEnsureACL(dom->conn, vm->def) < 0)
         goto cleanup;
 
-    if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
-        goto cleanup;
-
-    if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags,
-                                        &targetDef) < 0)
+    if (virDomainObjGetDefs(vm, flags, &def, &targetDef) < 0)
         goto cleanup;
 
-    if (flags & VIR_DOMAIN_AFFECT_LIVE)
-        targetDef = vm->def;
-
-    /* Coverity didn't realize that targetDef must be set if we got here.  */
-    sa_assert(targetDef);
+    if (def)
+        targetDef = def;
 
     if ((hostcpus = nodeGetCPUCount()) < 0)
         goto cleanup;
@@ -5269,7 +5260,6 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
  cleanup:
     virBitmapFree(allcpumap);
     virDomainObjEndAPI(&vm);
-    virObjectUnref(caps);
     return ret;
 }