mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-30 13:37:17 +00:00
qemu: Always assume support for QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH
The 'max-bandwidth' field was added as argument of 'migrate-set-parameters' in qemu-2.8, thus all qemu version supported by libvirt already use the new code path. This patch assumes the presence and removes the legacy code paths. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
c341989fa1
commit
6810cc45f7
@ -13304,7 +13304,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom,
|
|||||||
qemuDomainObjPrivate *priv;
|
qemuDomainObjPrivate *priv;
|
||||||
bool postcopy = !!(flags & VIR_DOMAIN_MIGRATE_MAX_SPEED_POSTCOPY);
|
bool postcopy = !!(flags & VIR_DOMAIN_MIGRATE_MAX_SPEED_POSTCOPY);
|
||||||
g_autoptr(qemuMigrationParams) migParams = NULL;
|
g_autoptr(qemuMigrationParams) migParams = NULL;
|
||||||
bool bwParam;
|
qemuMigrationParam param;
|
||||||
unsigned long long max;
|
unsigned long long max;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
|
||||||
@ -13343,35 +13343,22 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom,
|
|||||||
|
|
||||||
VIR_DEBUG("Setting migration bandwidth to %luMbs", bandwidth);
|
VIR_DEBUG("Setting migration bandwidth to %luMbs", bandwidth);
|
||||||
|
|
||||||
bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
|
|
||||||
|
|
||||||
if (postcopy || bwParam) {
|
if (!(migParams = qemuMigrationParamsNew()))
|
||||||
qemuMigrationParam param;
|
goto endjob;
|
||||||
|
|
||||||
if (!(migParams = qemuMigrationParamsNew()))
|
if (postcopy)
|
||||||
goto endjob;
|
param = QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH;
|
||||||
|
else
|
||||||
|
param = QEMU_MIGRATION_PARAM_MAX_BANDWIDTH;
|
||||||
|
|
||||||
if (postcopy)
|
if (qemuMigrationParamsSetULL(migParams, param,
|
||||||
param = QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH;
|
bandwidth * 1024 * 1024) < 0)
|
||||||
else
|
goto endjob;
|
||||||
param = QEMU_MIGRATION_PARAM_MAX_BANDWIDTH;
|
|
||||||
|
|
||||||
if (qemuMigrationParamsSetULL(migParams, param,
|
if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE,
|
||||||
bandwidth * 1024 * 1024) < 0)
|
migParams, 0) < 0)
|
||||||
goto endjob;
|
goto endjob;
|
||||||
|
|
||||||
if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE,
|
|
||||||
migParams, 0) < 0)
|
|
||||||
goto endjob;
|
|
||||||
} else {
|
|
||||||
int rc;
|
|
||||||
|
|
||||||
qemuDomainObjEnterMonitor(driver, vm);
|
|
||||||
rc = qemuMonitorSetMigrationSpeed(priv->mon, bandwidth);
|
|
||||||
qemuDomainObjExitMonitor(vm);
|
|
||||||
if (rc < 0)
|
|
||||||
goto endjob;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!postcopy)
|
if (!postcopy)
|
||||||
priv->migMaxBandwidth = bandwidth;
|
priv->migMaxBandwidth = bandwidth;
|
||||||
|
@ -4697,7 +4697,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
|
|||||||
virErrorPtr orig_err = NULL;
|
virErrorPtr orig_err = NULL;
|
||||||
unsigned int cookieFlags = 0;
|
unsigned int cookieFlags = 0;
|
||||||
bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR);
|
bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR);
|
||||||
bool bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
|
|
||||||
bool storageMigration = flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC);
|
bool storageMigration = flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC);
|
||||||
bool cancel = false;
|
bool cancel = false;
|
||||||
unsigned int waitFlags;
|
unsigned int waitFlags;
|
||||||
@ -4795,8 +4794,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bwParam &&
|
if (qemuMigrationParamsSetULL(migParams, QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
|
||||||
qemuMigrationParamsSetULL(migParams, QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
|
|
||||||
priv->migMaxBandwidth * 1024 * 1024) < 0)
|
priv->migMaxBandwidth * 1024 * 1024) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
@ -4887,10 +4885,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
|
|||||||
goto exit_monitor;
|
goto exit_monitor;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!bwParam &&
|
|
||||||
qemuMonitorSetMigrationSpeed(priv->mon, priv->migMaxBandwidth) < 0)
|
|
||||||
goto exit_monitor;
|
|
||||||
|
|
||||||
rc = qemuMigrationSrcStart(vm, spec, migrate_flags, &fd);
|
rc = qemuMigrationSrcStart(vm, spec, migrate_flags, &fd);
|
||||||
|
|
||||||
qemuDomainObjExitMonitor(vm);
|
qemuDomainObjExitMonitor(vm);
|
||||||
@ -6880,7 +6874,6 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
|
|||||||
virDomainAsyncJob asyncJob)
|
virDomainAsyncJob asyncJob)
|
||||||
{
|
{
|
||||||
qemuDomainObjPrivate *priv = vm->privateData;
|
qemuDomainObjPrivate *priv = vm->privateData;
|
||||||
bool bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
|
|
||||||
int rc;
|
int rc;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
int pipeFD[2] = { -1, -1 };
|
int pipeFD[2] = { -1, -1 };
|
||||||
@ -6894,27 +6887,18 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
|
|||||||
|
|
||||||
/* Increase migration bandwidth to unlimited since target is a file.
|
/* Increase migration bandwidth to unlimited since target is a file.
|
||||||
* Failure to change migration speed is not fatal. */
|
* Failure to change migration speed is not fatal. */
|
||||||
if (bwParam) {
|
if (!(migParams = qemuMigrationParamsNew()))
|
||||||
if (!(migParams = qemuMigrationParamsNew()))
|
return -1;
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (qemuMigrationParamsSetULL(migParams,
|
if (qemuMigrationParamsSetULL(migParams,
|
||||||
QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
|
QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
|
||||||
QEMU_DOMAIN_MIG_BANDWIDTH_MAX * 1024 * 1024) < 0)
|
QEMU_DOMAIN_MIG_BANDWIDTH_MAX * 1024 * 1024) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams, 0) < 0)
|
if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams, 0) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
|
priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
|
||||||
} else {
|
|
||||||
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
|
|
||||||
qemuMonitorSetMigrationSpeed(priv->mon,
|
|
||||||
QEMU_DOMAIN_MIG_BANDWIDTH_MAX);
|
|
||||||
priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
|
|
||||||
qemuDomainObjExitMonitor(vm);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!virDomainObjIsActive(vm)) {
|
if (!virDomainObjIsActive(vm)) {
|
||||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||||
@ -6994,18 +6978,11 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
|
|||||||
|
|
||||||
/* Restore max migration bandwidth */
|
/* Restore max migration bandwidth */
|
||||||
if (virDomainObjIsActive(vm)) {
|
if (virDomainObjIsActive(vm)) {
|
||||||
if (bwParam) {
|
if (qemuMigrationParamsSetULL(migParams,
|
||||||
if (qemuMigrationParamsSetULL(migParams,
|
QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
|
||||||
QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
|
saveMigBandwidth * 1024 * 1024) == 0)
|
||||||
saveMigBandwidth * 1024 * 1024) == 0)
|
ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob,
|
||||||
ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob,
|
migParams, 0));
|
||||||
migParams, 0));
|
|
||||||
} else {
|
|
||||||
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
|
|
||||||
qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth);
|
|
||||||
qemuDomainObjExitMonitor(vm);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
priv->migMaxBandwidth = saveMigBandwidth;
|
priv->migMaxBandwidth = saveMigBandwidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user