Implied by QEMU >= 1.2.0.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 19 +++++--------------
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 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +-
[ ... etc ... ]
tests/qemuxml2argvdata/watchdog.args | 2 +-
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +-
tests/qemuxml2argvtest.c | 11 +++--------
632 files changed, 612 insertions(+), 652 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6af3cc9d61..c46e99362d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3629,7 +3629,6 @@ static qemuMonitorCallbacks callbacks = {
static void
virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_SHARE_POLICY);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index f1a55c421d..743f37aca3 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -203,7 +203,7 @@ typedef enum {
/* 110 */
QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */
- QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */
+ X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */
QEMU_CAPS_SEAMLESS_MIGRATION, /* seamless-migration for SPICE */
QEMU_CAPS_BLOCK_COMMIT, /* block-commit */
QEMU_CAPS_VNC, /* Is -vnc available? */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e6c70f84bf..5bd129c72a 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7050,21 +7050,12 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
virTristateSwitchTypeToString(smm));
}
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) {
- if (def->mem.dump_core) {
- virBufferAsprintf(&buf, ",dump-guest-core=%s",
- virTristateSwitchTypeToString(def->mem.dump_core));
- } else {
- virBufferAsprintf(&buf, ",dump-guest-core=%s",
- cfg->dumpGuestCore ? "on" : "off");
- }
+ if (def->mem.dump_core) {
+ virBufferAsprintf(&buf, ",dump-guest-core=%s",
+ virTristateSwitchTypeToString(def->mem.dump_core));
} else {
- if (def->mem.dump_core) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("dump-guest-core is not available "
- "with this QEMU binary"));
- goto cleanup;
- }
+ virBufferAsprintf(&buf, ",dump-guest-core=%s",
+ cfg->dumpGuestCore ? "on" : "off");
}
if (def->mem.nosharepages) {
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index efe137cb11..779f5032b1 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index a32e1adfdb..a2076c7a5a 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index ff7caea2a0..f57088701b 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 6d3623bbd4..8d8636655f 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index ea6688fffa..0a6205b408 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -36,7 +36,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index bd2e845f40..af45fc2f4c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -35,7 +35,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index a97e856614..06544e673c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -21,7 +21,6 @@
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index f563a69b8d..09f5e31415 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 662b4905f2..8d97bee25a 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -21,7 +21,6 @@
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index c9b363c1b1..c001bc935a 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -36,7 +36,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index e98b4fef0a..e902ccb865 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -35,7 +35,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 6fa93d9bc8..2098743ade 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -21,7 +21,6 @@
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index c4774482f7..1e460fdd6b 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -46,7 +46,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 0a7346721b..ee1bdfaa0c 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 5484a39952..28689bb766 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 88f6087f35..89022c2400 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -38,7 +38,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index a87fa6b921..e07951b126 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -35,7 +35,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 9a50253bb0..b83cff9192 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 86af6a52d2..b03ef2709e 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -21,7 +21,6 @@
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 42532805a1..e9944e63c8 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 4eacbfe168..c2e12ce323 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -21,7 +21,6 @@
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 89e0d453a9..07b8c7b9f2 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 40b0b4b6ae..5873af49dd 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -35,7 +35,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index a9a739f956..c5560a62a7 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -21,7 +21,6 @@
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 3a5c611c0e..f0525971f1 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -48,7 +48,6 @@
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='reboot-timeout'/>
- <flag name='dump-guest-core'/>
<flag name='seamless-migration'/>
<flag name='block-commit'/>
<flag name='vnc'/>
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 6a25e53175..ba4cadbac7 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt,accel=tcg \
+-machine virt,accel=tcg,dump-guest-core=off \
-cpu cortex-a53 \
-m 1024 \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index 0b6156a97f..c7b192d384 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg \
+-machine virt,accel=tcg,dump-guest-core=off \
-cpu cortex-a57 \
-drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\
readonly=on \
[ ... etc ... ]
diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index 21b763e6b1..c8048c2e96 100644
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
--machine pc,accel=tcg \
+-machine pc,accel=tcg,dump-guest-core=off \
-m 214 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index 63c5a4270e..d7674e6b48 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name kvm \
-S \
--machine pc,accel=kvm \
+-machine pc,accel=kvm,dump-guest-core=off \
-cpu qemu32 \
-m 4096 \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 670cd92b8f..78d9e10d0f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -732,16 +732,11 @@ mymain(void)
DO_TEST("minimal-msg-timestamp", QEMU_CAPS_MSG_TIMESTAMP);
DO_TEST("machine-aliases1", NONE);
DO_TEST("machine-aliases2", QEMU_CAPS_KVM);
- DO_TEST("machine-core-on",
- QEMU_CAPS_DUMP_GUEST_CORE);
+ DO_TEST("machine-core-on", NONE);
driver.config->dumpGuestCore = true;
- DO_TEST("machine-core-off",
- QEMU_CAPS_DUMP_GUEST_CORE);
+ DO_TEST("machine-core-off", NONE);
driver.config->dumpGuestCore = false;
- DO_TEST("machine-core-cfg-off",
- QEMU_CAPS_DUMP_GUEST_CORE);
- DO_TEST_FAILURE("machine-core-on", NONE);
- DO_TEST_FAILURE("machine-core-on", NONE);
+ DO_TEST("machine-core-cfg-off", NONE);
DO_TEST("machine-smm-opt",
QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCI_BRIDGE,
--
2.16.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-listOn Mon, 2018-04-09 at 17:27 +0200, Ján Tomko wrote:
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 670cd92b8f..78d9e10d0f 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -732,16 +732,11 @@ mymain(void)
> DO_TEST("minimal-msg-timestamp", QEMU_CAPS_MSG_TIMESTAMP);
> DO_TEST("machine-aliases1", NONE);
> DO_TEST("machine-aliases2", QEMU_CAPS_KVM);
> - DO_TEST("machine-core-on",
> - QEMU_CAPS_DUMP_GUEST_CORE);
> + DO_TEST("machine-core-on", NONE);
> driver.config->dumpGuestCore = true;
> - DO_TEST("machine-core-off",
> - QEMU_CAPS_DUMP_GUEST_CORE);
> + DO_TEST("machine-core-off", NONE);
> driver.config->dumpGuestCore = false;
> - DO_TEST("machine-core-cfg-off",
> - QEMU_CAPS_DUMP_GUEST_CORE);
> - DO_TEST_FAILURE("machine-core-on", NONE);
> - DO_TEST_FAILURE("machine-core-on", NONE);
> + DO_TEST("machine-core-cfg-off", NONE);
Pretty much the entire test suite is providing coverage for this
last one now, so just drop it.
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Implied by QEMU >= 1.2.0.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
src/qemu/qemu_capabilities.c | 12 ------------
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 8 ++------
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 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +-
tests/qemuxml2argvdata/watchdog-injectnmi.args | 2 +-
[ ... ]
tests/qemuxml2argvdata/watchdog.args | 2 +-
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +-
tests/qemuxml2argvtest.c | 3 +--
tests/qemuxml2xmltest.c | 3 +--
597 files changed, 572 insertions(+), 615 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8c77449bde..59456b2d5d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3623,16 +3623,6 @@ static qemuMonitorCallbacks callbacks = {
};
-/* Capabilities that we assume are always enabled
- * for QEMU >= 1.2.0
- */
-static void
-virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
-{
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY);
-}
-
-
/**
* virQEMUCapsInitQMPArch:
* @qemuCaps: QEMU capabilities
@@ -3762,8 +3752,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
qemuCaps->package = package;
qemuCaps->usedQMP = true;
- virQEMUCapsInitQMPBasic(qemuCaps);
-
if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0)
goto cleanup;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5a19494659..594cc19213 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -371,7 +371,7 @@ typedef enum {
QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */
/* 230 */
- QEMU_CAPS_DISPLAY, /* -display */
+ X_QEMU_CAPS_DISPLAY, /* -display */
QEMU_CAPS_DEVICE_INTEL_IOMMU, /* -device intel-iommu */
QEMU_CAPS_MACHINE_SMM_OPT, /* -machine xxx,smm=on/off/auto */
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, /* virtio-*pci.disable-legacy */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4376ab95ec..7061089b03 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9797,12 +9797,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
* these defaults ourselves...
*/
if (!def->ngraphics) {
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY)) {
- virCommandAddArg(cmd, "-display");
- virCommandAddArg(cmd, "none");
- } else {
- virCommandAddArg(cmd, "-nographic");
- }
+ virCommandAddArg(cmd, "-display");
+ virCommandAddArg(cmd, "none");
if (cfg->nogfxAllowHostAudio)
virCommandAddEnvPassBlockSUID(cmd, "QEMU_AUDIO_DRV", NULL);
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 376731e034..f49df85865 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -103,7 +103,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
- <flag name='display'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index a42f9d1d14..f9e2959b99 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -108,7 +108,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
- <flag name='display'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index cdae63e399..e8eaa7939b 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -110,7 +110,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
- <flag name='display'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 1f79a696cf..7892381f34 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -125,7 +125,6 @@
<flag name='nec-usb-xhci-ports'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
- <flag name='display'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='query-named-block-nodes'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 0f4c00150a..cb60f7a3b5 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -118,7 +118,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index ba37abffb6..9704f84457 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -113,7 +113,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 032c556923..dc85732b25 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -82,7 +82,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 708bc5de63..449cfcf05a 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 8a94479032..0bc5479264 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -82,7 +82,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index edd3b4a623..46d6ab2ffa 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -118,7 +118,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 7cd37e9ff1..c0870d28b1 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -113,7 +113,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 12e1e68152..f7fe6646c4 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -82,7 +82,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index a9d9e713fe..9e148915cb 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -148,7 +148,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 2ff2906ccc..794ea38af4 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -141,7 +141,6 @@
<flag name='qxl.max_outputs'/>
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='machine-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 79e6df0b5c..8962aec411 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -146,7 +146,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='machine-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index c74931de44..687b5b9844 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -122,7 +122,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='drive-iotune-max-length'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 51d2d84e04..2bfb0ae493 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -115,7 +115,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='virtio-vga'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 9d8b547a6f..ac97bb5c3d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='machine-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index e53336e2b5..97bc0bc25a 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -84,7 +84,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 6c9011e490..b66da6c78a 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index aba71b42b1..7f574e7f89 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -84,7 +84,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index a8343b9197..7fb3e9a819 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 42e7c1c27c..791019e3d6 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -112,7 +112,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 218f8fcf8f..66eb5f9ced 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -82,7 +82,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index a7facf9552..2397a19987 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index ba4cadbac7..4ef4490f33 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-m 1024 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
--nographic \
+-display none \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,\
[ ... etc ... ]
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index d7674e6b48..3cf06f370a 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-m 4096 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
--nographic \
+-display none \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,server,\
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b4a36d7de7..b6b0b61ee5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1109,8 +1109,7 @@ mymain(void)
DO_TEST("graphics-sdl-fullscreen",
QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST("nographics", NONE);
- DO_TEST("nographics-display",
- QEMU_CAPS_DISPLAY);
+ DO_TEST("nographics-display", NONE);
DO_TEST("nographics-vga", NONE);
DO_TEST("graphics-spice",
QEMU_CAPS_SPICE,
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index ac01288cf0..ec107415b3 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -425,8 +425,7 @@ mymain(void)
DO_TEST("graphics-spice-auto-socket-cfg", NONE);
cfg->spiceAutoUnixSocket = false;
- DO_TEST("nographics-vga",
- QEMU_CAPS_DISPLAY);
+ DO_TEST("nographics-vga", NONE);
DO_TEST("input-usbmouse", NONE);
DO_TEST("input-usbtablet", NONE);
DO_TEST("misc-acpi", NONE);
--
2.16.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-listOn Mon, 2018-04-09 at 17:27 +0200, Ján Tomko wrote:
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index b4a36d7de7..b6b0b61ee5 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -1109,8 +1109,7 @@ mymain(void)
> DO_TEST("graphics-sdl-fullscreen",
> QEMU_CAPS_DEVICE_CIRRUS_VGA);
> DO_TEST("nographics", NONE);
> - DO_TEST("nographics-display",
> - QEMU_CAPS_DISPLAY);
> + DO_TEST("nographics-display", NONE);
> DO_TEST("nographics-vga", NONE);
None of these three seems to be testing anything, really. At least
not anymore. I'd just get rid of them.
> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
> index ac01288cf0..ec107415b3 100644
> --- a/tests/qemuxml2xmltest.c
> +++ b/tests/qemuxml2xmltest.c
> @@ -425,8 +425,7 @@ mymain(void)
> DO_TEST("graphics-spice-auto-socket-cfg", NONE);
> cfg->spiceAutoUnixSocket = false;
>
> - DO_TEST("nographics-vga",
> - QEMU_CAPS_DISPLAY);
> + DO_TEST("nographics-vga", NONE);
Same here, of course.
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Implied by QEMU >= 1.3.0.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
src/qemu/qemu_capabilities.c | 4 ----
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 3 +--
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 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +-
[ ... ]
tests/qemuxml2argvdata/watchdog-injectnmi.args | 2 +-
tests/qemuxml2argvdata/watchdog.args | 2 +-
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +-
tests/qemuxml2argvtest.c | 3 +--
634 files changed, 613 insertions(+), 639 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 59456b2d5d..721b1361c1 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3757,10 +3757,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
virQEMUCapsInitQMPBasicArch(qemuCaps);
- /* USB option is supported v1.3.0 onwards */
- if (qemuCaps->version >= 1003000)
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT);
-
/* WebSockets were introduced between 1.3.0 and 1.3.1 */
if (qemuCaps->version >= 1003001)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 594cc19213..9476985b11 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -239,7 +239,7 @@ typedef enum {
/* 135 */
X_QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */
X_QEMU_CAPS_MACHINE_OPT, /* -machine xxxx*/
- QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */
+ X_QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=on/off */
QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, /* -tpmdev passthrough */
QEMU_CAPS_DEVICE_TPM_TIS, /* -device tpm_tis */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7061089b03..4775d06121 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7016,8 +7016,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
/* To avoid the collision of creating USB controllers when calling
* machine->init in QEMU, it needs to set usb=off
*/
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT))
- virBufferAddLit(&buf, ",usb=off");
+ virBufferAddLit(&buf, ",usb=off");
if (vmport) {
if (!virQEMUCapsSupportsVmport(qemuCaps, def)) {
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index f49df85865..25ad2dff27 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -67,7 +67,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index f9e2959b99..97b74749e1 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index e8eaa7939b..75fcf8ff5f 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 7892381f34..e97d4b920b 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='tpm-passthrough'/>
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index cb60f7a3b5..88616e57f0 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -52,7 +52,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 9704f84457..91f80a277f 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index dc85732b25..c599b66f56 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -34,7 +34,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='virtio-ccw'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 449cfcf05a..9e95b68457 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='tpm-passthrough'/>
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 0bc5479264..cf0648fbfd 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -34,7 +34,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='virtio-ccw'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 46d6ab2ffa..82ed3e6390 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -52,7 +52,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index c0870d28b1..d19f35dbba 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index f7fe6646c4..24220943f2 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -34,7 +34,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='virtio-ccw'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 9e148915cb..f6801ecd5a 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -66,7 +66,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='tpm-passthrough'/>
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 794ea38af4..f6556ee3dd 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='tpm-passthrough'/>
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 8962aec411..fc3d9d757d 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='tpm-passthrough'/>
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index 687b5b9844..b1bb3e7bd2 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -54,7 +54,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 2bfb0ae493..f3611e1922 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index ac97bb5c3d..0e48180275 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='tpm-passthrough'/>
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 97bc0bc25a..a585af453c 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -34,7 +34,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='virtio-ccw'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index b66da6c78a..55c121c596 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='tpm-passthrough'/>
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 7f574e7f89..1ac60bb403 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -34,7 +34,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='virtio-ccw'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 7fb3e9a819..831a768977 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='tpm-passthrough'/>
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 791019e3d6..4998edf7a0 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -50,7 +50,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 66eb5f9ced..d29994bbfd 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -34,7 +34,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='virtio-ccw'/>
- <flag name='machine-usb-opt'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
<flag name='vfio-pci.bootindex'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 2397a19987..d813a96a13 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -68,7 +68,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='megasas'/>
- <flag name='machine-usb-opt'/>
<flag name='tpm-passthrough'/>
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 4ef4490f33..d7a891c83c 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name aarch64test \
-S \
--machine virt,accel=tcg,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off \
-cpu cortex-a53 \
-m 1024 \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index 2ad4c2e76a..8aefc7d44a 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest \
-S \
--machine virt,accel=tcg,dump-guest-core=off \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off \
-cpu cortex-a57 \
-drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\
readonly=on \
[ ... etc ... ]
diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index 5fd89bd6d7..3e0bd59889 100644
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
--machine pc,accel=tcg,dump-guest-core=off \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-m 214 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index 3cf06f370a..7f9ad338fb 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name kvm \
-S \
--machine pc,accel=kvm,dump-guest-core=off \
+-machine pc,accel=kvm,usb=off,dump-guest-core=off \
-cpu qemu32 \
-m 4096 \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b6b0b61ee5..aeb3ebd185 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -744,8 +744,7 @@ mymain(void)
QEMU_CAPS_ICH9_AHCI,
QEMU_CAPS_MACHINE_SMM_OPT,
QEMU_CAPS_VIRTIO_SCSI);
- DO_TEST("machine-usb-opt",
- QEMU_CAPS_MACHINE_USB_OPT);
+ DO_TEST("machine-usb-opt", NONE);
DO_TEST("machine-vmport-opt",
QEMU_CAPS_MACHINE_VMPORT_OPT);
DO_TEST("kvm", NONE);
--
2.16.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-listOn Mon, 2018-04-09 at 17:27 +0200, Ján Tomko wrote:
[...]
> /* WebSockets were introduced between 1.3.0 and 1.3.1 */
> if (qemuCaps->version >= 1003001)
> virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET);
Does this mean I should get ready for another one of these? O:-)
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index b6b0b61ee5..aeb3ebd185 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -744,8 +744,7 @@ mymain(void)
> QEMU_CAPS_ICH9_AHCI,
> QEMU_CAPS_MACHINE_SMM_OPT,
> QEMU_CAPS_VIRTIO_SCSI);
> - DO_TEST("machine-usb-opt",
> - QEMU_CAPS_MACHINE_USB_OPT);
> + DO_TEST("machine-usb-opt", NONE);
No longer useful. Begone!
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
© 2016 - 2025 Red Hat, Inc.