From: Jan Kiszka Date: Fri, 29 Jan 2010 14:12:48 +0000 (+0100) Subject: cirrus: Properly re-register cirrus_linear_io_addr on vram unmap X-Git-Tag: v0.12.3~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=299e0bc52a5d56ff89ad8d7d09c82233cd8ccb6a;p=thirdparty%2Fqemu.git cirrus: Properly re-register cirrus_linear_io_addr on vram unmap 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 Signed-off-by: Anthony Liguori (cherry picked from commit 4516e45f82b7ee0cedce875477e785989a719b67) --- diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 6fe433db200..9f61a01d45a 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); }