[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/23] pc: move global memory map out of pc_init1()
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 19/23] pc: move global memory map out of pc_init1() and into its callers |
Date: |
Mon, 25 Jul 2011 17:03:00 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/pc_piix.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index d83854c..f2d0476 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -68,7 +68,8 @@ static void ioapic_init(IsaIrqState *isa_irq_state)
}
/* 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 *kernel_filename,
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];
BusState *idebus[MAX_IDE_BUS];
ISADevice *rtc_state;
- MemoryRegion *system_memory;
-
- system_memory = get_system_memory();
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 *cpu_model)
{
- pc_init1(ram_size, boot_device,
+ pc_init1(get_system_memory(),
+ ram_size, boot_device,
kernel_filename, kernel_cmdline,
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 *cpu_model)
{
- pc_init1(ram_size, boot_device,
+ pc_init1(get_system_memory(),
+ ram_size, boot_device,
kernel_filename, kernel_cmdline,
initrd_filename, cpu_model, 1, 0);
}
@@ -240,7 +240,8 @@ static void pc_init_isa(ram_addr_t ram_size,
{
if (cpu_model == NULL)
cpu_model = "486";
- pc_init1(ram_size, boot_device,
+ pc_init1(get_system_memory(),
+ ram_size, boot_device,
kernel_filename, kernel_cmdline,
initrd_filename, cpu_model, 0, 1);
}
--
1.7.5.3
- Re: [Qemu-devel] [PATCH 11/23] memory: add ioeventfd support, (continued)
Re: [Qemu-devel] [PATCH 11/23] memory: add ioeventfd support, Anthony Liguori, 2011/07/25
[Qemu-devel] [PATCH 15/23] exec.c: initialize memory map, Avi Kivity, 2011/07/25
[Qemu-devel] [PATCH 12/23] memory: separate building the final memory map into two steps, Avi Kivity, 2011/07/25
[Qemu-devel] [PATCH 19/23] pc: move global memory map out of pc_init1() and into its callers,
Avi Kivity <=
[Qemu-devel] [PATCH 03/23] memory: merge adjacent segments of a single memory region, Avi Kivity, 2011/07/25
[Qemu-devel] [PATCH 20/23] pci: pass address space to pci bus when created, Avi Kivity, 2011/07/25
[Qemu-devel] [PATCH 08/23] memory: I/O address space support, Avi Kivity, 2011/07/25
[Qemu-devel] [PATCH 21/23] pci: add MemoryRegion based BAR management API, Avi Kivity, 2011/07/25