From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWSjq-0005Fu-4y for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWSjl-0005Ds-Ic for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:53 -0400 Received: from [199.232.76.173] (port=34916 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWSjl-0005Dl-7S for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:49 -0400 Received: from mx2.redhat.com ([66.187.237.31]:41342) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MWSjk-0008Ge-Iq for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:48 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6UAJmmT002802 for ; Thu, 30 Jul 2009 06:19:48 -0400 From: Zachary Amsden Date: Thu, 30 Jul 2009 00:15:06 -1000 Message-Id: <1248948912-7877-9-git-send-email-zamsden@redhat.com> In-Reply-To: <1248948912-7877-8-git-send-email-zamsden@redhat.com> References: <1248948912-7877-1-git-send-email-zamsden@redhat.com> <1248948912-7877-2-git-send-email-zamsden@redhat.com> <1248948912-7877-3-git-send-email-zamsden@redhat.com> <1248948912-7877-4-git-send-email-zamsden@redhat.com> <1248948912-7877-5-git-send-email-zamsden@redhat.com> <1248948912-7877-6-git-send-email-zamsden@redhat.com> <1248948912-7877-7-git-send-email-zamsden@redhat.com> <1248948912-7877-8-git-send-email-zamsden@redhat.com> Subject: [Qemu-devel] [PATCH 08/14] Make VGA vram offset passed into vga_mm_init absolute. Since this is a function of the platform, it makes sense to have it be explicitly known in the platform layer rather than hardcoded inside the vga code. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zamsden@redhat.com Signed-off-by: Zachary Amsden --- hw/mips_jazz.c | 2 +- hw/vga.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 2b4e1e0..0470a3f 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -200,7 +200,7 @@ void mips_jazz_init (ram_addr_t ram_size, g364fb_mm_init(0x40000000, 0x60000000, 0, rc4030[3]); break; case JAZZ_PICA61: - isa_vga_mm_init(0x40000000, 0x60000000, 0); + isa_vga_mm_init(0x400a0000, 0x60000000, 0); break; default: break; diff --git a/hw/vga.c b/hw/vga.c index 9b50959..52fb1c4 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2433,8 +2433,8 @@ static void vga_mm_init(VGAState *s, target_phys_addr_t vram_base, vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s); cpu_register_physical_memory(ctrl_base, 0x100000, s_ioport_ctrl); - cpu_register_physical_memory(vram_base + 0x000a0000, 0x20000, vga_io_memory); - qemu_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000); + cpu_register_physical_memory(vram_base, 0x20000, vga_io_memory); + qemu_register_coalesced_mmio(vram_base, 0x20000); } int isa_vga_init(void) -- 1.6.2.5