[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 19/23] pc: move global memory map out of pc_init1
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 19/23] pc: move global memory map out of pc_init1() and into its callers |
Date: |
Tue, 26 Jul 2011 14:26:18 +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
- [Qemu-devel] [PATCH v2 10/23] memory: add backward compatibility for old portio registration, (continued)
- [Qemu-devel] [PATCH v2 10/23] memory: add backward compatibility for old portio registration, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 17/23] pc: grab system_memory, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 08/23] memory: late initialization of ram_addr, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 11/23] memory: add backward compatibility for old mmio registration, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 13/23] memory: separate building the final memory map into two steps, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 06/23] memory: abstract address space operations, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 14/23] memory: transaction API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 09/23] memory: I/O address space support, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 15/23] exec.c: initialize memory map, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 05/23] Internal interfaces for memory API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 19/23] pc: move global memory map out of pc_init1() and into its callers,
Avi Kivity <=
- [Qemu-devel] [PATCH v2 02/23] Hierarchical memory region API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 07/23] memory: rename MemoryRegion::has_ram_addr to ::terminates, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 22/23] sysbus: add MemoryRegion based memory management API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 18/23] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 23/23] usb-ohci: convert to MemoryRegion, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 20/23] pci: pass address space to pci bus when created, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 16/23] ioport: register ranges by byte aligned addresses always, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 21/23] pci: add MemoryRegion based BAR management API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 12/23] memory: add ioeventfd support, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 01/23] Add memory API documentation, Avi Kivity, 2011/07/26