[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/27] integratorcp: Use cpu_arm_init() to obtain AR
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 09/27] integratorcp: Use cpu_arm_init() to obtain ARMCPU |
Date: |
Mon, 11 Jun 2012 02:00:41 +0200 |
Needed for arm_load_kernel().
Add missing braces.
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Peter Maydell <address@hidden>
---
hw/integratorcp.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 9bdb9e6..46fd09d 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -443,7 +443,7 @@ static void integratorcp_init(ram_addr_t ram_size,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
- CPUARMState *env;
+ ARMCPU *cpu;
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *ram_alias = g_new(MemoryRegion, 1);
@@ -452,13 +452,15 @@ static void integratorcp_init(ram_addr_t ram_size,
DeviceState *dev;
int i;
- if (!cpu_model)
+ if (!cpu_model) {
cpu_model = "arm926";
- env = cpu_init(cpu_model);
- if (!env) {
+ }
+ cpu = cpu_arm_init(cpu_model);
+ if (!cpu) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
}
+
memory_region_init_ram(ram, "integrator.ram", ram_size);
vmstate_register_ram_global(ram);
/* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */
@@ -474,7 +476,7 @@ static void integratorcp_init(ram_addr_t ram_size,
qdev_init_nofail(dev);
sysbus_mmio_map((SysBusDevice *)dev, 0, 0x10000000);
- cpu_pic = arm_pic_init_cpu(env);
+ cpu_pic = arm_pic_init_cpu(&cpu->env);
dev = sysbus_create_varargs("integrator_pic", 0x14000000,
cpu_pic[ARM_PIC_CPU_IRQ],
cpu_pic[ARM_PIC_CPU_FIQ], NULL);
@@ -500,7 +502,7 @@ static void integratorcp_init(ram_addr_t ram_size,
integrator_binfo.kernel_filename = kernel_filename;
integrator_binfo.kernel_cmdline = kernel_cmdline;
integrator_binfo.initrd_filename = initrd_filename;
- arm_load_kernel(env, &integrator_binfo);
+ arm_load_kernel(&cpu->env, &integrator_binfo);
}
static QEMUMachine integratorcp_machine = {
--
1.7.7
- [Qemu-devel] [PULL] QOM CPUState, part 3a: cleanups & preparations, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 01/27] nseries: Rename n800_s::cpu to mpu, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 02/27] omap_sx1: Rename omap_mpu_state_s variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 04/27] mainstone: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 05/27] spitz: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 06/27] tosa: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 03/27] palm: Rename omap_mpu_state_s variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 07/27] z2: Rename PXA2xxState variable, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 09/27] integratorcp: Use cpu_arm_init() to obtain ARMCPU,
Andreas Färber <=
- [Qemu-devel] [PATCH 15/27] vexpress: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 14/27] realview: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 11/27] versatilepb: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 10/27] musicpal: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 08/27] strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 21/27] arm_boot: Pass ARMCPU to arm_load_kernel(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 16/27] exynos4210: Use cpu_arm_init() to store ARMCPU, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 12/27] arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot(), Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 18/27] pxa2xx_pic: Store ARMCPU in PXA2xxPICState, Andreas Färber, 2012/06/10
- [Qemu-devel] [PATCH 19/27] pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo, Andreas Färber, 2012/06/10