diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-01 11:33:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-01 11:33:16 +0100 |
| commit | cc28dce2eccdcfc2660b8bf680eaa340ef2067d5 (patch) | |
| tree | 53b756fec754323b97115bca4401d57dfca23bcb /hw/display/vga_int.h | |
| parent | e7f5f0b6e6f2fb592ab66145b8bc35a0e4a4e198 (diff) | |
| parent | 36ffc122dcd69ab66db4afab3a13cfca46bfc323 (diff) | |
| download | focaccia-qemu-cc28dce2eccdcfc2660b8bf680eaa340ef2067d5.tar.gz focaccia-qemu-cc28dce2eccdcfc2660b8bf680eaa340ef2067d5.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180927-pull-request' into staging
vga: add edid support, qxl bugfixes. # gpg: Signature made Thu 27 Sep 2018 08:12:32 BST # gpg: using RSA key 4CB6D8EED3E87138 # 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-20180927-pull-request: qxl: support mono cursors with inverted colors qxl: use guest_monitor_config for local renderer. display/stdvga: add edid support. display/edid: add DEFINE_EDID_PROPERTIES display/edid: add region helper. display/edid: add qemu_edid_size() display/edid: add edid generator to qemu. 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 339661bc01..6e4fa48a79 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -197,6 +197,6 @@ void pci_std_vga_mmio_region_init(VGACommonState *s, Object *owner, MemoryRegion *parent, MemoryRegion *subs, - bool qext); + bool qext, bool edid); #endif |