diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-04 09:14:24 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-04 09:14:24 -0600 |
| commit | f374e826e340ea1e2de2e9b006b3ac5dbde1324f (patch) | |
| tree | b671d3bee2582bb9de531eaeb4724dfc8ddf8881 /hw/pc.c | |
| parent | 78728c92a4137a96f1d0c49496d02dd9aa9d71b6 (diff) | |
| parent | 6cb2996cef5e273ef370e690e84b5e1403f5c391 (diff) | |
| download | focaccia-qemu-f374e826e340ea1e2de2e9b006b3ac5dbde1324f.tar.gz focaccia-qemu-f374e826e340ea1e2de2e9b006b3ac5dbde1324f.zip | |
Merge remote branch 'qemu-kvm/uq/master' into pulls
Diffstat (limited to 'hw/pc.c')
| -rw-r--r-- | hw/pc.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/hw/pc.c b/hw/pc.c index 4f6a5228fd..e50a48848d 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -760,7 +760,8 @@ static void pc_init_ne2k_isa(NICInfo *nd) int cpu_is_bsp(CPUState *env) { - return env->cpuid_apic_id == 0; + /* We hard-wire the BSP to the first CPU. */ + return env->cpu_index == 0; } static CPUState *pc_new_cpu(const char *cpu_model) @@ -833,18 +834,11 @@ static void pc_init1(ram_addr_t ram_size, vmport_init(); /* allocate RAM */ - ram_addr = qemu_ram_alloc(0xa0000); + ram_addr = qemu_ram_alloc(below_4g_mem_size); cpu_register_physical_memory(0, 0xa0000, ram_addr); - - /* Allocate, even though we won't register, so we don't break the - * phys_ram_base + PA assumption. This range includes vga (0xa0000 - 0xc0000), - * and some bios areas, which will be registered later - */ - ram_addr = qemu_ram_alloc(0x100000 - 0xa0000); - ram_addr = qemu_ram_alloc(below_4g_mem_size - 0x100000); cpu_register_physical_memory(0x100000, below_4g_mem_size - 0x100000, - ram_addr); + ram_addr + 0x100000); /* above 4giga memory allocation */ if (above_4g_mem_size > 0) { |