提交 09fc6126 编写于 作者: P Peter Krempa

qemu: Refactor qemuDomainGetEmulatorPinInfo by reusing virDomainObjGetDefs

上级 6a34d418
...@@ -5402,14 +5402,13 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom, ...@@ -5402,14 +5402,13 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
int maplen, int maplen,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr targetDef = NULL; virDomainDefPtr def;
virDomainDefPtr targetDef;
int ret = -1; int ret = -1;
int hostcpus; int hostcpus;
virBitmapPtr cpumask = NULL; virBitmapPtr cpumask = NULL;
virBitmapPtr bitmap = NULL; virBitmapPtr bitmap = NULL;
virCapsPtr caps = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG, -1); VIR_DOMAIN_AFFECT_CONFIG, -1);
...@@ -5420,18 +5419,11 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom, ...@@ -5420,18 +5419,11 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
if (virDomainGetEmulatorPinInfoEnsureACL(dom->conn, vm->def) < 0) if (virDomainGetEmulatorPinInfoEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (virDomainObjGetDefs(vm, flags, &def, &targetDef) < 0)
goto cleanup;
if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt,
vm, &flags, &targetDef) < 0)
goto cleanup; goto cleanup;
if (flags & VIR_DOMAIN_AFFECT_LIVE) if (def)
targetDef = vm->def; targetDef = def;
/* Coverity didn't realize that targetDef must be set if we got here. */
sa_assert(targetDef);
if ((hostcpus = nodeGetCPUCount()) < 0) if ((hostcpus = nodeGetCPUCount()) < 0)
goto cleanup; goto cleanup;
...@@ -5453,7 +5445,6 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom, ...@@ -5453,7 +5445,6 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(caps);
virBitmapFree(bitmap); virBitmapFree(bitmap);
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册