From 1282b350f345194ee2f31de9ecc8ebe9b4b5f5a2 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 29 May 2015 14:22:23 +0200
Subject: [PATCH] qemu: Refactor qemuDomainGetIOThreadInfo by reusing
 virDomainObjGetDefs

---
 src/qemu/qemu_driver.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 74da311cbb..3813a2d053 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5760,7 +5760,6 @@ qemuDomainGetIOThreadInfo(virDomainPtr dom,
 {
     virQEMUDriverPtr driver = dom->conn->privateData;
     virDomainObjPtr vm;
-    virCapsPtr caps = NULL;
     virDomainDefPtr targetDef = NULL;
     int ret = -1;
 
@@ -5773,27 +5772,16 @@ qemuDomainGetIOThreadInfo(virDomainPtr dom,
     if (virDomainGetIOThreadInfoEnsureACL(dom->conn, vm->def) < 0)
         goto cleanup;
 
-    if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
+    if (virDomainObjGetDefs(vm, flags, NULL, &targetDef) < 0)
         goto cleanup;
 
-    if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags,
-                                        &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 (flags & VIR_DOMAIN_AFFECT_LIVE)
+    if (!targetDef)
         ret = qemuDomainGetIOThreadsLive(driver, vm, info);
     else
         ret = qemuDomainGetIOThreadsConfig(targetDef, info);
 
  cleanup:
     virDomainObjEndAPI(&vm);
-    virObjectUnref(caps);
     return ret;
 }
 
-- 
GitLab