]> git.ipfire.org Git - thirdparty/libvirt.git/commit
qemu: simplify use of HAVE_YAJL
authorEric Blake <eblake@redhat.com>
Thu, 20 Oct 2011 20:36:32 +0000 (14:36 -0600)
committerEric Blake <eblake@redhat.com>
Wed, 26 Oct 2011 17:55:39 +0000 (11:55 -0600)
commit6889f33e8b6786d58faea75d87ae56937580cdd5
tree6d8268c482018f2bfbb8d1bc27d2660bedebc71e
parentcfa61a950aa35650cfa44257e1423e58b7e8c13d
qemu: simplify use of HAVE_YAJL

Rather than making all clients of monitor commands that are JSON-only
check whether yajl support was compiled in, it is simpler to just
avoid setting the capability bit up front if we can't use the capability.

* src/qemu/qemu_capabilities.c (qemuCapsComputeCmdFlags): Only set
capability bit if we also have yajl library to use it.
* src/qemu/qemu_driver.c (qemuDomainReboot): Drop #ifdefs.
* src/qemu/qemu_process.c (qemuProcessStart): Likewise.
* tests/qemuhelptest.c (testHelpStrParsing): Pass test even
without yajl.
* tests/qemuxml2argvtest.c (mymain): Simplify use of json flag.
* tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-*.args:
Update expected results to match.
src/qemu/qemu_capabilities.c
src/qemu/qemu_driver.c
src/qemu/qemu_process.c
tests/qemuhelptest.c
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args
tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args
tests/qemuxml2argvtest.c