[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 13/19] PCI Bonito: QOMify and cleanup
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 13/19] PCI Bonito: QOMify and cleanup |
Date: |
Mon, 11 Jan 2016 11:41:52 +0300 |
From: Cao jin <address@hidden>
Also clear the code
Signed-off-by: Cao jin <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/pci-host/bonito.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 4139a2c..b477679 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -180,8 +180,6 @@
#define PCI_ADDR(busno,devno,funno,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 PCIBonitoState
@@ -215,17 +213,20 @@ typedef struct PCIBonitoState
} PCIBonitoState;
-#define BONITO_PCI_HOST_BRIDGE(obj) \
- OBJECT_CHECK(BonitoState, (obj), TYPE_BONITO_PCI_HOST_BRIDGE)
-
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) \
+ OBJECT_CHECK(BonitoState, (obj), TYPE_BONITO_PCI_HOST_BRIDGE)
+
+#define TYPE_PCI_BONITO "Bonito"
+#define PCI_BONITO(obj) \
+ OBJECT_CHECK(PCIBonitoState, (obj), TYPE_PCI_BONITO)
+
static void bonito_writel(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
@@ -723,7 +724,7 @@ static int bonito_pcihost_initfn(SysBusDevice *dev)
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);
PCIHostState *phb = PCI_HOST_BRIDGE(s->pcihost);
@@ -799,8 +800,8 @@ PCIBus *bonito_init(qemu_irq *pic)
qdev_init_nofail(dev);
/* set the pcihost pointer before bonito_initfn is called */
- d = pci_create(phb->bus, PCI_DEVFN(0, 0), "Bonito");
- s = DO_UPCAST(PCIBonitoState, dev, d);
+ d = pci_create(phb->bus, PCI_DEVFN(0, 0), TYPE_PCI_BONITO);
+ s = PCI_BONITO(d);
s->pcihost = pcihost;
pcihost->pci_dev = s;
qdev_init_nofail(DEVICE(d));
@@ -828,7 +829,7 @@ static void bonito_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo bonito_info = {
- .name = "Bonito",
+ .name = TYPE_PCI_BONITO,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIBonitoState),
.class_init = bonito_class_init,
--
2.1.4
- [Qemu-trivial] [PULL 00/19] Trivial patches for 2016-01-11, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 07/19] xen/Makefile.objs: simplify, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 06/19] crypto: Fix typo in example, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 01/19] unicore32: convert get_sp_from_cpustate from macro to inline, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 08/19] configure: fix trace backend check, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 05/19] MAINTAINERS: Add the correct device_tree.h file, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 14/19] scripts/checkpatch.pl: Don't allow special cases of unspaced operators, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 09/19] hw/misc/edu: Convert to realize(), Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 04/19] iscsi: fix readcapacity error message, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 15/19] osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 13/19] PCI Bonito: QOMify and cleanup,
Michael Tokarev <=
- [Qemu-trivial] [PULL 16/19] hw/ide: Remove superfluous return statements, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 19/19] hw/s390x: Remove superfluous return statements, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 18/19] hw/core/qdev: Remove superfluous return statement, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 17/19] hw/acpi: Remove superfluous return statement, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 10/19] Add missing syscall nrs. according to more recent Linux kernels, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 11/19] gt64120: convert to realize(), Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 03/19] net: convert qemu_log to error_report, fix message, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 02/19] linux-user: enable sigaltstack for all architectures, Michael Tokarev, 2016/01/11
- [Qemu-trivial] [PULL 12/19] SH PCI Host: convert to realize(), Michael Tokarev, 2016/01/11
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/19] Trivial patches for 2016-01-11, Peter Maydell, 2016/01/11