From: Anthony Liguori Date: Mon, 15 Apr 2013 12:49:21 +0000 (-0500) Subject: Merge remote-tracking branch 'luiz/queue/qmp' into staging X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~732 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c530b1423b86f1589c49bccb460a75cb87322562;p=qemu-upstream-4.4-testing.git Merge remote-tracking branch 'luiz/queue/qmp' into staging # By Michal Novotny (2) and Eric Blake (1) # Via Luiz Capitulino * luiz/queue/qmp: qapi: use valid JSON in schema Revert "New QMP command query-cpu-max and HMP command cpu_max" New cpu-max field in query-machines QMP command output Message-id: 1365775103-18737-1-git-send-email-lcapitulino@redhat.com Signed-off-by: Anthony Liguori --- c530b1423b86f1589c49bccb460a75cb87322562