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 qemuDomainGetVcpusFlags by reusing virDomainObjGetDefs

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

17
src/qemu/qemu_driver.c
View File

@ -5518,8 +5518,8 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainDefPtr def; virDomainDefPtr def;
virDomainDefPtr persistentDef;
int ret = -1; int ret = -1;
virCapsPtr caps = NULL;
qemuAgentCPUInfoPtr cpuinfo = NULL; qemuAgentCPUInfoPtr cpuinfo = NULL;
int ncpuinfo = -1; int ncpuinfo = -1;
size_t i; size_t i;
@ -5537,18 +5537,11 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup; goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
goto cleanup; goto cleanup;
if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt,
vm, &flags, &def) < 0)
goto cleanup;
if (flags & VIR_DOMAIN_AFFECT_LIVE)
def = vm->def;
if (flags & VIR_DOMAIN_VCPU_GUEST) { if (flags & VIR_DOMAIN_VCPU_GUEST) {
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("vCPU count provided by the guest agent can only be " _("vCPU count provided by the guest agent can only be "
" requested for live domains")); " requested for live domains"));
@ -5589,6 +5582,9 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
ret++; ret++;
} }
} else { } else {
if (!def)
def = persistentDef;
if (flags & VIR_DOMAIN_VCPU_MAXIMUM) if (flags & VIR_DOMAIN_VCPU_MAXIMUM)
ret = def->maxvcpus; ret = def->maxvcpus;
else else
@ -5598,7 +5594,6 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags)
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(caps);
VIR_FREE(cpuinfo); VIR_FREE(cpuinfo);
return ret; return ret;
} }