From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWSjn-0005EY-3D for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWSji-0005Ck-Fi for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:50 -0400 Received: from [199.232.76.173] (port=34914 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWSji-0005Cf-CP for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:46 -0400 Received: from mx2.redhat.com ([66.187.237.31]:41341) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MWSjh-0008FY-Ub for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:46 -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 n6UAJjok002792 for ; Thu, 30 Jul 2009 06:19:45 -0400 From: Zachary Amsden Date: Thu, 30 Jul 2009 00:15:05 -1000 Message-Id: <1248948912-7877-8-git-send-email-zamsden@redhat.com> In-Reply-To: <1248948912-7877-7-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> Subject: [Qemu-devel] [PATCH 07/14] Code motion; make mm VGA init function more like standard vga init function. Add missing vga_reset hook to vga_mm_init. 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/vga.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index 33645a0..9b50959 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2422,14 +2422,17 @@ static void vga_mm_init(VGAState *s, target_phys_addr_t vram_base, { int s_ioport_ctrl, vga_io_memory; + qemu_register_reset(vga_reset, 0, s); + register_savevm("vga", 0, 2, vga_save, vga_load, s); + + s->bank_offset = 0; + s->it_shift = it_shift; s_ioport_ctrl = cpu_register_io_memory(vga_mm_read_ctrl, vga_mm_write_ctrl, s); - vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s); - register_savevm("vga", 0, 2, vga_save, vga_load, s); + vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s); cpu_register_physical_memory(ctrl_base, 0x100000, s_ioport_ctrl); - s->bank_offset = 0; cpu_register_physical_memory(vram_base + 0x000a0000, 0x20000, vga_io_memory); qemu_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000); } -- 1.6.2.5