External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-25 04:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetBlockIoTune

Browse Source
This commit is contained in:
Peter Krempa 2016-05-25 12:43:08 +02:00
parent d314410fb8
commit 48dc930aab
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

@ -17091,6 +17091,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
virDomainDefPtr def = NULL;
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
virDomainBlockIoTuneInfo info; virDomainBlockIoTuneInfo info;
virDomainBlockIoTuneInfo *oldinfo; virDomainBlockIoTuneInfo *oldinfo;
@ -17106,7 +17107,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
bool set_size_iops = false; bool set_size_iops = false;
bool supportMaxOptions = true; bool supportMaxOptions = true;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
virTypedParameterPtr eventParams = NULL; virTypedParameterPtr eventParams = NULL;
int eventNparams = 0; int eventNparams = 0;
@ -17159,11 +17159,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
priv = vm->privateData; priv = vm->privateData;
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 (virTypedParamsAddString(&eventParams, &eventNparams, &eventMaxparams, if (virTypedParamsAddString(&eventParams, &eventNparams, &eventMaxparams,
@ -17331,7 +17327,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
if (!(conf_disk = virDomainDiskByName(persistentDef, path, true))) { if (!(conf_disk = virDomainDiskByName(persistentDef, path, true))) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("missing persistent configuration for disk '%s'"), _("missing persistent configuration for disk '%s'"),
@ -17340,7 +17336,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
} }
} }
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (def) {
supportMaxOptions = virQEMUCapsGet(priv->qemuCaps, supportMaxOptions = virQEMUCapsGet(priv->qemuCaps,
QEMU_CAPS_DRIVE_IOTUNE_MAX); QEMU_CAPS_DRIVE_IOTUNE_MAX);
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) { if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) {
@ -17358,7 +17354,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (!(disk = qemuDomainDiskByName(vm->def, path))) if (!(disk = qemuDomainDiskByName(def, path)))
goto endjob; goto endjob;
if (!(device = qemuAliasFromDisk(disk))) if (!(device = qemuAliasFromDisk(disk)))
@ -17410,7 +17406,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
} }
} }
if (flags & VIR_DOMAIN_AFFECT_CONFIG) { if (persistentDef) {
oldinfo = &conf_disk->blkdeviotune; oldinfo = &conf_disk->blkdeviotune;
if (!set_bytes) { if (!set_bytes) {
info.total_bytes_sec = oldinfo->total_bytes_sec; info.total_bytes_sec = oldinfo->total_bytes_sec;
@ -17437,7 +17433,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
if (eventNparams) if (eventNparams)
virTypedParamsFree(eventParams, eventNparams); virTypedParamsFree(eventParams, eventNparams);
virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }