david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-arm: Change vexpress daughterboard init arg

Browse Source 
Change the Vexpress daughterboard initialization method to take a vexpress
machine state pointer instead of the daughterboard struct pointer.  The machine
state now contains the daughterboard pointer.

Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1418684992-8996-6-git-send-email-greg.bellows@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Greg Bellows 2014-12-15 17:09:42 -06:00 committed by Peter Maydell
parent 4902192432
commit e364bab69b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/arm/vexpress.c
View File

@ -177,7 +177,7 @@ typedef struct {
#define VEXPRESS_MACHINE_CLASS(klass) \ #define VEXPRESS_MACHINE_CLASS(klass) \
OBJECT_CLASS_CHECK(VexpressMachineClass, klass, TYPE_VEXPRESS_MACHINE) OBJECT_CLASS_CHECK(VexpressMachineClass, klass, TYPE_VEXPRESS_MACHINE)
typedef void DBoardInitFn(const VEDBoardInfo *daughterboard, typedef void DBoardInitFn(const VexpressMachineState *machine,
ram_addr_t ram_size, ram_addr_t ram_size,
const char *cpu_model, const char *cpu_model,
qemu_irq *pic); qemu_irq *pic);
@ -252,7 +252,7 @@ static void init_cpus(const char *cpu_model, const char *privdev,
} }
} }
static void a9_daughterboard_init(const VEDBoardInfo *daughterboard, static void a9_daughterboard_init(const VexpressMachineState *vms,
ram_addr_t ram_size, ram_addr_t ram_size,
const char *cpu_model, const char *cpu_model,
qemu_irq *pic) qemu_irq *pic)
@ -342,7 +342,7 @@ static VEDBoardInfo a9_daughterboard = {
.init = a9_daughterboard_init, .init = a9_daughterboard_init,
}; };
static void a15_daughterboard_init(const VEDBoardInfo *daughterboard, static void a15_daughterboard_init(const VexpressMachineState *vms,
ram_addr_t ram_size, ram_addr_t ram_size,
const char *cpu_model, const char *cpu_model,
qemu_irq *pic) qemu_irq *pic)
@ -535,6 +535,7 @@ static pflash_t *ve_pflash_cfi01_register(hwaddr base, const char *name,
static void vexpress_common_init(MachineState *machine) static void vexpress_common_init(MachineState *machine)
{ {
VexpressMachineState *vms = VEXPRESS_MACHINE(machine);
VexpressMachineClass *vmc = VEXPRESS_MACHINE_GET_CLASS(machine); VexpressMachineClass *vmc = VEXPRESS_MACHINE_GET_CLASS(machine);
VEDBoardInfo *daughterboard = vmc->daughterboard;; VEDBoardInfo *daughterboard = vmc->daughterboard;;
DeviceState *dev, *sysctl, *pl041; DeviceState *dev, *sysctl, *pl041;
@ -551,8 +552,7 @@ static void vexpress_common_init(MachineState *machine)
const hwaddr *map = daughterboard->motherboard_map; const hwaddr *map = daughterboard->motherboard_map;
int i; int i;
daughterboard->init(daughterboard, machine->ram_size, machine->cpu_model, daughterboard->init(vms, machine->ram_size, machine->cpu_model, pic);
pic);
/* /*
* If a bios file was provided, attempt to map it into memory * If a bios file was provided, attempt to map it into memory