qemu: Retire QEMU_CAPS_I440FX_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 d1d740d0b2d11da65d0b57887c447e1e7d93432e..a771a30d606d40b6b55e7e5b4a3789fd4a910c9a 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -277,7 +277,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
 
               /* 150 */
               "dmi-to-pci-bridge", /* QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE */
-              "i440fx-pci-hole64-size", /* QEMU_CAPS_I440FX_PCI_HOLE64_SIZE */
+              "i440fx-pci-hole64-size", /* X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE */
               "q35-pci-hole64-size", /* QEMU_CAPS_Q35_PCI_HOLE64_SIZE */
               "usb-storage", /* QEMU_CAPS_DEVICE_USB_STORAGE */
               "usb-storage.removable", /* QEMU_CAPS_USB_STORAGE_REMOVABLE */
@@ -1501,7 +1501,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = {
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {
-    { "pci-hole64-size", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsQ35PCIHost[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 440561d4963685d6b8a588d89423367164e0979d..885f3208d9028268eb8b65c7c9ab970dc0252ad4 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -255,7 +255,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 150 */
     QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, /* -device i82801b11-bridge */
-    QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */
+    X_QEMU_CAPS_I440FX_PCI_HOLE64_SIZE, /* i440FX-pcihost.pci-hole64-size */
     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 35bdba931dd1e66e58e209825f9992f06e7ee5bb..b73180bb3ea1c3ef57dddf958a580a2da8bd35d0 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='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index e35ba8111f06af90b2ceda7104ded7c802ddbd87..aa3d5284baa46a0ce184eb98339c82cef51bbf76 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='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index f16ed680dfad82c0515da7a529fde26794e605b6..986fe82f67169738e7ffddd46088b3bc5e26386f 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='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 84dab41317064b2fad0a58eebee3347edac99d72..468b68b83ca53fae92cee073b0e6259cd80df4ef 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='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 9a43c0dc6010306861b33630169b9580dc443b17..ec480a31c78069cae3e44df75633a1068c3b874a 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='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 6c657f6f16e4ad3c1e6cb8168ba4f6824017c859..db6cf821feb47a47a3290d299e2d60796d513e8f 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='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 09f012875d4898fc1c8a88399c0e8239c56b8ac7..cb88b803331223c081cdf43fa4577369096e8897 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='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index f444d70827219db2a4ffd3761baaa5663cbbed51..1465d0f3a42e214136bbe4656aeeefb2dcc1a2e8 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='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 6c8b54b3cc78423b1497f08c2acf4c8c8c40f27f..51b3b5943cc5d38af708d1af3b527ad6a9a89105 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='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>