On Thu, May 10, 2018 at 18:44:22 +0200, Ján Tomko wrote:
---
src/qemu/qemu_driver.c | 2 +-
tests/Makefile.am | 10 +++++-----
tests/cputest.c | 16 ++++++++--------
tests/libxlxml2domconfigtest.c | 4 ++--
tests/qemuagenttest.c | 2 +-
tests/qemucapabilitiestest.c | 2 +-
tests/qemucaps2xmltest.c | 2 +-
tests/qemucommandutiltest.c | 2 +-
tests/qemuhotplugtest.c | 2 +-
tests/qemumigparamstest.c | 2 +-
tests/qemumonitorjsontest.c | 2 +-
tests/virmocklibxl.c | 4 ++--
tests/virnetdaemontest.c | 2 +-
tests/virstoragetest.c | 4 ++--
14 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c129321a5c..f25dbb8e64 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2112,7 +2112,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
*/
if ((!useAgent) ||
(ret < 0 && (acpiRequested || !flags))) {
-#if !WITH_YAJL
+#if !WITH_JANSSON
Shouldn't we replace all of these with a new macro "WITH_JSON" which
will be library agnostic? So that we don't have to replace it the next
time?
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("ACPI reboot is not supported without the JSON
monitor"));
goto endjob;