[PATCH 03/13] qemu: Simplify qemuDomainGetInterfaceParameters by using virDomainObjGetOneDef

[Peter Krempa <pkrempa@xxxxxxxxxx>]

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

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d1f195c..dde94e8 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11468,32 +11468,23 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
                                  int *nparams,
                                  unsigned int flags)
 {
-    virQEMUDriverPtr driver = dom->conn->privateData;
     size_t i;
     virDomainObjPtr vm = NULL;
     virDomainDefPtr def = NULL;
-    virDomainDefPtr persistentDef = NULL;
     virDomainNetDefPtr net = NULL;
     int ret = -1;
-    virCapsPtr caps = NULL;

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

-    flags &= ~VIR_TYPED_PARAM_STRING_OKAY;
-
     if (!(vm = qemuDomObjFromDomain(dom)))
         return -1;

     if (virDomainGetInterfaceParametersEnsureACL(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) {
@@ -11502,10 +11493,6 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
         goto cleanup;
     }

-    def = persistentDef;
-    if (!def)
-        def = vm->def;
-
     net = virDomainNetFind(def, device);
     if (!net) {
         virReportError(VIR_ERR_INVALID_ARG,
@@ -11576,7 +11563,6 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,

  cleanup:
     virDomainObjEndAPI(&vm);
-    virObjectUnref(caps);
     return ret;
 }

-- 
2.4.1

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