From 8294a64d7f9ecc428cd58ba36ad0b913084a8824 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 9 May 2012 18:23:06 +0300 Subject: vga: fix vram double-mapping with -vga std and -M pc-0.12 With pc-0.12, we map the video RAM both through the PCI BAR (the guest does this) and through a fixed mapping at 0xe0000000. The memory API doesn't allow this double map, and aborts. Fix by using an alias. Reported-by: Michael Tokarev Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori --- hw/vga_int.h | 1 + 1 file changed, 1 insertion(+) (limited to 'hw/vga_int.h') diff --git a/hw/vga_int.h b/hw/vga_int.h index 7685b2b..d244d8f 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -105,6 +105,7 @@ typedef struct VGACommonState { MemoryRegion *legacy_address_space; uint8_t *vram_ptr; MemoryRegion vram; + MemoryRegion vram_vbe; uint32_t vram_size; uint32_t latch; MemoryRegion *chain4_alias; -- cgit v1.1