External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Always assume support for QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE

Browse Source 
The 'xbzrle-cache-size' parameter was added in qemu-2.11 thus all
supported qemu versions now use the new code path.

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:16:54 +02:00
parent af2d983567
commit 06e0ba3da7
2 changed files with 16 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/qemu/qemu_driver.c
View File

@ -13161,10 +13161,8 @@ qemuDomainMigrateGetCompressionCache(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);
@ -13180,8 +13178,6 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
goto endjob; goto endjob;
priv = vm->privateData;
if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) { if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Compressed migration is not supported by " _("Compressed migration is not supported by "
@ -13189,22 +13185,14 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
goto endjob; goto endjob;
} }
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) { if (qemuMigrationParamsFetch(driver, vm, VIR_ASYNC_JOB_NONE,
if (qemuMigrationParamsFetch(driver, vm, VIR_ASYNC_JOB_NONE, &migParams) < 0)
&migParams) < 0) goto endjob;
goto endjob;
if (qemuMigrationParamsGetULL(migParams, if (qemuMigrationParamsGetULL(migParams,
QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
cacheSize) < 0) cacheSize) < 0)
goto endjob; goto endjob;
} else {
qemuDomainObjEnterMonitor(driver, vm);
rc = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize);
qemuDomainObjExitMonitor(vm);
if (rc < 0)
goto endjob;
}
ret = 0; ret = 0;
@ -13223,10 +13211,8 @@ qemuDomainMigrateSetCompressionCache(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);
@ -13242,8 +13228,6 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
goto endjob; goto endjob;
priv = vm->privateData;
if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) { if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("Compressed migration is not supported by " _("Compressed migration is not supported by "
@ -13252,25 +13236,17 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
} }
VIR_DEBUG("Setting compression cache to %llu B", cacheSize); VIR_DEBUG("Setting compression cache to %llu B", cacheSize);
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) { if (!(migParams = qemuMigrationParamsNew()))
if (!(migParams = qemuMigrationParamsNew())) goto endjob;
goto endjob;
if (qemuMigrationParamsSetULL(migParams, if (qemuMigrationParamsSetULL(migParams,
QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
cacheSize) < 0) cacheSize) < 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 = qemuMonitorSetMigrationCacheSize(priv->mon, cacheSize);
qemuDomainObjExitMonitor(vm);
if (rc < 0)
goto endjob;
}
ret = 0; ret = 0;

18
src/qemu/qemu_migration_params.c
View File

@ -886,10 +886,8 @@ qemuMigrationParamsApply(virQEMUDriver *driver,
unsigned long apiFlags) unsigned long apiFlags)
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
bool xbzrleCacheSize_old = false;
g_autoptr(virJSONValue) params = NULL; g_autoptr(virJSONValue) params = NULL;
g_autoptr(virJSONValue) caps = NULL; g_autoptr(virJSONValue) caps = NULL;
qemuMigrationParam xbzrle = QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE;
bool postcopyResume = !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME); bool postcopyResume = !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME);
int ret = -1; int ret = -1;
@ -917,19 +915,6 @@ qemuMigrationParamsApply(virQEMUDriver *driver,
} }
} }
/* If QEMU is too old to support xbzrle-cache-size migration parameter,
* we need to set it via migrate-set-cache-size and tell
* qemuMonitorSetMigrationParams to ignore this parameter.
*/
if (migParams->params[xbzrle].set &&
!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) {
if (qemuMonitorSetMigrationCacheSize(priv->mon,
migParams->params[xbzrle].value.ull) < 0)
goto cleanup;
xbzrleCacheSize_old = true;
migParams->params[xbzrle].set = false;
}
if (!(params = qemuMigrationParamsToJSON(migParams, postcopyResume))) if (!(params = qemuMigrationParamsToJSON(migParams, postcopyResume)))
goto cleanup; goto cleanup;
@ -942,9 +927,6 @@ qemuMigrationParamsApply(virQEMUDriver *driver,
cleanup: cleanup:
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitor(vm);
if (xbzrleCacheSize_old)
migParams->params[xbzrle].set = true;
return ret; return ret;
} }