pc: convert pc_memory_init() to memory API
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
4aa63af149
commit
00cb2a99f5
55
hw/pc.c
55
hw/pc.c
|
@ -41,6 +41,7 @@
|
||||||
#include "sysemu.h"
|
#include "sysemu.h"
|
||||||
#include "blockdev.h"
|
#include "blockdev.h"
|
||||||
#include "ui/qemu-spice.h"
|
#include "ui/qemu-spice.h"
|
||||||
|
#include "memory.h"
|
||||||
|
|
||||||
/* output Bochs bios info messages */
|
/* output Bochs bios info messages */
|
||||||
//#define DEBUG_BIOS
|
//#define DEBUG_BIOS
|
||||||
|
@ -966,22 +967,30 @@ void pc_memory_init(MemoryRegion *system_memory,
|
||||||
{
|
{
|
||||||
char *filename;
|
char *filename;
|
||||||
int ret, linux_boot, i;
|
int ret, linux_boot, i;
|
||||||
ram_addr_t ram_addr, bios_offset, option_rom_offset;
|
MemoryRegion *ram, *bios, *isa_bios, *option_rom_mr;
|
||||||
|
MemoryRegion *ram_below_4g, *ram_above_4g;
|
||||||
int bios_size, isa_bios_size;
|
int bios_size, isa_bios_size;
|
||||||
void *fw_cfg;
|
void *fw_cfg;
|
||||||
|
|
||||||
linux_boot = (kernel_filename != NULL);
|
linux_boot = (kernel_filename != NULL);
|
||||||
|
|
||||||
/* allocate RAM */
|
/* Allocate RAM. We allocate it as a single memory region and use
|
||||||
ram_addr = qemu_ram_alloc(NULL, "pc.ram",
|
* aliases to address portions of it, mostly for backwards compatiblity
|
||||||
|
* with older qemus that used qemu_ram_alloc().
|
||||||
|
*/
|
||||||
|
ram = qemu_malloc(sizeof(*ram));
|
||||||
|
memory_region_init_ram(ram, NULL, "pc.ram",
|
||||||
below_4g_mem_size + above_4g_mem_size);
|
below_4g_mem_size + above_4g_mem_size);
|
||||||
cpu_register_physical_memory(0, 0xa0000, ram_addr);
|
ram_below_4g = qemu_malloc(sizeof(*ram_below_4g));
|
||||||
cpu_register_physical_memory(0x100000,
|
memory_region_init_alias(ram_below_4g, "ram-below-4g", ram,
|
||||||
below_4g_mem_size - 0x100000,
|
0, below_4g_mem_size);
|
||||||
ram_addr + 0x100000);
|
memory_region_add_subregion(system_memory, 0, ram_below_4g);
|
||||||
if (above_4g_mem_size > 0) {
|
if (above_4g_mem_size > 0) {
|
||||||
cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size,
|
ram_above_4g = qemu_malloc(sizeof(*ram_above_4g));
|
||||||
ram_addr + below_4g_mem_size);
|
memory_region_init_alias(ram_above_4g, "ram-above-4g", ram,
|
||||||
|
below_4g_mem_size, above_4g_mem_size);
|
||||||
|
memory_region_add_subregion(system_memory, 0x100000000ULL,
|
||||||
|
ram_above_4g);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* BIOS load */
|
/* BIOS load */
|
||||||
|
@ -997,7 +1006,9 @@ void pc_memory_init(MemoryRegion *system_memory,
|
||||||
(bios_size % 65536) != 0) {
|
(bios_size % 65536) != 0) {
|
||||||
goto bios_error;
|
goto bios_error;
|
||||||
}
|
}
|
||||||
bios_offset = qemu_ram_alloc(NULL, "pc.bios", bios_size);
|
bios = qemu_malloc(sizeof(*bios));
|
||||||
|
memory_region_init_ram(bios, NULL, "pc.bios", bios_size);
|
||||||
|
memory_region_set_readonly(bios, true);
|
||||||
ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1);
|
ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1);
|
||||||
if (ret != 0) {
|
if (ret != 0) {
|
||||||
bios_error:
|
bios_error:
|
||||||
|
@ -1011,16 +1022,26 @@ void pc_memory_init(MemoryRegion *system_memory,
|
||||||
isa_bios_size = bios_size;
|
isa_bios_size = bios_size;
|
||||||
if (isa_bios_size > (128 * 1024))
|
if (isa_bios_size > (128 * 1024))
|
||||||
isa_bios_size = 128 * 1024;
|
isa_bios_size = 128 * 1024;
|
||||||
cpu_register_physical_memory(0x100000 - isa_bios_size,
|
isa_bios = qemu_malloc(sizeof(*isa_bios));
|
||||||
isa_bios_size,
|
memory_region_init_alias(isa_bios, "isa-bios", bios,
|
||||||
(bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);
|
bios_size - isa_bios_size, isa_bios_size);
|
||||||
|
memory_region_add_subregion_overlap(system_memory,
|
||||||
|
0x100000 - isa_bios_size,
|
||||||
|
isa_bios,
|
||||||
|
1);
|
||||||
|
memory_region_set_readonly(isa_bios, true);
|
||||||
|
|
||||||
option_rom_offset = qemu_ram_alloc(NULL, "pc.rom", PC_ROM_SIZE);
|
option_rom_mr = qemu_malloc(sizeof(*option_rom_mr));
|
||||||
cpu_register_physical_memory(PC_ROM_MIN_VGA, PC_ROM_SIZE, option_rom_offset);
|
memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE);
|
||||||
|
memory_region_add_subregion_overlap(system_memory,
|
||||||
|
PC_ROM_MIN_VGA,
|
||||||
|
option_rom_mr,
|
||||||
|
1);
|
||||||
|
|
||||||
/* map all the bios at the top of memory */
|
/* map all the bios at the top of memory */
|
||||||
cpu_register_physical_memory((uint32_t)(-bios_size),
|
memory_region_add_subregion(system_memory,
|
||||||
bios_size, bios_offset | IO_MEM_ROM);
|
(uint32_t)(-bios_size),
|
||||||
|
bios);
|
||||||
|
|
||||||
fw_cfg = bochs_bios_init();
|
fw_cfg = bochs_bios_init();
|
||||||
rom_set_fw(fw_cfg);
|
rom_set_fw(fw_cfg);
|
||||||
|
|
Loading…
Reference in a new issue