Re: [Qemu-devel] [PATCH 5/5] pci: Validate interfaces on base_class_init

2017-08-25 Thread Alistair Francis
On Wed, Aug 23, 2017 at 3:14 PM, Eduardo Habkost  wrote:
> Make sure we don't forget to add the legacy-PCI or PCIe interface
> names on PCI device classes in the future.
>
> Signed-off-by: Eduardo Habkost 

Reviewed-by: Alistair Francis 

Thanks,
Alistair

> ---
>  hw/pci/pci.c | 12 
>  1 file changed, 12 insertions(+)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index baa3429..7ac5cc6 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -2525,6 +2525,17 @@ static void pci_device_class_init(ObjectClass *klass, 
> void *data)
>  pc->realize = pci_default_realize;
>  }
>
> +static void pci_device_class_base_init(ObjectClass *klass, void *data)
> +{
> +if (!object_class_is_abstract(klass)) {
> +ObjectClass *legacy =
> +object_class_dynamic_cast(klass, INTERFACE_LEGACY_PCI_DEVICE);
> +ObjectClass *pcie =
> +object_class_dynamic_cast(klass, INTERFACE_PCIE_DEVICE);
> +assert(legacy || pcie);
> +}
> +}
> +
>  AddressSpace *pci_device_iommu_address_space(PCIDevice *dev)
>  {
>  PCIBus *bus = PCI_BUS(dev->bus);
> @@ -2649,6 +2660,7 @@ static const TypeInfo pci_device_type_info = {
>  .abstract = true,
>  .class_size = sizeof(PCIDeviceClass),
>  .class_init = pci_device_class_init,
> +.class_base_init = pci_device_class_base_init,
>  };
>
>  static void pci_register_types(void)
> --
> 2.9.4
>
>



[Qemu-devel] [PATCH 5/5] pci: Validate interfaces on base_class_init

2017-08-23 Thread Eduardo Habkost
Make sure we don't forget to add the legacy-PCI or PCIe interface
names on PCI device classes in the future.

Signed-off-by: Eduardo Habkost 
---
 hw/pci/pci.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index baa3429..7ac5cc6 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2525,6 +2525,17 @@ static void pci_device_class_init(ObjectClass *klass, 
void *data)
 pc->realize = pci_default_realize;
 }
 
+static void pci_device_class_base_init(ObjectClass *klass, void *data)
+{
+if (!object_class_is_abstract(klass)) {
+ObjectClass *legacy =
+object_class_dynamic_cast(klass, INTERFACE_LEGACY_PCI_DEVICE);
+ObjectClass *pcie =
+object_class_dynamic_cast(klass, INTERFACE_PCIE_DEVICE);
+assert(legacy || pcie);
+}
+}
+
 AddressSpace *pci_device_iommu_address_space(PCIDevice *dev)
 {
 PCIBus *bus = PCI_BUS(dev->bus);
@@ -2649,6 +2660,7 @@ static const TypeInfo pci_device_type_info = {
 .abstract = true,
 .class_size = sizeof(PCIDeviceClass),
 .class_init = pci_device_class_init,
+.class_base_init = pci_device_class_base_init,
 };
 
 static void pci_register_types(void)
-- 
2.9.4