mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -06:00
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 <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
9ae84f0a6d
commit
4516e45f82
1 changed files with 4 additions and 2 deletions
|
@ -2585,9 +2585,11 @@ static void map_linear_vram(CirrusVGAState *s)
|
||||||
|
|
||||||
static void unmap_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;
|
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,
|
cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000,
|
||||||
s->vga.vga_io_memory);
|
s->vga.vga_io_memory);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue