david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cirrus: Unbreak ISA support

Browse Source 
Do not try to map against the PCI bar in the ISA version of the device.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2011-09-21 20:49:32 +02:00 committed by Anthony Liguori
parent 53d6e68255
commit 4c08fd1e42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/cirrus_vga.c
View File

@ -2401,7 +2401,7 @@ static void map_linear_vram_bank(CirrusVGAState *s, unsigned bank)
static void map_linear_vram(CirrusVGAState *s) static void map_linear_vram(CirrusVGAState *s)
{ {
if (!s->linear_vram) { if (s->bustype == CIRRUS_BUSTYPE_PCI && !s->linear_vram) {
s->linear_vram = true; s->linear_vram = true;
memory_region_add_subregion_overlap(&s->pci_bar, 0, &s->vga.vram, 1); 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) static void unmap_linear_vram(CirrusVGAState *s)
{ {
if (s->linear_vram) { if (s->bustype == CIRRUS_BUSTYPE_PCI && s->linear_vram) {
s->linear_vram = false; s->linear_vram = false;
memory_region_del_subregion(&s->pci_bar, &s->vga.vram); memory_region_del_subregion(&s->pci_bar, &s->vga.vram);
} }