openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Refactor qemuDomainChgIOThread by reusing virDomainObjGetDefs

This commit is contained in:
Peter Krempa 2015-05-29 14:22:23 +02:00
parent cac6d6396d
commit 6200d86d60
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_driver.c
View File

@ -6155,32 +6155,22 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
virDomainDefPtr def;
virDomainDefPtr persistentDef; virDomainDefPtr persistentDef;
int ret = -1; int ret = -1;
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
priv = vm->privateData; priv = vm->privateData;
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;
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (def) {
if (!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot change IOThreads for an inactive domain"));
goto endjob;
}
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD)) { if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("IOThreads not supported with this binary")); _("IOThreads not supported with this binary"));
@ -6199,7 +6189,7 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
goto endjob; goto endjob;
} }
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
if (add) { if (add) {
if (!virDomainIOThreadIDAdd(persistentDef, iothread_id)) if (!virDomainIOThreadIDAdd(persistentDef, iothread_id))
goto endjob; goto endjob;
@ -6231,7 +6221,6 @@ qemuDomainChgIOThread(virQEMUDriverPtr driver,
qemuDomainObjEndJob(driver, vm); qemuDomainObjEndJob(driver, vm);
cleanup: cleanup:
virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }