Skip to content

Commit 0b45add

Browse files
author
Jiri Denemark
committed
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 <[email protected]> Reviewed-by: Peter Krempa <[email protected]>
1 parent 65de5f6 commit 0b45add

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

src/qemu/qemu_driver.c

+17-4
Original file line numberDiff line numberDiff line change
@@ -13971,7 +13971,9 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
1397113971
virQEMUDriverPtr driver = dom->conn->privateData;
1397213972
virDomainObjPtr vm;
1397313973
qemuDomainObjPrivatePtr priv;
13974+
g_autoptr(qemuMigrationParams) migParams = NULL;
1397413975
int ret = -1;
13976+
int rc;
1397513977

1397613978
virCheckFlags(0, -1);
1397713979

@@ -13996,12 +13998,23 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
1399613998
goto endjob;
1399713999
}
1399814000

13999-
qemuDomainObjEnterMonitor(driver, vm);
14001+
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) {
14002+
if (qemuMigrationParamsFetch(driver, vm, QEMU_ASYNC_JOB_NONE,
14003+
&migParams) < 0)
14004+
goto endjob;
1400014005

14001-
ret = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize);
14006+
if (qemuMigrationParamsGetULL(migParams,
14007+
QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
14008+
cacheSize) < 0)
14009+
goto endjob;
14010+
} else {
14011+
qemuDomainObjEnterMonitor(driver, vm);
14012+
rc = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize);
14013+
if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
14014+
goto endjob;
14015+
}
1400214016

14003-
if (qemuDomainObjExitMonitor(driver, vm) < 0)
14004-
ret = -1;
14017+
ret = 0;
1400514018

1400614019
endjob:
1400714020
qemuDomainObjEndJob(driver, vm);

tests/qemumonitorjsontest.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1888,7 +1888,7 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *opaque)
18881888
if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
18891889
return -1;
18901890

1891-
qemuMonitorTestSkipDeprecatedValidation(test, false);
1891+
qemuMonitorTestSkipDeprecatedValidation(test, true);
18921892

18931893
if (qemuMonitorTestAddItem(test, "query-migrate-cache-size",
18941894
"{"

0 commit comments

Comments
 (0)