From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 15 Jun 2015 17:10:49 +0000 (+0200)
Subject: qemu: Simplify qemuDomainGetInterfaceParameters by using virDomainObjGetOneDef
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7d91a2d944b55fc9334693a75a0eeb4ee2fb7a46;p=libvirt.git

qemu: Simplify qemuDomainGetInterfaceParameters by using virDomainObjGetOneDef
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d1f195c3ec..dde94e8134 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;
 }