diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2016-07-04 11:42:52 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-07-12 09:24:31 +0200 |
| commit | cde8dcbc926d9b960a96c7d637b9c23515e06c0b (patch) | |
| tree | 92c22e333fbfe775cf868ce262bd28af3037ba99 /backends | |
| parent | f1ef55786691a1bf79db0b74ba1e5347a0d38c1b (diff) | |
msmouse: add MouseState, unregister handler on close
Add struct to track serial mouse state. Store mouse event handler
there. Unregister properly on chardev close.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1467625375-31774-2-git-send-email-kraxel@redhat.com
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/msmouse.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/backends/msmouse.c b/backends/msmouse.c index 8dea5a130f..731784ff6c 100644 --- a/backends/msmouse.c +++ b/backends/msmouse.c @@ -29,6 +29,11 @@ #define MSMOUSE_LO6(n) ((n) & 0x3f) #define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6) +typedef struct { + CharDriverState *chr; + QEMUPutMouseEntry *entry; +} MouseState; + static void msmouse_event(void *opaque, int dx, int dy, int dz, int buttons_state) { @@ -60,7 +65,11 @@ static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int static void msmouse_chr_close (struct CharDriverState *chr) { - g_free (chr); + MouseState *mouse = chr->opaque; + + qemu_remove_mouse_event_handler(mouse->entry); + g_free(mouse); + g_free(chr); } static CharDriverState *qemu_chr_open_msmouse(const char *id, @@ -69,17 +78,20 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id, Error **errp) { ChardevCommon *common = backend->u.msmouse.data; + MouseState *mouse; CharDriverState *chr; chr = qemu_chr_alloc(common, errp); - if (!chr) { - return NULL; - } chr->chr_write = msmouse_chr_write; chr->chr_close = msmouse_chr_close; chr->explicit_be_open = true; - qemu_add_mouse_event_handler(msmouse_event, chr, 0, "QEMU Microsoft Mouse"); + mouse = g_new0(MouseState, 1); + mouse->entry = qemu_add_mouse_event_handler(msmouse_event, chr, 0, + "QEMU Microsoft Mouse"); + + mouse->chr = chr; + chr->opaque = mouse; return chr; } |