david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pc: move global memory map out of pc_init1() and into its callers

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Avi Kivity 2011-07-26 14:26:18 +03:00 committed by Anthony Liguori
parent 00cb2a99f5
commit 6bd105151a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/pc_piix.c
View File

@ -68,7 +68,8 @@ static void ioapic_init(IsaIrqState *isa_irq_state)
} }
/* PC hardware initialisation */ /* PC hardware initialisation */
static void pc_init1(ram_addr_t ram_size, static void pc_init1(MemoryRegion *system_memory,
ram_addr_t ram_size,
const char *boot_device, const char *boot_device,
const char *kernel_filename, const char *kernel_filename,
const char *kernel_cmdline, const char *kernel_cmdline,
@ -91,9 +92,6 @@ static void pc_init1(ram_addr_t ram_size,
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
BusState *idebus[MAX_IDE_BUS]; BusState *idebus[MAX_IDE_BUS];
ISADevice *rtc_state; ISADevice *rtc_state;
MemoryRegion *system_memory;
system_memory = get_system_memory();
pc_cpus_init(cpu_model); pc_cpus_init(cpu_model);
@ -214,7 +212,8 @@ static void pc_init_pci(ram_addr_t ram_size,
const char *initrd_filename, const char *initrd_filename,
const char *cpu_model) const char *cpu_model)
{ {
pc_init1(ram_size, boot_device, pc_init1(get_system_memory(),
ram_size, boot_device,
kernel_filename, kernel_cmdline, kernel_filename, kernel_cmdline,
initrd_filename, cpu_model, 1, 1); initrd_filename, cpu_model, 1, 1);
} }
@ -226,7 +225,8 @@ static void pc_init_pci_no_kvmclock(ram_addr_t ram_size,
const char *initrd_filename, const char *initrd_filename,
const char *cpu_model) const char *cpu_model)
{ {
pc_init1(ram_size, boot_device, pc_init1(get_system_memory(),
ram_size, boot_device,
kernel_filename, kernel_cmdline, kernel_filename, kernel_cmdline,
initrd_filename, cpu_model, 1, 0); initrd_filename, cpu_model, 1, 0);
} }
@ -240,7 +240,8 @@ static void pc_init_isa(ram_addr_t ram_size,
{ {
if (cpu_model == NULL) if (cpu_model == NULL)
cpu_model = "486"; cpu_model = "486";
pc_init1(ram_size, boot_device, pc_init1(get_system_memory(),
ram_size, boot_device,
kernel_filename, kernel_cmdline, kernel_filename, kernel_cmdline,
initrd_filename, cpu_model, 0, 1); initrd_filename, cpu_model, 0, 1);
} }