From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Narau-0002Ep-9H for qemu-devel@nongnu.org; Fri, 29 Jan 2010 09:13:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Narap-0002Bf-Pj for qemu-devel@nongnu.org; Fri, 29 Jan 2010 09:13:07 -0500 Received: from [199.232.76.173] (port=47090 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Narap-0002BY-IO for qemu-devel@nongnu.org; Fri, 29 Jan 2010 09:13:03 -0500 Received: from thoth.sbs.de ([192.35.17.2]:21588) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Narao-0002qo-1N for qemu-devel@nongnu.org; Fri, 29 Jan 2010 09:13:02 -0500 Message-ID: <4B62ECE0.9060306@siemens.com> Date: Fri, 29 Jan 2010 15:12:48 +0100 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH][STABLE] cirrus: Properly re-register cirrus_linear_io_addr on vram unmap List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Glauber Costa , rene@exactcode.de, qemu-devel , Alexander Graf This fixes CONFIG_FB_CIRRUS for Linux guests and probably much more: When switching away from linearly mapped vram, we also have to restore the I/O handlers for the LFB. This regression was once introduced by commit 2bec46dc97. Signed-off-by: Jan Kiszka --- hw/cirrus_vga.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 6fe433d..9f61a01 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2585,9 +2585,11 @@ static void map_linear_vram(CirrusVGAState *s) static void unmap_linear_vram(CirrusVGAState *s) { - if (s->vga.map_addr && s->vga.lfb_addr && s->vga.lfb_end) + if (s->vga.map_addr && s->vga.lfb_addr && s->vga.lfb_end) { s->vga.map_addr = s->vga.map_end = 0; - + cpu_register_physical_memory(s->vga.lfb_addr, s->vga.vram_size, + s->cirrus_linear_io_addr); + } cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000, s->vga.vga_io_memory); }