From patchwork Thu Sep 27 15:25:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 187400 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 706182C00A8 for ; Fri, 28 Sep 2012 01:24:57 +1000 (EST) Received: from localhost ([::1]:49539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THFxP-0000L3-E8 for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 11:24:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THFx8-0008Vc-MW for qemu-devel@nongnu.org; Thu, 27 Sep 2012 11:24:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THFwu-0004fH-Tr for qemu-devel@nongnu.org; Thu, 27 Sep 2012 11:24:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32195) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THFwu-0004ey-Kz for qemu-devel@nongnu.org; Thu, 27 Sep 2012 11:24:24 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8RFOMax002140 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 27 Sep 2012 11:24:23 -0400 Received: from shalem.localdomain.com (vpn1-7-102.ams2.redhat.com [10.36.7.102]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q8RFOKTM027612; Thu, 27 Sep 2012 11:24:21 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Thu, 27 Sep 2012 17:25:44 +0200 Message-Id: <1348759545-14645-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1/2] usb-redir: Change usbredir_open_chardev into usbredir_create_parser 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 As we need to create the parser at more places. Signed-off-by: Hans de Goede --- hw/usb/redirect.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 78e93a7..5d16aff 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -872,15 +872,11 @@ static void usbredir_chardev_close_bh(void *opaque) } } -static void usbredir_chardev_open(USBRedirDevice *dev) +static void usbredir_create_parser(USBRedirDevice *dev) { uint32_t caps[USB_REDIR_CAPS_SIZE] = { 0, }; int flags = 0; - /* Make sure any pending closes are handled (no-op if none pending) */ - usbredir_chardev_close_bh(dev); - qemu_bh_cancel(dev->chardev_close_bh); - DPRINTF("creating usbredirparser\n"); dev->parser = qemu_oom_check(usbredirparser_create()); @@ -992,7 +988,10 @@ static void usbredir_chardev_event(void *opaque, int event) switch (event) { case CHR_EVENT_OPENED: DPRINTF("chardev open\n"); - usbredir_chardev_open(dev); + /* Make sure any pending closes are handled (no-op if none pending) */ + usbredir_chardev_close_bh(dev); + qemu_bh_cancel(dev->chardev_close_bh); + usbredir_create_parser(dev); break; case CHR_EVENT_CLOSED: DPRINTF("chardev close\n");