mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-30 21:47:18 +00:00
qemu: Avoid deprecated query-migrate-cache-size QMP command
The same functionality can be achieved using query-migrate-parameters QMP command and checking the xbzrle-cache-size parameter. https://bugzilla.redhat.com/show_bug.cgi?id=1829544 Signed-off-by: Jiri Denemark <jdenemar@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
parent
65de5f6fe4
commit
0b45addf19
@ -13971,7 +13971,9 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
|
|||||||
virQEMUDriverPtr driver = dom->conn->privateData;
|
virQEMUDriverPtr driver = dom->conn->privateData;
|
||||||
virDomainObjPtr vm;
|
virDomainObjPtr vm;
|
||||||
qemuDomainObjPrivatePtr priv;
|
qemuDomainObjPrivatePtr priv;
|
||||||
|
g_autoptr(qemuMigrationParams) migParams = NULL;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
int rc;
|
||||||
|
|
||||||
virCheckFlags(0, -1);
|
virCheckFlags(0, -1);
|
||||||
|
|
||||||
@ -13996,12 +13998,23 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
|
|||||||
goto endjob;
|
goto endjob;
|
||||||
}
|
}
|
||||||
|
|
||||||
qemuDomainObjEnterMonitor(driver, vm);
|
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) {
|
||||||
|
if (qemuMigrationParamsFetch(driver, vm, QEMU_ASYNC_JOB_NONE,
|
||||||
|
&migParams) < 0)
|
||||||
|
goto endjob;
|
||||||
|
|
||||||
ret = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize);
|
if (qemuMigrationParamsGetULL(migParams,
|
||||||
|
QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
|
||||||
|
cacheSize) < 0)
|
||||||
|
goto endjob;
|
||||||
|
} else {
|
||||||
|
qemuDomainObjEnterMonitor(driver, vm);
|
||||||
|
rc = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize);
|
||||||
|
if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
|
||||||
|
goto endjob;
|
||||||
|
}
|
||||||
|
|
||||||
if (qemuDomainObjExitMonitor(driver, vm) < 0)
|
ret = 0;
|
||||||
ret = -1;
|
|
||||||
|
|
||||||
endjob:
|
endjob:
|
||||||
qemuDomainObjEndJob(driver, vm);
|
qemuDomainObjEndJob(driver, vm);
|
||||||
|
@ -1888,7 +1888,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *opaque)
|
|||||||
if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
|
if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
qemuMonitorTestSkipDeprecatedValidation(test, false);
|
qemuMonitorTestSkipDeprecatedValidation(test, true);
|
||||||
|
|
||||||
if (qemuMonitorTestAddItem(test, "query-migrate-cache-size",
|
if (qemuMonitorTestAddItem(test, "query-migrate-cache-size",
|
||||||
"{"
|
"{"
|
||||||
|
Loading…
Reference in New Issue
Block a user