From patchwork Fri Mar 11 13:10:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 86418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AEF67B6EDD for ; Sat, 12 Mar 2011 00:12:06 +1100 (EST) Received: from localhost ([127.0.0.1]:34119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Py28Q-0007OU-Jv for incoming@patchwork.ozlabs.org; Fri, 11 Mar 2011 08:12:02 -0500 Received: from [140.186.70.92] (port=45398 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Py27i-0007OM-RI for qemu-devel@nongnu.org; Fri, 11 Mar 2011 08:11:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Py27h-0000nC-Os for qemu-devel@nongnu.org; Fri, 11 Mar 2011 08:11:18 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:35135) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Py27h-0000n2-KG for qemu-devel@nongnu.org; Fri, 11 Mar 2011 08:11:17 -0500 X-IronPort-AV: E=Sophos;i="4.62,303,1297054800"; d="scan'208";a="139780029" Received: from ftlpexchmx02.citrite.net ([10.9.154.127]) by FTLPIPO02.CITRIX.COM with ESMTP; 11 Mar 2011 08:11:16 -0500 Received: from smtp01.ad.xensource.com ([10.219.128.104]) by FTLPEXCHMX02.citrite.net with Microsoft SMTPSVC(6.0.3790.4675); Fri, 11 Mar 2011 08:11:16 -0500 Received: from localhost.localdomain (kaball.uk.xensource.com [10.80.2.59]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id p2BDBB98005617; Fri, 11 Mar 2011 05:11:15 -0800 From: stefano.stabellini@eu.citrix.com To: qemu-devel@nongnu.org Date: Fri, 11 Mar 2011 13:10:42 +0000 Message-Id: <1299849042-2001-2-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1299849042-2001-1-git-send-email-stefano.stabellini@eu.citrix.com> References: <1299849042-2001-1-git-send-email-stefano.stabellini@eu.citrix.com> X-OriginalArrivalTime: 11 Mar 2011 13:11:16.0761 (UTC) FILETIME=[CE105090:01CBDFED] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Cc: john.haxby@oracle.com, Stefano.Stabellini@eu.citrix.com Subject: [Qemu-devel] [PATCH 2/2][REPOST] Move the xenfb pointer handler to the connected method X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: John Haxby Ensure that we read "request-abs-pointer" after the frontend has written it. This means that we will correctly set up an ansolute or relative pointer handler correctly. Signed-off-by: John Haxby Acked-by: Stefano Stabellini --- hw/xenfb.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index b535d8c..72e5277 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -364,19 +364,27 @@ static int input_initialise(struct XenDevice *xendev) struct XenInput *in = container_of(xendev, struct XenInput, c.xendev); int rc; - if (xenstore_read_fe_int(xendev, "request-abs-pointer", - &in->abs_pointer_wanted) == -1) - in->abs_pointer_wanted = 0; - rc = common_bind(&in->c); if (rc != 0) return rc; qemu_add_kbd_event_handler(xenfb_key_event, in); + return 0; +} + +static void input_connected(struct XenDevice *xendev) +{ + struct XenInput *in = container_of(xendev, struct XenInput, c.xendev); + + if (xenstore_read_fe_int(xendev, "request-abs-pointer", + &in->abs_pointer_wanted) == -1) + in->abs_pointer_wanted = 0; + + if (in->qmouse) + qemu_remove_mouse_event_handler(in->qmouse); in->qmouse = qemu_add_mouse_event_handler(xenfb_mouse_event, in, in->abs_pointer_wanted, "Xen PVFB Mouse"); - return 0; } static void input_disconnect(struct XenDevice *xendev) @@ -956,6 +964,7 @@ struct XenDevOps xen_kbdmouse_ops = { .size = sizeof(struct XenInput), .init = input_init, .initialise = input_initialise, + .connected = input_connected, .disconnect = input_disconnect, .event = input_event, };