diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-10 16:29:02 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-10 16:29:02 +0000 |
commit | 823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18 (patch) | |
tree | 44752f55b4f9ad23f009ee69adbe1479ce1eac7c /include | |
parent | d246ff5d3904ea540127228df2bda8af2a294804 (diff) | |
parent | 766a0a54faa97b8d4cbc7a6bd47f7ea78e625c19 (diff) | |
download | qemu-823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18.zip qemu-823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18.tar.gz qemu-823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18.tar.bz2 |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190110-pull-request' into staging
ui: bugfixes, drop keymap include support, drop dead code.
# gpg: Signature made Thu 10 Jan 2019 08:47:10 GMT
# 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/ui-20190110-pull-request:
spice: Remove unused include
keymaps: drop support for include files
keymaps: remove common include
keymaps: drop nl-be map
keymaps: remove modifiers include
ui/console: Remove qemu_create_display_surface_guestmem()
configure: bump spice-server required version to 0.12.5
egl-headless: add egl_create_context
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/ui/console.h | 4 | ||||
-rw-r--r-- | include/ui/qemu-spice.h | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index c17803c..853fcf4 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -257,10 +257,6 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height, pixman_format_code_t format, int linesize, uint8_t *data); DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image); -DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height, - pixman_format_code_t format, - int linesize, - uint64_t addr); DisplaySurface *qemu_create_message_surface(int w, int h, const char *msg); PixelFormat qemu_default_pixelformat(int bpp); diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index c6d50eb..8c23dfe 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -46,13 +46,7 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port, #else #define SPICE_NEEDS_SET_MM_TIME 0 #endif - -#if SPICE_SERVER_VERSION >= 0x000c02 void qemu_spice_register_ports(void); -#else -static inline Chardev *qemu_chr_open_spice_port(const char *name) -{ return NULL; } -#endif #else /* CONFIG_SPICE */ |