diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-07 21:39:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-07 21:39:28 +0100 |
| commit | a6f6d24757a73f7176989134b97284a1a7df11e5 (patch) | |
| tree | 0ff1de73d0b2d8623b0e237d1c5c3fb6ce779696 /include | |
| parent | d6de7fed802f2bf42efdc0d081c67dc2ecf01e3f (diff) | |
| parent | 6306cae275c7091aa4e785809d956b475bfedab4 (diff) | |
| download | qemu-a6f6d24757a73f7176989134b97284a1a7df11e5.zip qemu-a6f6d24757a73f7176989134b97284a1a7df11e5.tar.gz qemu-a6f6d24757a73f7176989134b97284a1a7df11e5.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190507-pull-request' into staging
vga: bugfixes for qxl, cirrus, ati.
vga: add "-vga help" support.
vga: move i2c-ddc to display.
# gpg: Signature made Tue 07 May 2019 09:19:32 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20190507-pull-request:
i2c-ddc: move it to hw/display
ati-vga: Fix check for blt outside vram
qxl: avoid unaligned pointer reads/writes
vl: add -vga help support
vl: constify VGAInterfaceInfo
hw/display/cirrus_vga: Remove unused include
hw/display/cirrus_vga: Update the documentation URL
qxl: check release info object
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/display/i2c-ddc.h (renamed from include/hw/i2c/i2c-ddc.h) | 0 | ||||
| -rw-r--r-- | include/hw/display/xlnx_dp.h | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/i2c/i2c-ddc.h b/include/hw/display/i2c-ddc.h index c29443c..c29443c 100644 --- a/include/hw/i2c/i2c-ddc.h +++ b/include/hw/display/i2c-ddc.h diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index 26b759c..45a8050 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -27,7 +27,7 @@ #include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" #include "hw/display/dpcd.h" -#include "hw/i2c/i2c-ddc.h" +#include "hw/display/i2c-ddc.h" #include "qemu/fifo8.h" #include "qemu/units.h" #include "hw/dma/xlnx_dpdma.h" |