[libvirt PATCH 2/6] qemu: retire QEMU_CAPS_DUMP_GUEST_MEMORY

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - 28 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f7986ef938..d1d740d0b2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -196,7 +196,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "ide-cd", /* X_QEMU_CAPS_IDE_CD */ "no-user-config", /* X_QEMU_CAPS_NO_USER_CONFIG */ "hda-micro", /* QEMU_CAPS_HDA_MICRO */ - "dump-guest-memory", /* QEMU_CAPS_DUMP_GUEST_MEMORY */ + "dump-guest-memory", /* X_QEMU_CAPS_DUMP_GUEST_MEMORY */ /* 95 */ "nec-usb-xhci", /* QEMU_CAPS_NEC_USB_XHCI */ @@ -1205,7 +1205,6 @@ struct virQEMUCapsStringFlags { struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { - { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, { "query-spice", QEMU_CAPS_SPICE }, { "query-vnc", QEMU_CAPS_VNC }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cccb3659aa..440561d496 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -174,7 +174,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_IDE_CD, /* -device ide-cd */ X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ QEMU_CAPS_HDA_MICRO, /* -device hda-micro */ - QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */ + X_QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */ /* 95 */ QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index de3ef449fe..5e95d09e10 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 173023c704..85a89af2ac 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -18,7 +18,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 141d82857f..69fe7d3447 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 04c3b206f7..35bdba931d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -24,7 +24,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 9d876a3408..58a65d247a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index b1353f23eb..a22bff9f1e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -18,7 +18,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 92e51a478a..6d537abbdd 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -21,7 +21,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 70843813bc..e35ba8111f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -24,7 +24,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 7c2a77e7c5..dabf2f505f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -8,7 +8,6 @@ <flag name='usb-redir'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='dump-guest-memory'/> <flag name='usb-redir.filter'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index c427737724..f16ed680df 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -24,7 +24,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index b3099f138a..e48bf28996 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -19,7 +19,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index cab644c543..9dc12389f0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -18,7 +18,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 5b86d9bfc6..bb5c298277 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -21,7 +21,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index e491de1c71..ac861cf914 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 5fe99a7e79..84dab41317 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -24,7 +24,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 5a43616888..1c4825330b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -18,7 +18,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index a6fcfed213..8210fe7406 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -9,7 +9,6 @@ <flag name='virtio-blk-pci.scsi'/> <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> - <flag name='dump-guest-memory'/> <flag name='virtio-scsi-pci'/> <flag name='blockio'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index b96c8c2d2b..9a43c0dc60 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -23,7 +23,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 35bd9b6327..6c657f6f16 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -23,7 +23,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 663b94b1ff..b4a9a12d6e 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 2468780a51..3d18388695 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -17,7 +17,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index e3f9ee47bd..09f012875d 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -23,7 +23,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 5ca77807ef..c3a626f3b1 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index cd41a08fa9..df835b8fa5 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -21,7 +21,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 86fe88b878..f444d70827 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -23,7 +23,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 7f17b2360a..6c8b54b3cc 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -23,7 +23,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> -- 2.37.1