openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/*: Use type casting for SysBusDevice in NPCM7XX 

A device shouldn't access its parent object which is QOM internal.
Instead it should use type cast for this purporse. This patch fixes this
issue for all NPCM7XX Devices.

Signed-off-by: Hao Wu <wuhaotsh@google.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20210108190945.949196-7-wuhaotsh@google.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Hao Wu 2021-01-08 11:09:45 -08:00 committed by Peter Maydell
parent 73314f1384
commit 828d651c58
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/arm/npcm7xx_boards.c
View File

@ -82,7 +82,7 @@ static NPCM7xxState *npcm7xx_create_soc(MachineState *machine,
uint32_t hw_straps) uint32_t hw_straps)
{ {
NPCM7xxMachineClass *nmc = NPCM7XX_MACHINE_GET_CLASS(machine); NPCM7xxMachineClass *nmc = NPCM7XX_MACHINE_GET_CLASS(machine);
MachineClass *mc = &nmc->parent; MachineClass *mc = MACHINE_CLASS(nmc);
Object *obj; Object *obj;
if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) { if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) {

2
hw/mem/npcm7xx_mc.c
View File

@ -62,7 +62,7 @@ static void npcm7xx_mc_realize(DeviceState *dev, Error **errp)
memory_region_init_io(&s->mmio, OBJECT(s), &npcm7xx_mc_ops, s, "regs", memory_region_init_io(&s->mmio, OBJECT(s), &npcm7xx_mc_ops, s, "regs",
NPCM7XX_MC_REGS_SIZE); NPCM7XX_MC_REGS_SIZE);
sysbus_init_mmio(&s->parent, &s->mmio); sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mmio);
} }
static void npcm7xx_mc_class_init(ObjectClass *klass, void *data) static void npcm7xx_mc_class_init(ObjectClass *klass, void *data)

2
hw/misc/npcm7xx_clk.c
View File

@ -913,7 +913,7 @@ static void npcm7xx_clk_init(Object *obj)
memory_region_init_io(&s->iomem, obj, &npcm7xx_clk_ops, s, memory_region_init_io(&s->iomem, obj, &npcm7xx_clk_ops, s,
TYPE_NPCM7XX_CLK, 4 * KiB); TYPE_NPCM7XX_CLK, 4 * KiB);
sysbus_init_mmio(&s->parent, &s->iomem); sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
} }
static int npcm7xx_clk_post_load(void *opaque, int version_id) static int npcm7xx_clk_post_load(void *opaque, int version_id)

2
hw/misc/npcm7xx_gcr.c
View File

@ -220,7 +220,7 @@ static void npcm7xx_gcr_init(Object *obj)
memory_region_init_io(&s->iomem, obj, &npcm7xx_gcr_ops, s, memory_region_init_io(&s->iomem, obj, &npcm7xx_gcr_ops, s,
TYPE_NPCM7XX_GCR, 4 * KiB); TYPE_NPCM7XX_GCR, 4 * KiB);
sysbus_init_mmio(&s->parent, &s->iomem); sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
} }
static const VMStateDescription vmstate_npcm7xx_gcr = { static const VMStateDescription vmstate_npcm7xx_gcr = {

2
hw/misc/npcm7xx_rng.c
View File

@ -143,7 +143,7 @@ static void npcm7xx_rng_init(Object *obj)
memory_region_init_io(&s->iomem, obj, &npcm7xx_rng_ops, s, "regs", memory_region_init_io(&s->iomem, obj, &npcm7xx_rng_ops, s, "regs",
NPCM7XX_RNG_REGS_SIZE); NPCM7XX_RNG_REGS_SIZE);
sysbus_init_mmio(&s->parent, &s->iomem); sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
} }
static const VMStateDescription vmstate_npcm7xx_rng = { static const VMStateDescription vmstate_npcm7xx_rng = {

2
hw/nvram/npcm7xx_otp.c
View File

@ -371,7 +371,7 @@ static void npcm7xx_otp_realize(DeviceState *dev, Error **errp)
{ {
NPCM7xxOTPClass *oc = NPCM7XX_OTP_GET_CLASS(dev); NPCM7xxOTPClass *oc = NPCM7XX_OTP_GET_CLASS(dev);
NPCM7xxOTPState *s = NPCM7XX_OTP(dev); NPCM7xxOTPState *s = NPCM7XX_OTP(dev);
SysBusDevice *sbd = &s->parent; SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
memset(s->array, 0, sizeof(s->array)); memset(s->array, 0, sizeof(s->array));

2
hw/ssi/npcm7xx_fiu.c
View File

@ -498,7 +498,7 @@ static void npcm7xx_fiu_hold_reset(Object *obj)
static void npcm7xx_fiu_realize(DeviceState *dev, Error **errp) static void npcm7xx_fiu_realize(DeviceState *dev, Error **errp)
{ {
NPCM7xxFIUState *s = NPCM7XX_FIU(dev); NPCM7xxFIUState *s = NPCM7XX_FIU(dev);
SysBusDevice *sbd = &s->parent; SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
int i; int i;
if (s->cs_count <= 0) { if (s->cs_count <= 0) {