From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWTQO-00074h-M7 for qemu-devel@nongnu.org; Thu, 30 Jul 2009 07:03:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWTQI-0006yh-Mh for qemu-devel@nongnu.org; Thu, 30 Jul 2009 07:03:50 -0400 Received: from [199.232.76.173] (port=56420 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWTQI-0006y2-DE for qemu-devel@nongnu.org; Thu, 30 Jul 2009 07:03:46 -0400 Received: from goliath.siemens.de ([192.35.17.28]:17311) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MWTQH-0000ju-Fs for qemu-devel@nongnu.org; Thu, 30 Jul 2009 07:03:45 -0400 Message-ID: <4A717E0F.3020101@siemens.com> Date: Thu, 30 Jul 2009 13:03:43 +0200 From: Jan Kiszka MIME-Version: 1.0 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> In-Reply-To: <1248948912-7877-8-git-send-email-zamsden@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [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: Zachary Amsden Cc: qemu-devel@nongnu.org Zachary Amsden wrote: > 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); vga users like cirrus or vmware invoke reset too. You probably want to drop those calls now. And did you check that vga_reset is still always invoked before any vga user reset callback? > + 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); > } Jan -- Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux