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

Browse Source
This commit is contained in:
Peter Krempa 2015-05-29 14:17:35 +02:00
parent 8db9610f57
commit 7721e7901f
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/qemu/qemu_driver.c
View File

@ -5016,7 +5016,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr def;
virDomainDefPtr persistentDef;
virCgroupPtr cgroup_vcpu = NULL; virCgroupPtr cgroup_vcpu = NULL;
int ret = -1; int ret = -1;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
@ -5024,7 +5025,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
virDomainPinDefPtr *newVcpuPin = NULL; virDomainPinDefPtr *newVcpuPin = NULL;
virBitmapPtr pcpumap = NULL; virBitmapPtr pcpumap = NULL;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] = ""; char paramField[VIR_TYPED_PARAM_FIELD_LENGTH] = "";
char *str = NULL; char *str = NULL;
@ -5043,26 +5043,22 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
if (virDomainPinVcpuFlagsEnsureACL(dom->conn, vm->def, flags) < 0) if (virDomainPinVcpuFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup; goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags, if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
&persistentDef) < 0)
goto endjob; goto endjob;
priv = vm->privateData; priv = vm->privateData;
if ((flags & VIR_DOMAIN_AFFECT_LIVE) && vcpu >= vm->def->vcpus) { if (def && vcpu >= def->vcpus) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("vcpu %d is out of range of live cpu count %d"), _("vcpu %d is out of range of live cpu count %d"),
vcpu, vm->def->vcpus); vcpu, def->vcpus);
goto endjob; goto endjob;
} }
if ((flags & VIR_DOMAIN_AFFECT_CONFIG) && vcpu >= persistentDef->vcpus) { if (persistentDef && vcpu >= persistentDef->vcpus) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("vcpu %d is out of range of persistent cpu count %d"), _("vcpu %d is out of range of persistent cpu count %d"),
vcpu, persistentDef->vcpus); vcpu, persistentDef->vcpus);
@ -5078,21 +5074,20 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (def) {
if (priv->vcpupids == NULL) { if (priv->vcpupids == NULL) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("cpu affinity is not supported")); "%s", _("cpu affinity is not supported"));
goto endjob; goto endjob;
} }
if (vm->def->cputune.vcpupin) { if (def->cputune.vcpupin) {
newVcpuPin = virDomainPinDefCopy(vm->def->cputune.vcpupin, newVcpuPin = virDomainPinDefCopy(def->cputune.vcpupin,
vm->def->cputune.nvcpupin); def->cputune.nvcpupin);
if (!newVcpuPin) if (!newVcpuPin)
goto endjob; goto endjob;
newVcpuPinNum = vm->def->cputune.nvcpupin; newVcpuPinNum = def->cputune.nvcpupin;
} else { } else {
if (VIR_ALLOC(newVcpuPin) < 0) if (VIR_ALLOC(newVcpuPin) < 0)
goto endjob; goto endjob;
@ -5126,12 +5121,12 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
} }
} }
if (vm->def->cputune.vcpupin) if (def->cputune.vcpupin)
virDomainPinDefArrayFree(vm->def->cputune.vcpupin, virDomainPinDefArrayFree(def->cputune.vcpupin,
vm->def->cputune.nvcpupin); def->cputune.nvcpupin);
vm->def->cputune.vcpupin = newVcpuPin; def->cputune.vcpupin = newVcpuPin;
vm->def->cputune.nvcpupin = newVcpuPinNum; def->cputune.nvcpupin = newVcpuPinNum;
newVcpuPin = NULL; newVcpuPin = NULL;
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
@ -5150,8 +5145,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams);
} }
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
if (!persistentDef->cputune.vcpupin) { if (!persistentDef->cputune.vcpupin) {
if (VIR_ALLOC(persistentDef->cputune.vcpupin) < 0) if (VIR_ALLOC(persistentDef->cputune.vcpupin) < 0)
goto endjob; goto endjob;
@ -5187,7 +5181,6 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
VIR_FREE(str); VIR_FREE(str);
virBitmapFree(pcpumap); virBitmapFree(pcpumap);
virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }