[libvirt PATCH 5/6] qemu: retire QEMU_CAPS_Q35_PCI_HOLE64_SIZE

We no longer use it. 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.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.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.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - 11 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a771a30d60..01fce36399 100644 --- 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 885f3208d9..8e777297f6 100644 --- 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 b73180bb3e..0cce31600d 100644 --- 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 aa3d5284ba..e41f083b8b 100644 --- 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 986fe82f67..62b680d044 100644 --- 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 468b68b83c..c97ba19b32 100644 --- 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 ec480a31c7..d5075e550d 100644 --- 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 db6cf821fe..7a54069b3d 100644 --- 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 cb88b80333..8d62f989f3 100644 --- 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 1465d0f3a4..a1a2d65c89 100644 --- 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 51b3b5943c..a7a3bd7f4a 100644 --- 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'/> -- 2.37.1