[PATCH 12/48] qemu_capabilities: Stop detecting QEMU_CAPS_DUMP_COMPLETED

All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 13 ------------- 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.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 41 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 17c1e7fefc..c9e4839829 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1231,11 +1231,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { { "rdma-pin-all", QEMU_CAPS_MIGRATE_RDMA }, }; -/* Use virQEMUCapsQMPSchemaQueries for querying parameters of events */ -struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { - { "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED }, -}; - struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "hda-duplex", QEMU_CAPS_HDA_DUPLEX }, { "hda-micro", QEMU_CAPS_HDA_MICRO }, @@ -5291,14 +5286,6 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qemuCaps, virQEMUCapsSet(qemuCaps, entry->flag); } - /* probe also for basic event support */ - for (i = 0; i < G_N_ELEMENTS(virQEMUCapsEvents); i++) { - entry = virQEMUCapsEvents + i; - - if (virQEMUQAPISchemaPathExists(entry->value, schema)) - virQEMUCapsSet(qemuCaps, entry->flag); - } - return 0; } diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 5dae49b184..119d259bb9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -84,7 +84,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 5f2f420acc..ee09c8eacc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -82,7 +82,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index ee638dd994..d46ab3ae73 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -48,7 +48,6 @@ <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='virtio-gpu-ccw'/> <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index d8a44a3cf5..0e16046efc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -113,7 +113,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 8ac3bdb5a4..e2cd3367ad 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -86,7 +86,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index a50ffc27f4..c58cff3f51 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -84,7 +84,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index c0f4c1e872..4f10008ffe 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -83,7 +83,6 @@ <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 340e773acc..d53b63ad6c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -113,7 +113,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 9400ea543a..15b87106c6 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -23,7 +23,6 @@ <flag name='chardev-reconnect'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index e07e9bfdd3..3a758c008f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -112,7 +112,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index e7776bb370..f197f42e6b 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -85,7 +85,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 821180ea17..b23662fe31 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -82,7 +82,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 5543f34b41..0b00653aa4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -81,7 +81,6 @@ <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 6a4449a70c..cb4bca34a7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -46,7 +46,6 @@ <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='virtio-gpu-ccw'/> <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 40ab95425b..7647cc842f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -112,7 +112,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 74ff39d36a..4974ac67b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -86,7 +86,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index c56c47e1a2..8295b69d50 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -46,7 +46,6 @@ <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='virtio-gpu-ccw'/> <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index b01ffe84d6..a2a77735ba 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -111,7 +111,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 6a706201c7..caca79d93b 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index f9667a6d3c..7d71c820b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -93,7 +93,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index c632b7daa4..86f262d727 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -82,7 +82,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 4b538787cb..04a0617883 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 6117b4d840..1d70e827ba 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -93,7 +93,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index dedac9c0df..a2810cb3a8 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -88,7 +88,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 2f060a1a51..eef749e7a2 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index b7e8cf44df..7dd04c5c90 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -87,7 +87,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 3cf16a58b0..8f45f61f3a 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 3a8b677f76..d8c00b3496 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> -- 2.37.4