diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-10 15:15:54 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-10 15:15:54 +0000 |
| commit | aaed909a495e78364abc6812df672d2e764961a8 (patch) | |
| tree | 704ab4280f250fa310bee6a3d0ba94e5417daef3 /hw/integratorcp.c | |
| parent | 7d77bf200682ed8cbd0c94bdfbac64dc4b23b149 (diff) | |
| download | focaccia-qemu-aaed909a495e78364abc6812df672d2e764961a8.tar.gz focaccia-qemu-aaed909a495e78364abc6812df672d2e764961a8.zip | |
added cpu_model parameter to cpu_init()
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3562 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/integratorcp.c')
| -rw-r--r-- | hw/integratorcp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/integratorcp.c b/hw/integratorcp.c index 5d2c651259..0091f4fd18 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -473,10 +473,13 @@ static void integratorcp_init(int ram_size, int vga_ram_size, qemu_irq *pic; qemu_irq *cpu_pic; - env = cpu_init(); if (!cpu_model) cpu_model = "arm926"; - cpu_arm_set_model(env, cpu_model); + env = cpu_init(cpu_model); + if (!env) { + fprintf(stderr, "Unable to find CPU definition\n"); + exit(1); + } bios_offset = ram_size + vga_ram_size; /* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */ /* ??? RAM shoud repeat to fill physical memory space. */ |