diff options
| author |   Eric Blake <eblake@redhat.com> | 2012-01-25 21:57:38 -0700 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-01-27 08:45:50 -0700 |
| commit | 6e769ebadb44a034e80aefc3c5fa35092d623069 (patch) | |
| tree | 8ee6c116c45d1751c505d7385624a501194f0a61 /tests/qemuhelptest.c | |
| parent | qemu: support qmp on RHEL/CentOS qemu (diff) | |
| download | libvirt-6e769ebadb44a034e80aefc3c5fa35092d623069.tar.gz libvirt-6e769ebadb44a034e80aefc3c5fa35092d623069.tar.bz2 libvirt-6e769ebadb44a034e80aefc3c5fa35092d623069.zip | |
qemu: require qmp on new enough qemu
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.
Diffstat (limited to 'tests/qemuhelptest.c')
| -rw-r--r-- | tests/qemuhelptest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 5ad55bc73..370cd0ddc 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -53,7 +53,7 @@ static int testHelpStrParsing(const void *data) goto cleanup; if (qemuCapsParseHelpStr("QEMU", help, flags, - &version, &is_kvm, &kvm_version) == -1) + &version, &is_kvm, &kvm_version, false) == -1) goto cleanup; # ifndef HAVE_YAJL |