From patchwork Tue Jul 12 08:21:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 647226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rpZn427TTz9s9N for ; Tue, 12 Jul 2016 18:26:32 +1000 (AEST) Received: from localhost ([::1]:38369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMt1S-0004SX-10 for incoming@patchwork.ozlabs.org; Tue, 12 Jul 2016 04:26:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMsx1-0007RV-7h for qemu-devel@nongnu.org; Tue, 12 Jul 2016 04:21:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMswx-00048m-0R for qemu-devel@nongnu.org; Tue, 12 Jul 2016 04:21:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMsww-00048Y-RG for qemu-devel@nongnu.org; Tue, 12 Jul 2016 04:21:50 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 598C77D0FC for ; Tue, 12 Jul 2016 08:21:50 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-18.ams2.redhat.com [10.36.116.18]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6C8Llw1024797; Tue, 12 Jul 2016 04:21:49 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 67FA180F63; Tue, 12 Jul 2016 10:21:45 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 12 Jul 2016 10:21:36 +0200 Message-Id: <1468311703-27209-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1468311703-27209-1-git-send-email-kraxel@redhat.com> References: <1468311703-27209-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 12 Jul 2016 08:21:50 +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] [PULL 1/8] 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Message-id: 1467625375-31774-2-git-send-email-kraxel@redhat.com --- 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; }