From 4c08fd1e42a886bccc02e5fe18e98b948c252986 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 21 Sep 2011 20:49:32 +0200 Subject: cirrus: Unbreak ISA support Do not try to map against the PCI bar in the ISA version of the device. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- hw/cirrus_vga.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/cirrus_vga.c') diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index ec7ea8207b..c7e365b2a6 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2401,7 +2401,7 @@ static void map_linear_vram_bank(CirrusVGAState *s, unsigned bank) static void map_linear_vram(CirrusVGAState *s) { - if (!s->linear_vram) { + if (s->bustype == CIRRUS_BUSTYPE_PCI && !s->linear_vram) { s->linear_vram = true; memory_region_add_subregion_overlap(&s->pci_bar, 0, &s->vga.vram, 1); } @@ -2411,7 +2411,7 @@ static void map_linear_vram(CirrusVGAState *s) static void unmap_linear_vram(CirrusVGAState *s) { - if (s->linear_vram) { + if (s->bustype == CIRRUS_BUSTYPE_PCI && s->linear_vram) { s->linear_vram = false; memory_region_del_subregion(&s->pci_bar, &s->vga.vram); } -- cgit v1.2.3