diff options
author | Andreas Färber <afaerber@suse.de> | 2012-05-03 23:47:04 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:40 +0200 |
commit | 43824588af2fa77f9586e16ef2f01d1990c6460e (patch) | |
tree | b81b86b0e85995fd730c7e12b9e6ee0b27bb0bff /hw/z2.c | |
parent | df90dadb4507afa31fdc85f94d8571e7aa25b80b (diff) | |
download | qemu-43824588af2fa77f9586e16ef2f01d1990c6460e.zip qemu-43824588af2fa77f9586e16ef2f01d1990c6460e.tar.gz qemu-43824588af2fa77f9586e16ef2f01d1990c6460e.tar.bz2 |
pxa2xx: Use cpu_arm_init() and store ARMCPU
Also use cpu_reset() in place of cpu_state_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/z2.c')
-rw-r--r-- | hw/z2.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -363,7 +363,7 @@ static void z2_init(ram_addr_t ram_size, z2_binfo.kernel_cmdline = kernel_cmdline; z2_binfo.initrd_filename = initrd_filename; z2_binfo.board_id = 0x6dd; - arm_load_kernel(cpu->env, &z2_binfo); + arm_load_kernel(&cpu->cpu->env, &z2_binfo); } } |