[libvirt] [RESEND PATCH 40/44] Deprecate QEMU_CAPS_DUMP_GUEST_CORE

Ján Tomko jtomko at redhat.com
Tue Apr 3 10:17:46 UTC 2018 

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_capabilities.c                          |  1 -
 src/qemu/qemu_capabilities.h                          |  2 +-
 src/qemu/qemu_command.c                               | 19 +++++--------------
 tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml      |  1 -
 tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml      |  1 -
 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/aarch64-cpu-passthrough.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                              | 11 +++--------
 633 files changed, 611 insertions(+), 653 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 245f81986..182d0549e 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3627,7 +3627,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 74f02ff3f..a55ed2e68 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 b85bad8da..9f1764e40 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7055,21 +7055,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.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index 911e24eb9..b2f1d07d2 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -47,7 +47,6 @@
   <flag name='usb-redir.filter'/>
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
-  <flag name='dump-guest-core'/>
   <flag name='seamless-migration'/>
   <flag name='block-commit'/>
   <flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index 013cc78eb..b0d5111b0 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -47,7 +47,6 @@
   <flag name='usb-redir.filter'/>
   <flag name='ide-drive.wwn'/>
   <flag name='scsi-disk.wwn'/>
-  <flag name='dump-guest-core'/>
   <flag name='seamless-migration'/>
   <flag name='block-commit'/>
   <flag name='vnc'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index efe137cb1..779f5032b 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 a32e1adfd..a2076c7a5 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 ff7caea2a..f57088701 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 6d3623bbd..8d8636655 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 11c183ce4..ca44ad2a1 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 34c69fa4d..308e2e9e2 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 cbff80591..aa48542c2 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 d2b68a5b6..25672db06 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 d61ba1453..7351ed5a7 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 646e7440a..b6fa4d798 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 c5a6418f3..63ce8f7e3 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 3cdf9daa1..fddfd6ecb 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 9873f5ee6..8467efac4 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 0a7346721..ee1bdfaa0 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 5484a3995..28689bb76 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 88f6087f3..89022c240 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 a87fa6b92..e07951b12 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 9a50253bb..b83cff919 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 86af6a52d..b03ef2709 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 42532805a..e9944e63c 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 4eacbfe16..c2e12ce32 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 89e0d453a..07b8c7b9f 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 40b0b4b6a..5873af49d 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 a9a739f95..c5560a62a 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 3a5c611c0..f0525971f 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 6a25e5317..ba4cadbac 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 0b6156a97..c7b192d38 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 \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index 29da75e06..42618cf80 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name aarch64test \
 -S \
--machine virt,accel=kvm \
+-machine virt,accel=kvm,dump-guest-core=off \
 -cpu host \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \

[...]

diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args
index c49f5e846..8c4d0ed7c 100644
--- a/tests/qemuxml2argvdata/watchdog-device.args
+++ b/tests/qemuxml2argvdata/watchdog-device.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/watchdog-diag288.args b/tests/qemuxml2argvdata/watchdog-diag288.args
index c3380c89b..2717844c6 100644
--- a/tests/qemuxml2argvdata/watchdog-diag288.args
+++ b/tests/qemuxml2argvdata/watchdog-diag288.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-s390x \
 -name QEMUGuest1 \
 -S \
--machine s390-virtio,accel=tcg \
+-machine s390-virtio,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/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args
index 128710c71..f0d57baa7 100644
--- a/tests/qemuxml2argvdata/watchdog-dump.args
+++ b/tests/qemuxml2argvdata/watchdog-dump.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/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args
index ed05601fc..e7409d519 100644
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.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/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index 21b763e6b..c8048c2e9 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 63c5a4270..d7674e6b4 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 cb1ee9acf..cfc4a305f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -694,16 +694,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

More information about the libvir-list mailing list