aboutsummaryrefslogtreecommitdiff
path: root/hw/collie.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-14 02:39:57 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-11 00:23:04 +0200
commit3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a (patch)
tree0cdd65f87cc18ed8d8f1a7476a6348b848588dc2 /hw/collie.c
parent17c2f0bf37182d46d66998bf037b2cac520d2183 (diff)
downloadqemu-3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a.zip
qemu-3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a.tar.gz
qemu-3aaa8dfae955d7bec462cc4e2fce185ef6d41b5a.tar.bz2
arm_boot: Pass ARMCPU to arm_load_kernel()
In particular this simplifies the &s->mpu->cpu->env expression again. first_cpu and ->next_cpu are expected to be QOM'ified later. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> (for exynos) Acked-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/collie.c')
-rw-r--r--hw/collie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/collie.c b/hw/collie.c
index e6f8dbf..56f89a9 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->cpu->env, &collie_binfo);
+ arm_load_kernel(s->cpu, &collie_binfo);
}
static QEMUMachine collie_machine = {