openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: monitor: Remove qemuMonitorJSONExtractCPUArchInfo wrapper 

The wraper is quite pointless and also the 'arch' field may depend on
whether query-cpus-fast is used.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Peter Krempa 2018-07-09 12:53:51 +02:00
parent 3087b27cff
commit 1e65d35b04
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/qemu/qemu_monitor_json.c
View File

@ -1580,27 +1580,6 @@ qemuMonitorJSONExtractCPUS390Info(virJSONValuePtr jsoncpu,
}
/**
* qemuMonitorJSONExtractCPUArchInfo:
* @jsoncpu: pointer to a single JSON cpu entry
* @cpu: pointer to a single cpu entry
*
* Extracts architecure specific virtual CPU data for a single
* CPU from the QAPI response using an architecture specific
* function.
*
*/
static void
qemuMonitorJSONExtractCPUArchInfo(virJSONValuePtr jsoncpu,
struct qemuMonitorQueryCpusEntry *cpu)
{
const char *arch = virJSONValueObjectGetString(jsoncpu, "arch");
if (STREQ_NULLABLE(arch, "s390"))
qemuMonitorJSONExtractCPUS390Info(jsoncpu, cpu);
}
/**
* qemuMonitorJSONExtractCPUInfo:
* @data: JSON response data
@ -1652,6 +1631,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data,
size_t *nentries,
bool fast)
{
const char *arch = NULL;
struct qemuMonitorQueryCpusEntry *cpus = NULL;
int ret = -1;
size_t i;
@ -1679,10 +1659,12 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data,
* The return data of query-cpus-fast has different field names
*/
if (fast) {
arch = virJSONValueObjectGetString(entry, "arch");
ignore_value(virJSONValueObjectGetNumberInt(entry, "cpu-index", &cpuid));
ignore_value(virJSONValueObjectGetNumberInt(entry, "thread-id", &thread));
qom_path = virJSONValueObjectGetString(entry, "qom-path");
} else {
arch = virJSONValueObjectGetString(entry, "arch");
ignore_value(virJSONValueObjectGetNumberInt(entry, "CPU", &cpuid));
ignore_value(virJSONValueObjectGetNumberInt(entry, "thread_id", &thread));
ignore_value(virJSONValueObjectGetBoolean(entry, "halted", &halted));
@ -1696,7 +1678,8 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data,
goto cleanup;
/* process optional architecture-specific data */
qemuMonitorJSONExtractCPUArchInfo(entry, cpus + i);
if (STREQ_NULLABLE(arch, "s390"))
qemuMonitorJSONExtractCPUS390Info(entry, cpus + i);
}
VIR_STEAL_PTR(*entries, cpus);