diff options
author | Andreas Färber <afaerber@suse.de> | 2012-05-14 01:42:57 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2012-06-11 00:23:03 +0200 |
commit | 8bf502e2a64f8f4ed37d9b16f367378ebf237ccb (patch) | |
tree | 5bdeeb3d071c7ab819038c42e66395e27840cc30 /hw/collie.c | |
parent | 5c6f4f178ba542358c012ca033985f73e61b8ae5 (diff) | |
download | qemu-8bf502e2a64f8f4ed37d9b16f367378ebf237ccb.zip qemu-8bf502e2a64f8f4ed37d9b16f367378ebf237ccb.tar.gz qemu-8bf502e2a64f8f4ed37d9b16f367378ebf237ccb.tar.bz2 |
strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState
Adapt collie accordingly.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/collie.c')
-rw-r--r-- | hw/collie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/collie.c b/hw/collie.c index 42f4310..e6f8dbf 100644 --- a/hw/collie.c +++ b/hw/collie.c @@ -54,7 +54,7 @@ static void collie_init(ram_addr_t ram_size, collie_binfo.kernel_cmdline = kernel_cmdline; collie_binfo.initrd_filename = initrd_filename; collie_binfo.board_id = 0x208; - arm_load_kernel(s->env, &collie_binfo); + arm_load_kernel(&s->cpu->env, &collie_binfo); } static QEMUMachine collie_machine = { |