openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Simplify qemuDomainGetInterfaceParameters by using virDomainObjGetOneDef

This commit is contained in:
Peter Krempa 2015-06-15 19:10:49 +02:00
parent 47171cd1a6
commit 7d91a2d944
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_driver.c
View File

@ -11468,32 +11468,23 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
int *nparams, int *nparams,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData;
size_t i; size_t i;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
virDomainDefPtr persistentDef = NULL;
virDomainNetDefPtr net = NULL; virDomainNetDefPtr net = NULL;
int ret = -1; int ret = -1;
virCapsPtr caps = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_CONFIG |
VIR_TYPED_PARAM_STRING_OKAY, -1); VIR_TYPED_PARAM_STRING_OKAY, -1);
flags &= ~VIR_TYPED_PARAM_STRING_OKAY;
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
return -1; return -1;
if (virDomainGetInterfaceParametersEnsureACL(dom->conn, vm->def) < 0) if (virDomainGetInterfaceParametersEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (!(def = virDomainObjGetOneDef(vm, flags)))
goto cleanup;
if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags,
&persistentDef) < 0)
goto cleanup; goto cleanup;
if ((*nparams) == 0) { if ((*nparams) == 0) {
@ -11502,10 +11493,6 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
def = persistentDef;
if (!def)
def = vm->def;
net = virDomainNetFind(def, device); net = virDomainNetFind(def, device);
if (!net) { if (!net) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
@ -11576,7 +11563,6 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(caps);
return ret; return ret;
} }