From patchwork Wed Oct 17 07:54:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 191983 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 DD0972C00B0 for ; Wed, 17 Oct 2012 18:57:45 +1100 (EST) Received: from localhost ([::1]:34175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOOTs-0005Vv-5f for incoming@patchwork.ozlabs.org; Wed, 17 Oct 2012 03:55:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOOSb-0001xp-NA for qemu-devel@nongnu.org; Wed, 17 Oct 2012 03:54:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOOST-0006VV-Tl for qemu-devel@nongnu.org; Wed, 17 Oct 2012 03:54:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOOST-0006V4-Js for qemu-devel@nongnu.org; Wed, 17 Oct 2012 03:54:29 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9H7sSe8022724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 17 Oct 2012 03:54:29 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9H7sScf031099; Wed, 17 Oct 2012 03:54:28 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 13A9344138; Wed, 17 Oct 2012 09:54:26 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2012 09:54:25 +0200 Message-Id: <1350460465-23536-8-git-send-email-kraxel@redhat.com> In-Reply-To: <1350460465-23536-1-git-send-email-kraxel@redhat.com> References: <1350460465-23536-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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 7/7] usb-serial: only expose device in guest when the chardev is open 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 Signed-off-by: Gerd Hoffmann --- hw/usb/dev-serial.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 43214cd..a466f99 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -427,6 +427,10 @@ static void usb_serial_handle_destroy(USBDevice *dev) static int usb_serial_can_read(void *opaque) { USBSerialState *s = opaque; + + if (!s->dev.attached) { + return 0; + } return RECV_BUF - s->recv_used; } @@ -469,8 +473,14 @@ static void usb_serial_event(void *opaque, int event) case CHR_EVENT_FOCUS: break; case CHR_EVENT_OPENED: - usb_serial_reset(s); - /* TODO: Reset USB port */ + if (!s->dev.attached) { + usb_device_attach(&s->dev); + } + break; + case CHR_EVENT_CLOSED: + if (s->dev.attached) { + usb_device_detach(&s->dev); + } break; } } @@ -481,6 +491,7 @@ static int usb_serial_initfn(USBDevice *dev) usb_desc_create_serial(dev); usb_desc_init(dev); + dev->auto_attach = 0; if (!s->cs) { error_report("Property chardev is required"); @@ -490,6 +501,10 @@ static int usb_serial_initfn(USBDevice *dev) qemu_chr_add_handlers(s->cs, usb_serial_can_read, usb_serial_read, usb_serial_event, s); usb_serial_handle_reset(dev); + + if (s->cs->opened && !dev->attached) { + usb_device_attach(dev); + } return 0; }