[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 9/9] sun4u: Pass address_space_mem to sun4uv_init.
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 9/9] sun4u: Pass address_space_mem to sun4uv_init. |
Date: |
Thu, 11 Aug 2011 16:07:21 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
hw/sun4u.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 346d6d9..6739ba2 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -38,7 +38,6 @@
#include "loader.h"
#include "elf.h"
#include "blockdev.h"
-#include "exec-memory.h"
//#define DEBUG_IRQ
//#define DEBUG_EBUS
@@ -732,7 +731,8 @@ static CPUState *cpu_devinit(const char *cpu_model, const
struct hwdef *hwdef)
return env;
}
-static void sun4uv_init(ram_addr_t RAM_size,
+static void sun4uv_init(MemoryRegion *address_space_mem,
+ ram_addr_t RAM_size,
const char *boot_devices,
const char *kernel_filename, const char
*kernel_cmdline,
const char *initrd_filename, const char *cpu_model,
@@ -768,7 +768,7 @@ static void sun4uv_init(ram_addr_t RAM_size,
i = 0;
if (hwdef->console_serial_base) {
- serial_mm_init(get_system_memory(), hwdef->console_serial_base, 0,
+ serial_mm_init(address_space_mem, hwdef->console_serial_base, 0,
NULL, 115200, serial_hds[i], DEVICE_BIG_ENDIAN);
i++;
}
@@ -875,7 +875,7 @@ static void sun4u_init(MemoryRegion *address_space_mem,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
- sun4uv_init(RAM_size, boot_devices, kernel_filename,
+ sun4uv_init(address_space_mem, RAM_size, boot_devices, kernel_filename,
kernel_cmdline, initrd_filename, cpu_model, &hwdefs[0]);
}
@@ -887,7 +887,7 @@ static void sun4v_init(MemoryRegion *address_space_mem,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
- sun4uv_init(RAM_size, boot_devices, kernel_filename,
+ sun4uv_init(address_space_mem, RAM_size, boot_devices, kernel_filename,
kernel_cmdline, initrd_filename, cpu_model, &hwdefs[1]);
}
@@ -899,7 +899,7 @@ static void niagara_init(MemoryRegion *address_space_mem,
const char *kernel_filename, const char
*kernel_cmdline,
const char *initrd_filename, const char *cpu_model)
{
- sun4uv_init(RAM_size, boot_devices, kernel_filename,
+ sun4uv_init(address_space_mem, RAM_size, boot_devices, kernel_filename,
kernel_cmdline, initrd_filename, cpu_model, &hwdefs[2]);
}
--
1.7.6
- [Qemu-devel] [PATCH 0/9] Convert serial_mm_init to MemoryRegion, Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 1/9] serial: Convert serial_mm_init to MemoryRegion., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 2/9] serial: Use enum device_endian in serial_mm_init parameter., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 5/9] ppc405: Pass in address_space_mem to ppc405{cr, ep}_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 4/9] serial: Add MemoryRegion parameter to serial_mm_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 6/9] ppc440: Pass in address_space_mem to ppc440ep_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 7/9] pxa: Pass in address_space to pxa{255, 270}_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 9/9] sun4u: Pass address_space_mem to sun4uv_init.,
Richard Henderson <=
- [Qemu-devel] [PATCH 8/9] sm501: Pass address_space_mem to sm501_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 3/9] serial: Remove ioregister parameter from serial_mm_init., Richard Henderson, 2011/08/11
- Re: [Qemu-devel] [PATCH 0/9] Convert serial_mm_init to MemoryRegion, Avi Kivity, 2011/08/14