qemu: Retire QEMU_CAPS_OBJECT_GPEX

It's no longer used anywhere. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2024-12-22 05:35:25 +00:00 · 2024-01-16 16:36:58 +01:00 · 2024-01-16 16:36:58 +01:00 · e622233eda
commit e622233eda
parent ac48405fa7
25 changed files with 2 additions and 26 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -332,7 +332,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "migration-event", /* X_QEMU_CAPS_MIGRATION_EVENT */

              /* 190 */
-              "gpex-pcihost", /* QEMU_CAPS_OBJECT_GPEX */
+              "gpex-pcihost", /* X_QEMU_CAPS_OBJECT_GPEX */
              "ioh3420", /* QEMU_CAPS_DEVICE_IOH3420 */
              "x3130-upstream", /* QEMU_CAPS_DEVICE_X3130_UPSTREAM */
              "xio3130-downstream", /* QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM */
@ -1275,7 +1275,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
    { "usb-audio", QEMU_CAPS_OBJECT_USB_AUDIO },
    { "pc-dimm", QEMU_CAPS_DEVICE_PC_DIMM },
    { "pci-serial", QEMU_CAPS_DEVICE_PCI_SERIAL },
-    { "gpex-pcihost", QEMU_CAPS_OBJECT_GPEX},
    { "ioh3420", QEMU_CAPS_DEVICE_IOH3420 },
    { "x3130-upstream", QEMU_CAPS_DEVICE_X3130_UPSTREAM },
    { "xio3130-downstream", QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -310,7 +310,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    X_QEMU_CAPS_MIGRATION_EVENT, /* MIGRATION event */

    /* 190 */
-    QEMU_CAPS_OBJECT_GPEX, /* have generic PCI host controller */
+    X_QEMU_CAPS_OBJECT_GPEX, /* have generic PCI host controller */
    QEMU_CAPS_DEVICE_IOH3420, /* -device ioh3420 */
    QEMU_CAPS_DEVICE_X3130_UPSTREAM, /* -device x3130-upstream */
    QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, /* -device xio3130-downstream */
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
@ -45,7 +45,6 @@
  <flag name='vmware-svga.vgamem_mb'/>
  <flag name='pc-dimm'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
@ -47,7 +47,6 @@
  <flag name='vmware-svga.vgamem_mb'/>
  <flag name='pc-dimm'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
@ -48,7 +48,6 @@
  <flag name='VGA.vgamem_mb'/>
  <flag name='vmware-svga.vgamem_mb'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@ -46,7 +46,6 @@
  <flag name='vmware-svga.vgamem_mb'/>
  <flag name='pc-dimm'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@ -47,7 +47,6 @@
  <flag name='VGA.vgamem_mb'/>
  <flag name='vmware-svga.vgamem_mb'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@ -57,7 +57,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@ -45,7 +45,6 @@
  <flag name='vmware-svga.vgamem_mb'/>
  <flag name='pc-dimm'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@ -50,7 +50,6 @@
  <flag name='vmware-svga.vgamem_mb'/>
  <flag name='pc-dimm'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@ -49,7 +49,6 @@
  <flag name='vmware-svga.vgamem_mb'/>
  <flag name='pc-dimm'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@ -50,7 +50,6 @@
  <flag name='vmware-svga.vgamem_mb'/>
  <flag name='pc-dimm'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@ -55,7 +55,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@ -41,7 +41,6 @@
  <flag name='migrate-rdma'/>
  <flag name='VGA.vgamem_mb'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@ -45,7 +45,6 @@
  <flag name='VGA.vgamem_mb'/>
  <flag name='pc-dimm'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@ -56,7 +56,6 @@
  <flag name='pc-dimm'/>
  <flag name='machine-vmport-opt'/>
  <flag name='pci-serial'/>
-  <flag name='gpex-pcihost'/>
  <flag name='ioh3420'/>
  <flag name='x3130-upstream'/>
  <flag name='xio3130-downstream'/>