qemumonitorjsontest: Allow use of deprecated 'query-cpus'

The command was replaced with 'query-cpus-fast' which is always used
when detected by the capabilities so we can allow our test usage of
the deprecated command even if it will be removed from the schema.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-04-29 19:57:28 +02:00
parent 5703b48103
commit 4bad0d913a

View File

@ -1440,6 +1440,8 @@ testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *opaque)
if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
return -1;
qemuMonitorTestSkipDeprecatedValidation(test, true);
if (qemuMonitorTestAddItem(test, "query-cpus",
"{"
" \"return\": ["
@ -2696,10 +2698,12 @@ testQemuMonitorCPUInfo(const void *opaque)
queryHotpluggableStr) < 0)
goto cleanup;
if (data->fast)
if (data->fast) {
queryCpusFunction = "query-cpus-fast";
else
} else {
queryCpusFunction = "query-cpus";
qemuMonitorTestSkipDeprecatedValidation(test, true);
}
if (qemuMonitorTestAddItem(test, queryCpusFunction, queryCpusStr) < 0)
goto cleanup;