From patchwork Tue Jun 14 12:51:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9175771 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 39F5D60573 for ; Tue, 14 Jun 2016 12:52:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A2A124151 for ; Tue, 14 Jun 2016 12:52:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F09F28047; Tue, 14 Jun 2016 12:52:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=2.0 tests=BAYES_00,FSL_HELO_HOME, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B2D5024151 for ; Tue, 14 Jun 2016 12:52:18 +0000 (UTC) Received: from localhost ([::1]:35035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCnpJ-0000le-Ny for patchwork-qemu-devel@patchwork.kernel.org; Tue, 14 Jun 2016 08:52:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCnom-0000fj-1E for qemu-devel@nongnu.org; Tue, 14 Jun 2016 08:51:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCnog-0003R6-UM for qemu-devel@nongnu.org; Tue, 14 Jun 2016 08:51:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCnog-0003Qw-Ob for qemu-devel@nongnu.org; Tue, 14 Jun 2016 08:51:38 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B48D4C04B303; Tue, 14 Jun 2016 12:51:37 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-18.ams2.redhat.com [10.36.116.18]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5ECpaSo025344; Tue, 14 Jun 2016 08:51:37 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 73D7181F5F; Tue, 14 Jun 2016 14:51:36 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 14 Jun 2016 14:51:24 +0200 Message-Id: <1465908686-14799-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 14 Jun 2016 12:51:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] msmouse: add MouseState, unregister handler on close X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann , Anatoly Gusev Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add struct to track serial mouse state. Store mouse event handler there. Unregister properly on chardev close. Signed-off-by: Gerd Hoffmann Acked-by: Paolo Bonzini --- backends/msmouse.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/backends/msmouse.c b/backends/msmouse.c index 8dea5a1..731784f 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; }