| Message ID | 20170927195635.16014-6-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Mark conventional/PCIe/hybrid PCI devices using interface names | expand |
On Wed, Sep 27, 2017 at 04:56:35PM -0300, Eduardo Habkost wrote: > Make sure we don't forget to add the Conventional PCI or PCI > Express interface names on PCI device classes in the future. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Revieed-by: David Gibson <david@gibson.dropbear.id.au> > --- > Changes v1 -> v2: > * s/legacy/conventional/ > * Suggested-by: Alex Williamson <alex.williamson@redhat.com> > --- > hw/pci/pci.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 1b08e18205..5ed3c8dca4 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -2547,6 +2547,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 *conventional = > + object_class_dynamic_cast(klass, INTERFACE_CONVENTIONAL_PCI_DEVICE); > + ObjectClass *pcie = > + object_class_dynamic_cast(klass, INTERFACE_PCIE_DEVICE); > + assert(conventional || pcie); > + } > +} > + > AddressSpace *pci_device_iommu_address_space(PCIDevice *dev) > { > PCIBus *bus = PCI_BUS(dev->bus); > @@ -2671,6 +2682,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)
On 27/09/2017 22:56, Eduardo Habkost wrote: > Make sure we don't forget to add the Conventional PCI or PCI > Express interface names on PCI device classes in the future. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > Changes v1 -> v2: > * s/legacy/conventional/ > * Suggested-by: Alex Williamson <alex.williamson@redhat.com> > --- > hw/pci/pci.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 1b08e18205..5ed3c8dca4 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -2547,6 +2547,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 *conventional = > + object_class_dynamic_cast(klass, INTERFACE_CONVENTIONAL_PCI_DEVICE); > + ObjectClass *pcie = > + object_class_dynamic_cast(klass, INTERFACE_PCIE_DEVICE); > + assert(conventional || pcie); > + } > +} > + > AddressSpace *pci_device_iommu_address_space(PCIDevice *dev) > { > PCIBus *bus = PCI_BUS(dev->bus); > @@ -2671,6 +2682,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) > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 1b08e18205..5ed3c8dca4 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2547,6 +2547,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 *conventional = + object_class_dynamic_cast(klass, INTERFACE_CONVENTIONAL_PCI_DEVICE); + ObjectClass *pcie = + object_class_dynamic_cast(klass, INTERFACE_PCIE_DEVICE); + assert(conventional || pcie); + } +} + AddressSpace *pci_device_iommu_address_space(PCIDevice *dev) { PCIBus *bus = PCI_BUS(dev->bus); @@ -2671,6 +2682,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)
Make sure we don't forget to add the Conventional PCI or PCI Express interface names on PCI device classes in the future. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Changes v1 -> v2: * s/legacy/conventional/ * Suggested-by: Alex Williamson <alex.williamson@redhat.com> --- hw/pci/pci.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)