On 01/26/2012 08:17 AM, Daniel P. Berrange wrote:
On Wed, Jan 25, 2012 at 10:29:19PM -0700, Eric Blake wrote:
> The qemu developers have made it clear that modern qemu will no
> longer guarantee human monitor command stability; furthermore,
> some features, such as async events, are only supported via qmp.
> If we are compiled without support for handling JSON, we cannot
> expect to sanely interact with modern qemu.
>
> However, things must continue to build on RHEL 5, where qemu
> is stuck at 0.10, and where yajl is not available.
>
> Another benefit of this patch: future additions of new monitor
> commands need only focus on qemu_monitor_json.c, instead of
> also wasting time with qemu_monitor_text.c.
>
> * src/qemu/qemu_capabilities.c (qemuCapsComputeCmdFlags): Report
> error if yajl is missing but qemu requires qmp.
> (qemuCapsParseHelpStr): Propagate error.
> (qemuCapsExtractVersionInfo): Update caller.
> * tests/qemuhelptest.c (testHelpStrParsing): Likewise.
> ---
>
> Tested on Fedora 16, RHEL 6.2, and RHEL 5.8.
>
> src/qemu/qemu_capabilities.c | 33 ++++++++++++++++++++++++++++-----
> src/qemu/qemu_capabilities.h | 3 ++-
> tests/qemuhelptest.c | 2 +-
> 3 files changed, 31 insertions(+), 7 deletions(-)
ACK
Thanks; pushed.
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org