External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Refactor qemuDomainPinEmulator by reusing virDomainObjGetDefs

Browse Source
This commit is contained in:
Peter Krempa 2015-05-29 14:29:06 +02:00
parent 582e8cb908
commit 6a34d41894
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_driver.c
View File

@ -5272,13 +5272,13 @@ qemuDomainPinEmulator(virDomainPtr dom,
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
virCgroupPtr cgroup_emulator = NULL; virCgroupPtr cgroup_emulator = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr def;
virDomainDefPtr persistentDef;
int ret = -1; int ret = -1;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
bool doReset = false; bool doReset = false;
virBitmapPtr pcpumap = NULL; virBitmapPtr pcpumap = NULL;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
char *str = NULL; char *str = NULL;
virTypedParameterPtr eventParams = NULL; virTypedParameterPtr eventParams = NULL;
@ -5296,9 +5296,6 @@ qemuDomainPinEmulator(virDomainPtr dom,
if (virDomainPinEmulatorEnsureACL(dom->conn, vm->def, flags) < 0) if (virDomainPinEmulatorEnsureACL(dom->conn, vm->def, flags) < 0)
goto cleanup; goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("Changing affinity for emulator thread dynamically " _("Changing affinity for emulator thread dynamically "
@ -5309,8 +5306,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
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;
@ -5330,7 +5326,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
if (virBitmapIsAllSet(pcpumap)) if (virBitmapIsAllSet(pcpumap))
doReset = true; doReset = true;
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (def) {
if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) { if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) {
if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_EMULATOR, if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_EMULATOR,
0, false, &cgroup_emulator) < 0) 0, false, &cgroup_emulator) < 0)
@ -5351,11 +5347,11 @@ qemuDomainPinEmulator(virDomainPtr dom,
} }
} }
virBitmapFree(vm->def->cputune.emulatorpin); virBitmapFree(def->cputune.emulatorpin);
vm->def->cputune.emulatorpin = NULL; def->cputune.emulatorpin = NULL;
if (!doReset && if (!doReset &&
!(vm->def->cputune.emulatorpin = virBitmapNewCopy(pcpumap))) !(def->cputune.emulatorpin = virBitmapNewCopy(pcpumap)))
goto endjob; goto endjob;
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
@ -5371,7 +5367,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams);
} }
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
virBitmapFree(persistentDef->cputune.emulatorpin); virBitmapFree(persistentDef->cputune.emulatorpin);
persistentDef->cputune.emulatorpin = NULL; persistentDef->cputune.emulatorpin = NULL;
@ -5395,7 +5391,6 @@ qemuDomainPinEmulator(virDomainPtr dom,
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
VIR_FREE(str); VIR_FREE(str);
virBitmapFree(pcpumap); virBitmapFree(pcpumap);
virObjectUnref(caps);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;