From patchwork Fri Jan 29 14:12:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [STABLE] cirrus: Properly re-register cirrus_linear_io_addr on vram unmap Date: Fri, 29 Jan 2010 04:12:48 -0000 From: Jan Kiszka X-Patchwork-Id: 43915 Message-Id: <4B62ECE0.9060306@siemens.com> 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); }