[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/16] spapr vio: fix to incomplete QOMify
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 15/16] spapr vio: fix to incomplete QOMify |
Date: |
Mon, 11 Jan 2016 15:37:37 +1100 |
From: Cao jin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr_vio.c | 12 +++++-------
include/hw/ppc/spapr_vio.h | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index c51eb8e..46f3b8d 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -388,7 +388,7 @@ static void rtas_quiesce(PowerPCCPU *cpu, sPAPRMachineState
*spapr,
static VIOsPAPRDevice *reg_conflict(VIOsPAPRDevice *dev)
{
- VIOsPAPRBus *bus = DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.parent_bus);
+ VIOsPAPRBus *bus = SPAPR_VIO_BUS(dev->qdev.parent_bus);
BusChild *kid;
VIOsPAPRDevice *other;
@@ -449,7 +449,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev,
Error **errp)
}
} else {
/* Need to assign an address */
- VIOsPAPRBus *bus = DO_UPCAST(VIOsPAPRBus, bus, dev->qdev.parent_bus);
+ VIOsPAPRBus *bus = SPAPR_VIO_BUS(dev->qdev.parent_bus);
do {
dev->reg = bus->next_reg++;
@@ -523,13 +523,12 @@ VIOsPAPRBus *spapr_vio_bus_init(void)
DeviceState *dev;
/* Create bridge device */
- dev = qdev_create(NULL, "spapr-vio-bridge");
+ dev = qdev_create(NULL, TYPE_SPAPR_VIO_BRIDGE);
qdev_init_nofail(dev);
/* Create bus on bridge device */
-
qbus = qbus_create(TYPE_SPAPR_VIO_BUS, dev, "spapr-vio");
- bus = DO_UPCAST(VIOsPAPRBus, bus, qbus);
+ bus = SPAPR_VIO_BUS(qbus);
bus->next_reg = 0x71000000;
/* hcall-vio */
@@ -567,9 +566,8 @@ static void spapr_vio_bridge_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo spapr_vio_bridge_info = {
- .name = "spapr-vio-bridge",
+ .name = TYPE_SPAPR_VIO_BRIDGE,
.parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(SysBusDevice),
.class_init = spapr_vio_bridge_class_init,
};
diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h
index 2299a54..c9733e7 100644
--- a/include/hw/ppc/spapr_vio.h
+++ b/include/hw/ppc/spapr_vio.h
@@ -34,7 +34,7 @@
#define TYPE_SPAPR_VIO_BUS "spapr-vio-bus"
#define SPAPR_VIO_BUS(obj) OBJECT_CHECK(VIOsPAPRBus, (obj), TYPE_SPAPR_VIO_BUS)
-struct VIOsPAPRDevice;
+#define TYPE_SPAPR_VIO_BRIDGE "spapr-vio-bridge"
typedef struct VIOsPAPR_CRQ {
uint64_t qladdr;
--
2.5.0
- [Qemu-devel] [PULL 16/16] hw/ppc/spapr: fix spapr->kvm_type leak, (continued)
- [Qemu-devel] [PULL 16/16] hw/ppc/spapr: fix spapr->kvm_type leak, David Gibson, 2016/01/10
- [Qemu-devel] [PULL 10/16] pseries: DEFINE_SPAPR_MACHINE, David Gibson, 2016/01/10
- [Qemu-devel] [PULL 05/16] pseries: Rearrange versioned machine type code, David Gibson, 2016/01/10
- [Qemu-devel] [PULL 09/16] pseries: Use SET_MACHINE_COMPAT, David Gibson, 2016/01/10
- [Qemu-devel] [PULL 03/16] spapr: Add /system-id, David Gibson, 2016/01/10
- [Qemu-devel] [PULL 12/16] pseries: Improve setting of default machine version, David Gibson, 2016/01/10
- [Qemu-devel] [PULL 13/16] pseries: Add pseries-2.6 machine type, David Gibson, 2016/01/10
- [Qemu-devel] [PULL 02/16] target-ppc: Define kvmppc_read_int_dt(), David Gibson, 2016/01/10
- [Qemu-devel] [PULL 07/16] pseries: Remove versions from mc->desc, David Gibson, 2016/01/10
- [Qemu-devel] [PULL 06/16] pseries: Remove redundant calls to spapr_machine_initfn(), David Gibson, 2016/01/10
- [Qemu-devel] [PULL 15/16] spapr vio: fix to incomplete QOMify,
David Gibson <=
- Re: [Qemu-devel] [PULL 00/16] ppc-for-2.6 queue 20160111, Peter Maydell, 2016/01/11