Message ID | 20170823221445.15243-2-ehabkost@redhat.com |
---|---|
State | New |
Headers | show |
On Wed, Aug 23, 2017 at 3:14 PM, Eduardo Habkost <ehabkost@redhat.com> wrote: > Those two interfaces will be used to indicate which device types > support legacy PCI or PCI-express buses. Management software > will be able to use the qom-list-types QMP command to query that > information. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Thanks, Alistair > --- > include/hw/pci/pci.h | 6 ++++++ > hw/pci/pci.c | 12 ++++++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index e598b09..f5e8ab9 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -195,6 +195,12 @@ enum { > #define PCI_DEVICE_GET_CLASS(obj) \ > OBJECT_GET_CLASS(PCIDeviceClass, (obj), TYPE_PCI_DEVICE) > > +/* Interface implemented by devices that can be plugged on PCIe buses */ > +#define INTERFACE_PCIE_DEVICE "pci-express-device" > + > +/* Interface implemented by devices that can be plugged on legacy PCI buses */ > +#define INTERFACE_LEGACY_PCI_DEVICE "legacy-pci-device" > + > typedef struct PCIINTxRoute { > enum { > PCI_INTX_ENABLED, > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 258fbe5..baa3429 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -168,6 +168,16 @@ static const TypeInfo pci_bus_info = { > .class_init = pci_bus_class_init, > }; > > +static const TypeInfo pcie_interface_info = { > + .name = INTERFACE_PCIE_DEVICE, > + .parent = TYPE_INTERFACE, > +}; > + > +static const TypeInfo legacy_pci_interface_info = { > + .name = INTERFACE_LEGACY_PCI_DEVICE, > + .parent = TYPE_INTERFACE, > +}; > + > static const TypeInfo pcie_bus_info = { > .name = TYPE_PCIE_BUS, > .parent = TYPE_PCI_BUS, > @@ -2645,6 +2655,8 @@ static void pci_register_types(void) > { > type_register_static(&pci_bus_info); > type_register_static(&pcie_bus_info); > + type_register_static(&legacy_pci_interface_info); > + type_register_static(&pcie_interface_info); > type_register_static(&pci_device_type_info); > } > > -- > 2.9.4 > >
On Wed, 23 Aug 2017 19:14:41 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: > Those two interfaces will be used to indicate which device types > support legacy PCI or PCI-express buses. Management software > will be able to use the qom-list-types QMP command to query that > information. Nit, while "legacy PCI" and "conventional PCI" have about the same number of google hits, I believe the latter is the more correct term. The quality of hits is certainly a lot better with "conventional". Calling something "legacy" also spurs an immediate negative reaction for some folks, "conventional" is more neutral. Thanks, Alex > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > include/hw/pci/pci.h | 6 ++++++ > hw/pci/pci.c | 12 ++++++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index e598b09..f5e8ab9 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -195,6 +195,12 @@ enum { > #define PCI_DEVICE_GET_CLASS(obj) \ > OBJECT_GET_CLASS(PCIDeviceClass, (obj), TYPE_PCI_DEVICE) > > +/* Interface implemented by devices that can be plugged on PCIe buses */ > +#define INTERFACE_PCIE_DEVICE "pci-express-device" > + > +/* Interface implemented by devices that can be plugged on legacy PCI buses */ > +#define INTERFACE_LEGACY_PCI_DEVICE "legacy-pci-device" > + > typedef struct PCIINTxRoute { > enum { > PCI_INTX_ENABLED, > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index 258fbe5..baa3429 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -168,6 +168,16 @@ static const TypeInfo pci_bus_info = { > .class_init = pci_bus_class_init, > }; > > +static const TypeInfo pcie_interface_info = { > + .name = INTERFACE_PCIE_DEVICE, > + .parent = TYPE_INTERFACE, > +}; > + > +static const TypeInfo legacy_pci_interface_info = { > + .name = INTERFACE_LEGACY_PCI_DEVICE, > + .parent = TYPE_INTERFACE, > +}; > + > static const TypeInfo pcie_bus_info = { > .name = TYPE_PCIE_BUS, > .parent = TYPE_PCI_BUS, > @@ -2645,6 +2655,8 @@ static void pci_register_types(void) > { > type_register_static(&pci_bus_info); > type_register_static(&pcie_bus_info); > + type_register_static(&legacy_pci_interface_info); > + type_register_static(&pcie_interface_info); > type_register_static(&pci_device_type_info); > } >
On Fri, Aug 25, 2017 at 02:19:00PM -0600, Alex Williamson wrote: > On Wed, 23 Aug 2017 19:14:41 -0300 > Eduardo Habkost <ehabkost@redhat.com> wrote: > > > Those two interfaces will be used to indicate which device types > > support legacy PCI or PCI-express buses. Management software > > will be able to use the qom-list-types QMP command to query that > > information. > > Nit, while "legacy PCI" and "conventional PCI" have about the same > number of google hits, I believe the latter is the more correct term. > The quality of hits is certainly a lot better with "conventional". > Calling something "legacy" also spurs an immediate negative reaction > for some folks, "conventional" is more neutral. Thanks, Oh, Conventional PCI even has a Wikipedia article. I agree. I will change it in v2. Thanks!
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index e598b09..f5e8ab9 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -195,6 +195,12 @@ enum { #define PCI_DEVICE_GET_CLASS(obj) \ OBJECT_GET_CLASS(PCIDeviceClass, (obj), TYPE_PCI_DEVICE) +/* Interface implemented by devices that can be plugged on PCIe buses */ +#define INTERFACE_PCIE_DEVICE "pci-express-device" + +/* Interface implemented by devices that can be plugged on legacy PCI buses */ +#define INTERFACE_LEGACY_PCI_DEVICE "legacy-pci-device" + typedef struct PCIINTxRoute { enum { PCI_INTX_ENABLED, diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 258fbe5..baa3429 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -168,6 +168,16 @@ static const TypeInfo pci_bus_info = { .class_init = pci_bus_class_init, }; +static const TypeInfo pcie_interface_info = { + .name = INTERFACE_PCIE_DEVICE, + .parent = TYPE_INTERFACE, +}; + +static const TypeInfo legacy_pci_interface_info = { + .name = INTERFACE_LEGACY_PCI_DEVICE, + .parent = TYPE_INTERFACE, +}; + static const TypeInfo pcie_bus_info = { .name = TYPE_PCIE_BUS, .parent = TYPE_PCI_BUS, @@ -2645,6 +2655,8 @@ static void pci_register_types(void) { type_register_static(&pci_bus_info); type_register_static(&pcie_bus_info); + type_register_static(&legacy_pci_interface_info); + type_register_static(&pcie_interface_info); type_register_static(&pci_device_type_info); }
Those two interfaces will be used to indicate which device types support legacy PCI or PCI-express buses. Management software will be able to use the qom-list-types QMP command to query that information. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- include/hw/pci/pci.h | 6 ++++++ hw/pci/pci.c | 12 ++++++++++++ 2 files changed, 18 insertions(+)