[PATCH 04/13] qemu: Simplify qemuDomainGetNumaParameters by using virDomainObjGetOneDef

[Peter Krempa <pkrempa@xxxxxxxxxx>]

---
 src/qemu/qemu_driver.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index dde94e8..e8b2be3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10277,36 +10277,24 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
                             int *nparams,
                             unsigned int flags)
 {
-    virQEMUDriverPtr driver = dom->conn->privateData;
     size_t i;
     virDomainObjPtr vm = NULL;
-    virDomainDefPtr persistentDef = NULL;
     virDomainNumatuneMemMode tmpmode = VIR_DOMAIN_NUMATUNE_MEM_STRICT;
     char *nodeset = NULL;
     int ret = -1;
-    virCapsPtr caps = NULL;
     virDomainDefPtr def = NULL;

     virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
                   VIR_DOMAIN_AFFECT_CONFIG |
                   VIR_TYPED_PARAM_STRING_OKAY, -1);

-    /* We blindly return a string, and let libvirt.c and
-     * remote_driver.c do the filtering on behalf of older clients
-     * that can't parse it.  */
-    flags &= ~VIR_TYPED_PARAM_STRING_OKAY;
-
     if (!(vm = qemuDomObjFromDomain(dom)))
         return -1;

     if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0)
         goto cleanup;

-    if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
-        goto cleanup;
-
-    if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags,
-                                        &persistentDef) < 0)
+    if (!(def = virDomainObjGetOneDef(vm, flags)))
         goto cleanup;

     if ((*nparams) == 0) {
@@ -10315,11 +10303,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
         goto cleanup;
     }

-    if (flags & VIR_DOMAIN_AFFECT_CONFIG)
-        def = persistentDef;
-    else
-        def = vm->def;
-
     for (i = 0; i < QEMU_NB_NUMA_PARAM && i < *nparams; i++) {
         virMemoryParameterPtr param = &params[i];

@@ -10357,7 +10340,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
  cleanup:
     VIR_FREE(nodeset);
     virDomainObjEndAPI(&vm);
-    virObjectUnref(caps);
     return ret;
 }

-- 
2.4.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list