From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:51313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAN0o-0007KL-NY for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAN0e-0008CP-N2 for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAN0d-0008B9-EC for qemu-devel@nongnu.org; Sun, 02 Oct 2011 10:27:16 -0400 From: Avi Kivity Date: Sun, 2 Oct 2011 16:26:45 +0200 Message-Id: <1317565616-12997-15-git-send-email-avi@redhat.com> In-Reply-To: <1317565616-12997-1-git-send-email-avi@redhat.com> References: <1317565616-12997-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 14/25] sun4u: Pass address_space_mem to sun4uv_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori From: Richard Henderson Signed-off-by: Richard Henderson Signed-off-by: Avi Kivity --- hw/sun4u.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 28a5374..88c633d 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -736,7 +736,8 @@ static void ram_register_devices(void) 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, @@ -771,7 +772,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++; } @@ -876,7 +877,7 @@ static void sun4u_init(ram_addr_t RAM_size, 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(get_system_memory(), RAM_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &hwdefs[0]); } @@ -886,7 +887,7 @@ static void sun4v_init(ram_addr_t RAM_size, 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(get_system_memory(), RAM_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &hwdefs[1]); } @@ -896,7 +897,7 @@ static void niagara_init(ram_addr_t RAM_size, 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(get_system_memory(), RAM_size, boot_devices, kernel_filename, kernel_cmdline, initrd_filename, cpu_model, &hwdefs[2]); } -- 1.7.6.3