From patchwork Thu Aug 11 07:03:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 109556 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B9C7B70B9 for ; Thu, 11 Aug 2011 17:21:41 +1000 (EST) Received: from localhost ([::1]:60651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrPaE-0004es-I3 for incoming@patchwork.ozlabs.org; Thu, 11 Aug 2011 03:21:38 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrPa8-0004eZ-G6 for qemu-devel@nongnu.org; Thu, 11 Aug 2011 03:21:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrPa7-0001hX-FI for qemu-devel@nongnu.org; Thu, 11 Aug 2011 03:21:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62785) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrPa7-0001hT-5m for qemu-devel@nongnu.org; Thu, 11 Aug 2011 03:21:31 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7B73mjF011308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 11 Aug 2011 03:03:48 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-16.ams2.redhat.com [10.36.116.16]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7B73l0u004979; Thu, 11 Aug 2011 03:03:47 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 4075841B22; Thu, 11 Aug 2011 09:03:46 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 11 Aug 2011 09:03:40 +0200 Message-Id: <1313046225-1064-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1313046225-1064-1-git-send-email-kraxel@redhat.com> References: <1313046225-1064-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/6] usb/hid: add hid_pointer_activate, use it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org HID reorganziation broke the usb tablet in windows xp. The reason is that xp activates idle before it starts polling, which creates a chicken-and-egg issue: We don't call hid_pointer_poll because there are no pending events. We don't get any events because the activation code in hid_pointer_poll is never executed and thus all pointer events are routed to the PS/2 mouse by qemu. Fix this by creating a hid_pointer_activate function and call it from usb-hid when the guest sets the idle state. Signed-off-by: Gerd Hoffmann --- hw/hid.c | 13 +++++++++---- hw/hid.h | 1 + hw/usb-hid.c | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/hw/hid.c b/hw/hid.c index 7b5ef5f..77339f7 100644 --- a/hw/hid.c +++ b/hw/hid.c @@ -218,16 +218,21 @@ static inline int int_clamp(int val, int vmin, int vmax) } } +void hid_pointer_activate(HIDState *hs) +{ + if (!hs->ptr.mouse_grabbed) { + qemu_activate_mouse_event_handler(hs->ptr.eh_entry); + hs->ptr.mouse_grabbed = 1; + } +} + int hid_pointer_poll(HIDState *hs, uint8_t *buf, int len) { int dx, dy, dz, b, l; int index; HIDPointerEvent *e; - if (!hs->ptr.mouse_grabbed) { - qemu_activate_mouse_event_handler(hs->ptr.eh_entry); - hs->ptr.mouse_grabbed = 1; - } + hid_pointer_activate(hs); /* When the buffer is empty, return the last event. Relative movements will all be zero. */ diff --git a/hw/hid.h b/hw/hid.h index 4a8fa5b..9ce03b1 100644 --- a/hw/hid.h +++ b/hw/hid.h @@ -51,6 +51,7 @@ void hid_free(HIDState *hs); bool hid_has_events(HIDState *hs); void hid_set_next_idle(HIDState *hs, int64_t curtime); +void hid_pointer_activate(HIDState *hs); int hid_pointer_poll(HIDState *hs, uint8_t *buf, int len); int hid_keyboard_poll(HIDState *hs, uint8_t *buf, int len); int hid_keyboard_write(HIDState *hs, uint8_t *buf, int len); diff --git a/hw/usb-hid.c b/hw/usb-hid.c index e5d57de..6f12751 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -454,6 +454,9 @@ static int usb_hid_handle_control(USBDevice *dev, USBPacket *p, case SET_IDLE: hs->idle = (uint8_t) (value >> 8); hid_set_next_idle(hs, qemu_get_clock_ns(vm_clock)); + if (hs->kind == HID_MOUSE || hs->kind == HID_TABLET) { + hid_pointer_activate(hs); + } ret = 0; break; default: