diff options
| author | Peter Maydell | 2019-01-10 17:29:02 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-10 17:29:02 +0100 |
| commit | 823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18 (patch) | |
| tree | 44752f55b4f9ad23f009ee69adbe1479ce1eac7c /include/ui/qemu-spice.h | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-reque... (diff) | |
| parent | spice: Remove unused include (diff) | |
| download | qemu-823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18.tar.gz qemu-823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18.tar.xz qemu-823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18.zip | |
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/ui/qemu-spice.h')
| -rw-r--r-- | include/ui/qemu-spice.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index c6d50eb87a..8c23dfe717 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 */ |