[libvirt] [PATCH] qemu: monitor: Fix error message and comment when getting cpu info

2014-03-04 Thread Peter Krempa 
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 5e825ac..9a5b812 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;
 }
-- 
1.9.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemu: monitor: Fix error message and comment when getting cpu info

2014-03-04 Thread Martin Kletzander 
On Tue, Mar 04, 2014 at 10:38:29AM +0100, Peter Krempa wrote:
 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.
 ---

ACK

Martin

  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 5e825ac..9a5b812 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;
  }
 --
 1.9.0

 --
 libvir-list mailing list
 libvir-list@redhat.com
 https://www.redhat.com/mailman/listinfo/libvir-list


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemu: monitor: Fix error message and comment when getting cpu info

2014-03-04 Thread Peter Krempa 
On 03/04/14 10:52, Martin Kletzander wrote:
 On Tue, Mar 04, 2014 at 10:38:29AM +0100, Peter Krempa wrote:
 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.
 ---
 
 ACK
 
 Martin
 

Pushed; Thanks.

Peter




signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list