From a31bd18f43b70882942bddcced67adf5fa892f9a Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 4 Mar 2014 10:32:47 +0100 Subject: [PATCH] qemu: monitor: Fix error message and comment when getting cpu info In qemuMonitorJSONExtractCPUInfo an error message hinted on missing character device data which is wrong. Also a comment states that only qemu-kvm tree includes the thread_id field. This is no longer true. --- src/qemu/qemu_monitor_json.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5e825acb32..9a5b8121e1 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1220,13 +1220,13 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, int thread; if (!entry) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("character device information was missing array element")); + _("cpu information was missing an array element")); goto cleanup; } if (virJSONValueObjectGetNumberInt(entry, "thread_id", &thread) < 0) { - /* Only qemu-kvm tree includs thread_id, so treat this as - non-fatal, simply returning no data */ + /* Some older qemu versions don't report the thread_id, + * so treat this as non-fatal, simply returning no data */ ret = 0; goto cleanup; }