diff options
| author | Avi Kivity <avi@redhat.com> | 2012-05-09 18:23:06 +0300 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-29 20:19:24 -0500 |
| commit | 8294a64d7f9ecc428cd58ba36ad0b913084a8824 (patch) | |
| tree | 47ce59f81adfdcade3d2eb282acac53bbfe6d974 /hw/vga_int.h | |
| parent | 1c4ad9d2b4b5f2be08588a91e4193d13cc314282 (diff) | |
| download | qemu-8294a64d7f9ecc428cd58ba36ad0b913084a8824.zip qemu-8294a64d7f9ecc428cd58ba36ad0b913084a8824.tar.gz qemu-8294a64d7f9ecc428cd58ba36ad0b913084a8824.tar.bz2 | |
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 <mjt@tls.msk.ru>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/vga_int.h')
| -rw-r--r-- | hw/vga_int.h | 1 |
1 files changed, 1 insertions, 0 deletions
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; |