motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

PCI Bonito: QOMify and cleanup

Browse source 
Also clear the code

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Cao jin 2016-01-05 18:57:49 +08:00 • committed by Michael Tokarev
parent 9f23b27d0d
commit a2a645d967
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
hw/pci-host/bonito.c
View file

@ -180,8 +180,6 @@
#define PCI_ADDR(busno,devno,funno,regno) \ #define PCI_ADDR(busno,devno,funno,regno) \
((((busno)<<16)&0xff0000) + (((devno)<<11)&0xf800) + (((funno)<<8)&0x700) + (regno)) ((((busno)<<16)&0xff0000) + (((devno)<<11)&0xf800) + (((funno)<<8)&0x700) + (regno))
#define TYPE_BONITO_PCI_HOST_BRIDGE "Bonito-pcihost"
typedef struct BonitoState BonitoState; typedef struct BonitoState BonitoState;
typedef struct PCIBonitoState typedef struct PCIBonitoState
@ -215,16 +213,19 @@ typedef struct PCIBonitoState
} PCIBonitoState; } PCIBonitoState;
struct BonitoState {
PCIHostState parent_obj;
qemu_irq *pic;
PCIBonitoState *pci_dev;
};
#define TYPE_BONITO_PCI_HOST_BRIDGE "Bonito-pcihost"
#define BONITO_PCI_HOST_BRIDGE(obj) \ #define BONITO_PCI_HOST_BRIDGE(obj) \
OBJECT_CHECK(BonitoState, (obj), TYPE_BONITO_PCI_HOST_BRIDGE) OBJECT_CHECK(BonitoState, (obj), TYPE_BONITO_PCI_HOST_BRIDGE)
struct BonitoState { #define TYPE_PCI_BONITO "Bonito"
PCIHostState parent_obj; #define PCI_BONITO(obj) \
OBJECT_CHECK(PCIBonitoState, (obj), TYPE_PCI_BONITO)
qemu_irq *pic;
PCIBonitoState *pci_dev;
};
static void bonito_writel(void *opaque, hwaddr addr, static void bonito_writel(void *opaque, hwaddr addr,
uint64_t val, unsigned size) uint64_t val, unsigned size)
@ -723,7 +724,7 @@ static int bonito_pcihost_initfn(SysBusDevice *dev)
static void bonito_realize(PCIDevice *dev, Error **errp) static void bonito_realize(PCIDevice *dev, Error **errp)
{ {
PCIBonitoState *s = DO_UPCAST(PCIBonitoState, dev, dev); PCIBonitoState *s = PCI_BONITO(dev);
SysBusDevice *sysbus = SYS_BUS_DEVICE(s->pcihost); SysBusDevice *sysbus = SYS_BUS_DEVICE(s->pcihost);
PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost); PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost);
@ -799,8 +800,8 @@ PCIBus *bonito_init(qemu_irq *pic)
qdev_init_nofail(dev); qdev_init_nofail(dev);
/* set the pcihost pointer before bonito_initfn is called */ /* set the pcihost pointer before bonito_initfn is called */
d = pci_create(phb->bus, PCI_DEVFN(0, 0), "Bonito"); d = pci_create(phb->bus, PCI_DEVFN(0, 0), TYPE_PCI_BONITO);
s = DO_UPCAST(PCIBonitoState, dev, d); s = PCI_BONITO(d);
s->pcihost = pcihost; s->pcihost = pcihost;
pcihost->pci_dev = s; pcihost->pci_dev = s;
qdev_init_nofail(DEVICE(d)); qdev_init_nofail(DEVICE(d));
@ -828,7 +829,7 @@ static void bonito_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo bonito_info = { static const TypeInfo bonito_info = {
.name = "Bonito", .name = TYPE_PCI_BONITO,
.parent = TYPE_PCI_DEVICE, .parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIBonitoState), .instance_size = sizeof(PCIBonitoState),
.class_init = bonito_class_init, .class_init = bonito_class_init,