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

Browse Source
This commit is contained in:
Peter Krempa 2015-05-29 14:22:23 +02:00
parent 3d021381c7
commit 65258d1f71
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/qemu/qemu_driver.c
View File

@ -2303,10 +2303,10 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr def;
virDomainDefPtr persistentDef;
int ret = -1, r; int ret = -1, r;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_AFFECT_CONFIG |
@ -2323,26 +2323,21 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup; goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false))) if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
goto endjob;
if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags,
&persistentDef) < 0)
goto endjob; goto endjob;
if (flags & VIR_DOMAIN_MEM_MAXIMUM) { if (flags & VIR_DOMAIN_MEM_MAXIMUM) {
/* resize the maximum memory */ /* resize the maximum memory */
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (def) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot resize the maximum memory on an " _("cannot resize the maximum memory on an "
"active domain")); "active domain"));
goto endjob; goto endjob;
} }
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
/* Help clang 2.8 decipher the logic flow. */
sa_assert(persistentDef);
/* resizing memory with NUMA nodes specified doesn't work as there /* resizing memory with NUMA nodes specified doesn't work as there
* is no way to change the individual node sizes with this API */ * is no way to change the individual node sizes with this API */
if (virDomainNumaGetNodeCount(persistentDef->numa) > 0) { if (virDomainNumaGetNodeCount(persistentDef->numa) > 0) {
@ -2372,9 +2367,9 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
/* resize the current memory */ /* resize the current memory */
unsigned long oldmax = 0; unsigned long oldmax = 0;
if (flags & VIR_DOMAIN_AFFECT_LIVE) if (def)
oldmax = virDomainDefGetMemoryActual(vm->def); oldmax = virDomainDefGetMemoryActual(def);
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
if (!oldmax || oldmax > virDomainDefGetMemoryActual(persistentDef)) if (!oldmax || oldmax > virDomainDefGetMemoryActual(persistentDef))
oldmax = virDomainDefGetMemoryActual(persistentDef); oldmax = virDomainDefGetMemoryActual(persistentDef);
} }
@ -2385,13 +2380,13 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
goto endjob; goto endjob;
} }
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (def) {
priv = vm->privateData; priv = vm->privateData;
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
r = qemuMonitorSetBalloon(priv->mon, newmem); r = qemuMonitorSetBalloon(priv->mon, newmem);
if (qemuDomainObjExitMonitor(driver, vm) < 0) if (qemuDomainObjExitMonitor(driver, vm) < 0)
goto endjob; goto endjob;
virDomainAuditMemory(vm, vm->def->mem.cur_balloon, newmem, "update", virDomainAuditMemory(vm, def->mem.cur_balloon, newmem, "update",
r == 1); r == 1);
if (r < 0) if (r < 0)
goto endjob; goto endjob;
@ -2405,8 +2400,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
} }
} }
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
sa_assert(persistentDef);
persistentDef->mem.cur_balloon = newmem; persistentDef->mem.cur_balloon = newmem;
ret = virDomainSaveConfig(cfg->configDir, persistentDef); ret = virDomainSaveConfig(cfg->configDir, persistentDef);
goto endjob; goto endjob;
@ -2419,7 +2413,6 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem,
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }