NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Refactor qemuDomainGetIOThreadInfo by reusing virDomainObjGetDefs

Browse Source
This commit is contained in:
Peter Krempa 2015-05-29 14:22:23 +02:00
parent 0ad3d69e80
commit 1282b350f3
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_driver.c
View File

@ -5760,7 +5760,6 @@ qemuDomainGetIOThreadInfo(virDomainPtr dom,
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
virCapsPtr caps = NULL;
virDomainDefPtr targetDef = NULL; virDomainDefPtr targetDef = NULL;
int ret = -1; int ret = -1;
@ -5773,27 +5772,16 @@ qemuDomainGetIOThreadInfo(virDomainPtr dom,
if (virDomainGetIOThreadInfoEnsureACL(dom->conn, vm->def) < 0) if (virDomainGetIOThreadInfoEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (virDomainObjGetDefs(vm, flags, NULL, &targetDef) < 0)
goto cleanup; goto cleanup;
if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags, if (!targetDef)
&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)
ret = qemuDomainGetIOThreadsLive(driver, vm, info); ret = qemuDomainGetIOThreadsLive(driver, vm, info);
else else
ret = qemuDomainGetIOThreadsConfig(targetDef, info); ret = qemuDomainGetIOThreadsConfig(targetDef, info);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(caps);
return ret; return ret;
} }