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

Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- 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