qemu: retire QEMU_CAPS_Q35_PCI_HOLE64_SIZE

We no longer use it.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a771a30d606d40b6b55e7e5b4a3789fd4a910c9a..01fce36399fadba626140532af85632904ab4109 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -278,7 +278,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               /* 150 */
               "dmi-to-pci-bridge", /* QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE */
               "i440fx-pci-hole64-size", /* X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE */
-              "q35-pci-hole64-size", /* QEMU_CAPS_Q35_PCI_HOLE64_SIZE */
+              "q35-pci-hole64-size", /* X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE */
               "usb-storage", /* QEMU_CAPS_DEVICE_USB_STORAGE */
               "usb-storage.removable", /* QEMU_CAPS_USB_STORAGE_REMOVABLE */
 
@@ -1504,7 +1504,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsI440FXPCIHost[]
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsQ35PCIHost[] = {
-    { "pci-hole64-size", QEMU_CAPS_Q35_PCI_HOLE64_SIZE, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 885f3208d9028268eb8b65c7c9ab970dc0252ad4..8e777297f69b112848da44327e5e83cfcebc1963 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -256,7 +256,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     /* 150 */
     QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */
     X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */
-    QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */
+    X_QEMU_CAPS_Q35_PCI_HOLE64_SIZE, /* q35-pcihost.pci-hole64-size */
     QEMU_CAPS_DEVICE_USB_STORAGE, /* -device usb-storage */
     QEMU_CAPS_USB_STORAGE_REMOVABLE, /* usb-storage.removable */
 

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index b73180bb3ea1c3ef57dddf958a580a2da8bd35d0..0cce31600d527505ef80268cdbf9930b57f26aad 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
-  <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index aa3d5284baa46a0ce184eb98339c82cef51bbf76..e41f083b8b5b12f596f142779d3d3e538215948d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
-  <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 986fe82f67169738e7ffddd46088b3bc5e26386f..62b680d0440170c58412b8073d751c57518f724f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
-  <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 468b68b83ca53fae92cee073b0e6259cd80df4ef..c97ba19b329c2b70b09d4885cb98f9126056af9b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
-  <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index ec480a31c78069cae3e44df75633a1068c3b874a..d5075e550dc76495fc551aac82e2be8aff2790d2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -49,7 +49,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
-  <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index db6cf821feb47a47a3290d299e2d60796d513e8f..7a54069b3d7175334e0606fbaeef4e5592a667e9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -49,7 +49,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
-  <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index cb88b803331223c081cdf43fa4577369096e8897..8d62f989f3714c9d1abd13fe825baababbb5a1d3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -49,7 +49,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
-  <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 1465d0f3a42e214136bbe4656aeeefb2dcc1a2e8..a1a2d65c893e4aaaf4240083bf9af694e7fc82fe 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -49,7 +49,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
-  <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 51b3b5943cc5d38af708d1af3b527ad6a9a89105..a7a3bd7f4a555a36dc6d8c88a63a1cf9061c0cee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -49,7 +49,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='dmi-to-pci-bridge'/>
-  <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>