On 09/28/2012 08:58 AM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange@redhat.com>
Some architectures provide the query-cpu-definitions command, but are set to always return a "GenericError" from it :-( Catch this & treat it as if there was an empty list of CPUs returned
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 12 ++++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-)
ACK.
+++ b/src/qemu/qemu_capabilities.c @@ -2240,7 +2240,7 @@ qemuCapsInitQMP(qemuCapsPtr caps) VIR_DEBUG("Got version %d.%d.%d (%s)", major, minor, micro, NULLSTR(package));
- if (!(major >= 1 && minor >= 1 && micro >= 90)) { + if (!(major >= 1 || (major == 1 && minor >= 1))) { VIR_DEBUG("Not new enough for QMP capabilities detection"); ret = 0; goto cleanup;
This needs to be squashed into 3/4.
+++ b/src/qemu/qemu_monitor.c @@ -843,7 +843,6 @@ void qemuMonitorClose(qemuMonitorPtr mon) mon->watch = 0; } VIR_FORCE_CLOSE(mon->fd); - fprintf(stderr, "Closing monitr\n"); }
This needs to be squashed into 2/4. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org