From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LPhr2-0003DF-FX
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 13:31:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LPhr1-0003C6-Kf
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 13:31:07 -0500
Received: from [199.232.76.173] (port=47367 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LPhr1-0003Bn-E3
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 13:31:07 -0500
Received: from savannah.gnu.org ([199.232.41.3]:44302 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LPhr1-0005JC-4q
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 13:31:07 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LPhr0-0003R1-LD
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 18:31:06 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LPhr0-0003Qw-Ap
	for qemu-devel@nongnu.org; Wed, 21 Jan 2009 18:31:06 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LPhr0-0003Qw-Ap@cvs.savannah.gnu.org>
Date: Wed, 21 Jan 2009 18:31:06 +0000
Subject: [Qemu-devel] [6382] cirrus: unmap vram on reset (Jan Kiszka)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6382
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6382
Author:   aliguori
Date:     2009-01-21 18:31:05 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
cirrus: unmap vram on reset (Jan Kiszka)

Fix the broken text mode after reset by unmapping potentially mapped
vram.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/hw/cirrus_vga.c

Modified: trunk/hw/cirrus_vga.c
===================================================================
--- trunk/hw/cirrus_vga.c	2009-01-21 18:13:16 UTC (rev 6381)
+++ trunk/hw/cirrus_vga.c	2009-01-21 18:31:05 UTC (rev 6382)
@@ -3169,6 +3169,7 @@
     CirrusVGAState *s = opaque;
 
     vga_reset(s);
+    unmap_linear_vram(s);
     s->sr[0x06] = 0x0f;
     if (s->device_id == CIRRUS_ID_CLGD5446) {
         /* 4MB 64 bit memory config, always PCI */