| Message ID | 20180114104751.21965-6-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
Hi Mark, On 01/14/2018 07:47 AM, Mark Cave-Ayland wrote: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> This device is already QOM'ified, but now the QOM abstract inheritance is clearer, so: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/pci-host/apb.c | 6 +++--- > include/hw/pci-host/apb.h | 14 +++++++++++--- > 2 files changed, 14 insertions(+), 6 deletions(-) > > diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c > index 98c5f344f7..36c6251816 100644 > --- a/hw/pci-host/apb.c > +++ b/hw/pci-host/apb.c > @@ -407,7 +407,7 @@ static void sabre_realize(DeviceState *dev, Error **errp) > &s->pci_ioport, > 0, 32, TYPE_PCI_BUS); > > - pci_create_simple(phb->bus, 0, "pbm-pci"); > + pci_create_simple(phb->bus, 0, TYPE_SABRE_PCI_DEVICE); > > /* IOMMU */ > memory_region_add_subregion_overlap(&s->apb_config, 0x200, > @@ -498,9 +498,9 @@ static void sabre_pci_class_init(ObjectClass *klass, void *data) > } > > static const TypeInfo sabre_pci_info = { > - .name = "pbm-pci", > + .name = TYPE_SABRE_PCI_DEVICE, > .parent = TYPE_PCI_DEVICE, > - .instance_size = sizeof(PCIDevice), > + .instance_size = sizeof(SabrePCIState), > .class_init = sabre_pci_class_init, > .interfaces = (InterfaceInfo[]) { > { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > diff --git a/include/hw/pci-host/apb.h b/include/hw/pci-host/apb.h > index 41de012396..470863639a 100644 > --- a/include/hw/pci-host/apb.h > +++ b/include/hw/pci-host/apb.h > @@ -14,9 +14,13 @@ > #define OBIO_MSE_IRQ 0x2a > #define OBIO_SER_IRQ 0x2b > > -#define TYPE_APB "pbm" > -#define APB_DEVICE(obj) \ > - OBJECT_CHECK(APBState, (obj), TYPE_APB) > +typedef struct SabrePCIState { > + PCIDevice parent_obj; > +} SabrePCIState; > + > +#define TYPE_SABRE_PCI_DEVICE "sabre-pci" > +#define SABRE_PCI_DEVICE(obj) \ > + OBJECT_CHECK(SabrePCIState, (obj), TYPE_SABRE_PCI_DEVICE) > > typedef struct APBState { > PCIHostState parent_obj; > @@ -41,4 +45,8 @@ typedef struct APBState { > unsigned int nr_resets; > } APBState; > > +#define TYPE_APB "apb" > +#define APB_DEVICE(obj) \ > + OBJECT_CHECK(APBState, (obj), TYPE_APB) > + > #endif >
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c index 98c5f344f7..36c6251816 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -407,7 +407,7 @@ static void sabre_realize(DeviceState *dev, Error **errp) &s->pci_ioport, 0, 32, TYPE_PCI_BUS); - pci_create_simple(phb->bus, 0, "pbm-pci"); + pci_create_simple(phb->bus, 0, TYPE_SABRE_PCI_DEVICE); /* IOMMU */ memory_region_add_subregion_overlap(&s->apb_config, 0x200, @@ -498,9 +498,9 @@ static void sabre_pci_class_init(ObjectClass *klass, void *data) } static const TypeInfo sabre_pci_info = { - .name = "pbm-pci", + .name = TYPE_SABRE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE, - .instance_size = sizeof(PCIDevice), + .instance_size = sizeof(SabrePCIState), .class_init = sabre_pci_class_init, .interfaces = (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, diff --git a/include/hw/pci-host/apb.h b/include/hw/pci-host/apb.h index 41de012396..470863639a 100644 --- a/include/hw/pci-host/apb.h +++ b/include/hw/pci-host/apb.h @@ -14,9 +14,13 @@ #define OBIO_MSE_IRQ 0x2a #define OBIO_SER_IRQ 0x2b -#define TYPE_APB "pbm" -#define APB_DEVICE(obj) \ - OBJECT_CHECK(APBState, (obj), TYPE_APB) +typedef struct SabrePCIState { + PCIDevice parent_obj; +} SabrePCIState; + +#define TYPE_SABRE_PCI_DEVICE "sabre-pci" +#define SABRE_PCI_DEVICE(obj) \ + OBJECT_CHECK(SabrePCIState, (obj), TYPE_SABRE_PCI_DEVICE) typedef struct APBState { PCIHostState parent_obj; @@ -41,4 +45,8 @@ typedef struct APBState { unsigned int nr_resets; } APBState; +#define TYPE_APB "apb" +#define APB_DEVICE(obj) \ + OBJECT_CHECK(APBState, (obj), TYPE_APB) + #endif
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/pci-host/apb.c | 6 +++--- include/hw/pci-host/apb.h | 14 +++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)