diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-04 18:20:07 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:44 +0200 |
| commit | f8031482d72b61b86b3f9165d50303fba18480d2 (patch) | |
| tree | 7cc2ea110db7aaf43e1eb30e82a7504164f6b09c /hw/virtex_ml507.c | |
| parent | 68281699ac0218a2446f30ebf2e1191ae65bb162 (diff) | |
virtex_ml507: Pass PowerPCCPU to main_cpu_reset()
Allows us to call cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/virtex_ml507.c')
| -rw-r--r-- | hw/virtex_ml507.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index 0e223bd3df..cace86b5e4 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c @@ -108,10 +108,11 @@ static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size, static void main_cpu_reset(void *opaque) { - CPUPPCState *env = opaque; + PowerPCCPU *cpu = opaque; + CPUPPCState *env = &cpu->env; struct boot_info *bi = env->load_info; - cpu_state_reset(env); + cpu_reset(CPU(cpu)); /* Linux Kernel Parameters (passing device tree): * r3: pointer to the fdt * r4: 0 @@ -206,7 +207,7 @@ static void virtex_init(ram_addr_t ram_size, cpu = ppc440_init_xilinx(&ram_size, 1, cpu_model, 400000000); env = &cpu->env; - qemu_register_reset(main_cpu_reset, env); + qemu_register_reset(main_cpu_reset, cpu); memory_region_init_ram(phys_ram, "ram", ram_size); vmstate_register_ram_global(phys_ram); |