On 06/22/2015 09:05 AM, Michal Privoznik wrote:
On 22.06.2015 15:52, Eric Blake wrote:
On 06/20/2015 01:42 PM, Eric Blake wrote:
Rather than grabbing an arbitrary JSON value and then checking if it has the right type, we might as well request the correct type to begin with.
Signed-off-by: Eric Blake <eblake@redhat.com> --- src/qemu/qemu_monitor_json.c | 164 ++++++++++++++++--------------------------- 1 file changed, 61 insertions(+), 103 deletions(-)
@@ -271,7 +269,7 @@ qemuMonitorJSONCommandWithFd(qemuMonitorPtr mon,
memset(&msg, 0, sizeof(msg));
- exe = virJSONValueObjectGet(cmd, "execute"); + exe = virJSONValueObjectGetObject(cmd, "execute"); if (exe) { if (!(id = qemuMonitorNextCommandID(mon))) goto cleanup;
This hunk is spurious (the 'execute' member is a string, not an object); I've removed it locally from my tree.
Agreed. ACK to all the patches then.
Thanks; pushed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org