diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-14 13:56:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-14 13:56:06 +0100 |
| commit | 57c98ea9acdcef5021f5671efa6475a5794a51c4 (patch) | |
| tree | 4cb23c03c0eb6be23d365acf566750d6d1a70ab2 /ui/input-linux.c | |
| parent | 96292515c07e3a99f5a29540ed2f257b1ff75111 (diff) | |
| parent | 41d004d8af59885da2c21460a73898b1aa09690f (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20201014-pull-request' into staging
ui: fixes for sdl, curses, vnc, input-linux.
# gpg: Signature made Wed 14 Oct 2020 09:21:35 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/ui-20201014-pull-request:
ui: Fix default window_id value
input-linux: Reset il->fd handler before closing it
SDL: enable OpenGL context creation
vnc-stubs: Allow -vnc none
configure: Fixes ncursesw detection under msys2/mingw by convert them to meson
win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE are defined on msys2/mingw
curses: Fixes curses compiling errors.
curses: Fixes compiler error that complain don't have langinfo.h on msys2/mingw
qemu-edid: drop cast
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-linux.c')
| -rw-r--r-- | ui/input-linux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/input-linux.c b/ui/input-linux.c index ab351a4187..34cc531190 100644 --- a/ui/input-linux.c +++ b/ui/input-linux.c @@ -418,6 +418,7 @@ static void input_linux_instance_finalize(Object *obj) if (il->initialized) { QTAILQ_REMOVE(&inputs, il, next); + qemu_set_fd_handler(il->fd, NULL, NULL, NULL); close(il->fd); } g_free(il->evdev); |