diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2018-01-21 08:59:45 +0000 |
|---|---|---|
| committer | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2018-01-24 19:19:51 +0000 |
| commit | 8fb28035aad120fc9f23fd0722cd051f484d7c66 (patch) | |
| tree | 4d7c2c6bc2e1cfd052401ad38575b40fada7a2dd | |
| parent | 5560c58a5048d08e063e74574835a3adb08b8724 (diff) | |
| download | qemu-8fb28035aad120fc9f23fd0722cd051f484d7c66.zip qemu-8fb28035aad120fc9f23fd0722cd051f484d7c66.tar.gz qemu-8fb28035aad120fc9f23fd0722cd051f484d7c66.tar.bz2 | |
apb: QOMify sabre PCI host bridge
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Artyom Tarasenko <atar4qemu@gmail.com>
| -rw-r--r-- | hw/pci-host/apb.c | 6 | ||||
| -rw-r--r-- | 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 98c5f34..36c6251 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 41de012..4708636 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 |