External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-08 07:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: driver: Always assume support for QEMU_CAPS_MIGRATION_PARAM_DOWNTIME

Browse Source 
The 'downtime-limit' field of 'migrate-set-parameters' was introduced in
qemu-2.8, thus all qemu versions supported by libvirt use the new code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-15 14:12:28 +02:00
parent ce761753d3
commit 70d141fea5
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/qemu/qemu_driver.c
View File

@ -13059,10 +13059,8 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom,
{ {
virQEMUDriver *driver = dom->conn->privateData; virQEMUDriver *driver = dom->conn->privateData;
virDomainObj *vm; virDomainObj *vm;
qemuDomainObjPrivate *priv;
g_autoptr(qemuMigrationParams) migParams = NULL; g_autoptr(qemuMigrationParams) migParams = NULL;
int ret = -1; int ret = -1;
int rc;
virCheckFlags(0, -1); virCheckFlags(0, -1);
@ -13078,29 +13076,19 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom,
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
goto endjob; goto endjob;
priv = vm->privateData;
VIR_DEBUG("Setting migration downtime to %llums", downtime); VIR_DEBUG("Setting migration downtime to %llums", downtime);
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_DOWNTIME)) { if (!(migParams = qemuMigrationParamsNew()))
if (!(migParams = qemuMigrationParamsNew())) goto endjob;
goto endjob;
if (qemuMigrationParamsSetULL(migParams, if (qemuMigrationParamsSetULL(migParams,
QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT, QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT,
downtime) < 0) downtime) < 0)
goto endjob; goto endjob;
if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE, if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE,
migParams, 0) < 0) migParams, 0) < 0)
goto endjob; goto endjob;
} else {
qemuDomainObjEnterMonitor(driver, vm);
rc = qemuMonitorSetMigrationDowntime(priv->mon, downtime);
qemuDomainObjExitMonitor(vm);
if (rc < 0)
goto endjob;
}
ret = 0; ret = 0;