diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-09-01 10:57:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-09-01 10:57:30 +0100 |
| commit | 783aa010ade5e2f8dd33a654882f2a14ab96c0a1 (patch) | |
| tree | 48baaa37a61a47c78a1f706d9789fdaa0cf5112a /include/ui | |
| parent | ec397e90d21269037280633b6058d1f280e27667 (diff) | |
| parent | 01f750f5fef1afd8f6abc0548910f87d473e26d5 (diff) | |
| download | qemu-783aa010ade5e2f8dd33a654882f2a14ab96c0a1.zip qemu-783aa010ade5e2f8dd33a654882f2a14ab96c0a1.tar.gz qemu-783aa010ade5e2f8dd33a654882f2a14ab96c0a1.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210901-pull-request' into staging
vga: misc fixes and cleanups.
# gpg: Signature made Wed 01 Sep 2021 05:18:46 BST
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# 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-20210901-pull-request:
hw/display/artist: Fix bug in coordinate extraction in artist_vram_read() and artist_vram_write()
hw/display/xlnx_dp: fix an out-of-bounds read in xlnx_dp_read
vga: don't abort when adding a duplicate isa-vga device
ui/console: Restrict udmabuf_fd() to Linux
hw/display: Restrict virtio-gpu-udmabuf stubs to !Linux
virtio-gpu: no point of checking res->iov
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui')
| -rw-r--r-- | include/ui/console.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index b30b639..3be2149 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -471,7 +471,9 @@ bool vnc_display_reload_certs(const char *id, Error **errp); /* input.c */ int index_from_key(const char *key, size_t key_length); +#ifdef CONFIG_LINUX /* udmabuf.c */ int udmabuf_fd(void); +#endif #endif |