diff options
| author | Peter Maydell | 2017-09-14 13:58:13 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-09-14 13:58:13 +0200 |
| commit | bcf9e2c0a5f8de395842e034ca15be13d1fc5f90 (patch) | |
| tree | 0516090ffe4ea4fb5d33678cffc9ee18d31855f1 /hw/display/vga_int.h | |
| parent | tcg/tci: do not use ldst label (never implemented) (diff) | |
| parent | virtio-gpu: don't clear QemuUIInfo information on reset (diff) | |
| download | qemu-bcf9e2c0a5f8de395842e034ca15be13d1fc5f90.tar.gz qemu-bcf9e2c0a5f8de395842e034ca15be13d1fc5f90.tar.xz qemu-bcf9e2c0a5f8de395842e034ca15be13d1fc5f90.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20170913-pull-request' into staging
vga: bugfixes.
qxl: chunked cursor support.
# gpg: Signature made Wed 13 Sep 2017 08:41:08 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20170913-pull-request:
virtio-gpu: don't clear QemuUIInfo information on reset
vga/migration: Update memory map in post_load
qxl: add support for chunked cursors.
qxl: drop mono cursor support
vga: stop passing pointers to vga_draw_line* functions
vga: fix display update region calculation (split screen)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/vga_int.h')
| -rw-r--r-- | hw/display/vga_int.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index dd6c958da3..ad34a1f048 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -94,6 +94,7 @@ typedef struct VGACommonState { uint32_t vram_size; uint32_t vram_size_mb; /* property */ uint32_t vbe_size; + uint32_t vbe_size_mask; uint32_t latch; bool has_chain4_alias; MemoryRegion chain4_alias; |