From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMbVX-0004vR-GG for qemu-devel@nongnu.org; Fri, 12 Oct 2012 05:26:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMbVP-0002g3-Aj for qemu-devel@nongnu.org; Fri, 12 Oct 2012 05:26:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62588) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMbVP-0002fo-1C for qemu-devel@nongnu.org; Fri, 12 Oct 2012 05:26:07 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9C9Q6RB030433 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 12 Oct 2012 05:26:06 -0400 From: Gerd Hoffmann Date: Fri, 12 Oct 2012 11:26:01 +0200 Message-Id: <1350033962-16665-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1350033962-16665-1-git-send-email-kraxel@redhat.com> References: <1350033962-16665-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] usb-serial: only expose device in guest when the chardev is open List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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; } -- 1.7.1