diff options
| author | Anthony Liguori | 2012-03-14 22:47:49 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2012-03-14 22:47:49 +0100 |
| commit | aea6ff7fa07b046fb9f43d6262d6e34b77e8437e (patch) | |
| tree | dd3043d1742273a95fa7fc5e99b8d5ffe0c710e5 /hw/xilinx_zynq.c | |
| parent | vnc: Limit r/w access to size of allocated memory (diff) | |
| parent | qom: Introduce CPU class (diff) | |
| download | qemu-aea6ff7fa07b046fb9f43d6262d6e34b77e8437e.tar.gz qemu-aea6ff7fa07b046fb9f43d6262d6e34b77e8437e.tar.xz qemu-aea6ff7fa07b046fb9f43d6262d6e34b77e8437e.zip | |
Merge remote-tracking branch 'afaerber/qom-cpu.v5' into staging
* afaerber/qom-cpu.v5: (43 commits)
qom: Introduce CPU class
Rename CPUState -> CPUArchState
xtensa hw/: Don't use CPUState
sparc hw/: Don't use CPUState
sh4 hw/: Don't use CPUState
s390x hw/: Don't use CPUState
ppc hw/: Don't use CPUState
mips hw/: Don't use CPUState
microblaze hw/: Don't use CPUState
m68k hw/: Don't use CPUState
lm32 hw/: Don't use CPUState
i386 hw/: Don't use CPUState
cris hw/: Don't use CPUState
arm hw/: Don't use CPUState
alpha hw/: Don't use CPUState
xtensa-semi: Don't use CPUState
m68k-semi: Don't use CPUState
arm-semi: Don't use CPUState
target-xtensa: Don't overuse CPUState
target-unicore32: Don't overuse CPUState
...
Diffstat (limited to 'hw/xilinx_zynq.c')
| -rw-r--r-- | hw/xilinx_zynq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index ea13e8c844..7290c64a4c 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -50,7 +50,7 @@ static void zynq_init(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUState *env = NULL; + CPUARMState *env = NULL; MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *ext_ram = g_new(MemoryRegion, 1); MemoryRegion *ocm_ram = g_new(MemoryRegion, 1); |