We require QEMU >= 0.15.0, assume every QEMU supports it.
Sadly that does not let us trivially drop qemuMonitor's
priv->monJSON bool, because of qemuDomainQemuAttach.
Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 6 +-----
src/qemu/qemu_driver.c | 18 +++++++-----------
src/qemu/qemu_process.c | 2 +-
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 2 +-
[ ... etc ... ]
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +-
tests/qemuxml2argvtest.c | 14 ++++----------
633 files changed, 616 insertions(+), 656 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f6f9ca9d68..52142d4029 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3637,7 +3637,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MEM_PATH);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index a08506b584..deb6261e0a 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -80,7 +80,7 @@ typedef enum {
X_QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */
X_QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */
QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */
- QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */
+ X_QEMU_CAPS_MONITOR_JSON, /* JSON mode for monitor */
/* 25 */
X_QEMU_CAPS_BALLOON, /* -balloon available */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4e8c4a7bd4..73b5ad244b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1654,15 +1654,11 @@ qemuBuildDiskThrottling(virDomainDiskDefPtr disk,
static void
qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDefPtr disk,
- virQEMUCapsPtr qemuCaps,
virBufferPtr buf)
{
const char *wpolicy = NULL;
const char *rpolicy = NULL;
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON))
- return;
-
if (disk->error_policy)
wpolicy = virDomainDiskErrorPolicyTypeToString(disk->error_policy);
@@ -1712,7 +1708,7 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk,
virBufferEscape(buf, '\\', " ", "%s", disk->serial);
}
- qemuBuildDiskFrontendAttributeErrorPolicy(disk, qemuCaps, buf);
+ qemuBuildDiskFrontendAttributeErrorPolicy(disk, buf);
}
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 5c31dfdd58..fd08817469 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2123,19 +2123,15 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
if ((!useAgent) ||
(ret < 0 && (acpiRequested || !flags))) {
#if WITH_YAJL
- if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) {
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("ACPI reboot is not supported with this QEMU binary"));
- goto endjob;
- }
- } else {
-#endif
- virReportError(VIR_ERR_OPERATION_INVALID, "%s",
- _("ACPI reboot is not supported without the JSON monitor"));
+ if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("ACPI reboot is not supported with this QEMU binary"));
goto endjob;
-#if WITH_YAJL
}
+#else
+ virReportError(VIR_ERR_OPERATION_INVALID, "%s",
+ _("ACPI reboot is not supported without the JSON monitor"));
+ goto endjob;
#endif
qemuDomainSetFakeReboot(driver, vm, isReboot);
qemuDomainObjEnterMonitor(driver, vm);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 4552ed2ecd..c6cfd05216 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5718,7 +5718,7 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver,
if (qemuProcessPrepareMonitorChr(priv->monConfig, priv->libDir) < 0)
goto cleanup;
- priv->monJSON = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON);
+ priv->monJSON = true;
priv->monError = false;
priv->monStart = 0;
priv->gotShutdown = false;
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 983c2f75cb..46b88f218e 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 751c9c005c..47ac2eaf2d 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 792cdf77ca..7b5ac5c4e0 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 4be6ccf189..69c7e22584 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 2eb5291092..33ea40a6ef 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 914e1f2cd6..110b30ebda 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 2adf7f8dfd..d4d51c09de 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 3392e597ba..80d4c44894 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index b4b2f076b2..cea4ede676 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index e5981d4fd3..d7aea0fd49 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 18e843fcf4..45db548cbf 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index a8652dbf6f..51e925d58e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -6,7 +6,6 @@
<flag name='mem-path'/>
<flag name='drive-serial'/>
<flag name='enable-kvm'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index c2af1a3ead..cee117f999 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 39ddfdeba7..b9f3b65e5e 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 8bf11d86b7..c524588d74 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 46c095fd96..59aed9b1f3 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index a69c3e383d..fb1333fecf 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index fcbccb54f4..89d0324676 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index b82d3ebce4..0ce1780f99 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 30bb7d787f..da1b370c14 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index f701835a34..c532e5cee4 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 096bc32f94..9fd8684bbc 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 4e1d10a4da..9fa07c8e74 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 0e82728850..d534e4714c 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 1a39067b91..fa7c4fd65b 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -6,7 +6,6 @@
<flag name='kvm'/>
<flag name='mem-path'/>
<flag name='drive-serial'/>
- <flag name='monitor-json'/>
<flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index f192dd0063..21a3f591df 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-chardev socket,id=charmonitor,\
path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
--mon chardev=charmonitor,id=monitor,mode=readline \
+-mon chardev=charmonitor,id=monitor,mode=control \
-no-acpi \
-boot c \
-kernel /aarch64.kernel \
[ ... etc ... ]
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8ff23f2ba9..c87ff2a87a 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -462,8 +462,7 @@ testCompareXMLToArgv(const void *data)
virSetConnectSecret(conn);
virSetConnectStorage(conn);
- if (virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_MONITOR_JSON))
- flags |= FLAG_JSON;
+ flags |= FLAG_JSON;
if (virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_ENABLE_FIPS))
flags |= FLAG_FIPS;
@@ -957,12 +956,9 @@ mymain(void)
DO_TEST_PARSE_ERROR("disk-drive-shared-qcow", NONE);
DO_TEST("disk-drive-shared-locking",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DISK_SHARE_RW);
- DO_TEST("disk-drive-error-policy-stop",
- QEMU_CAPS_MONITOR_JSON);
- DO_TEST("disk-drive-error-policy-enospace",
- QEMU_CAPS_MONITOR_JSON);
- DO_TEST("disk-drive-error-policy-wreport-rignore",
- QEMU_CAPS_MONITOR_JSON);
+ DO_TEST("disk-drive-error-policy-stop", NONE);
+ DO_TEST("disk-drive-error-policy-enospace", NONE);
+ DO_TEST("disk-drive-error-policy-wreport-rignore", NONE);
DO_TEST("disk-drive-cache-v2-wt", NONE);
DO_TEST("disk-drive-cache-v2-wb", NONE);
DO_TEST("disk-drive-cache-v2-none", NONE);
@@ -1793,10 +1789,8 @@ mymain(void)
QEMU_CAPS_SCSI_LSI);
DO_TEST("monitor-json",
- QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_NODEFCONFIG);
DO_TEST("no-shutdown",
- QEMU_CAPS_MONITOR_JSON,
QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_NO_SHUTDOWN);
--
2.16.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
