From patchwork Sun Mar 24 12:39:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 230442 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 0BCCF2C00A5 for ; Sun, 24 Mar 2013 23:37:16 +1100 (EST) Received: from localhost ([::1]:41736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkAk-0007oQ-63 for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2013 08:37:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkA8-0007ii-B0 for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJkA7-0000LN-89 for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26283) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJkA6-0000LB-Te for qemu-devel@nongnu.org; Sun, 24 Mar 2013 08:36:35 -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 r2OCaYC0024665 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 24 Mar 2013 08:36:34 -0400 Received: from shalem.localdomain.com (vpn1-5-143.ams2.redhat.com [10.36.5.143]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2OCaRiH014234; Sun, 24 Mar 2013 08:36:33 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Sun, 24 Mar 2013 13:39:49 +0100 Message-Id: <1364128793-12689-5-git-send-email-hdegoede@redhat.com> In-Reply-To: <1364128793-12689-1-git-send-email-hdegoede@redhat.com> References: <1364128793-12689-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , Hans de Goede Subject: [Qemu-devel] [PATCH 4/8] qemu-char: Automatically do fe_open / fe_close on qemu_chr_add_handlers 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 Most frontends can't really determine if the guest actually has the frontend side open. So lets automatically generate fe_open / fe_close as soon as a frontend becomes ready (as signalled by calling qemu_chr_add_handlers) / becomes non ready (as signalled by setting all handlers to NULL). And allow frontends which can actually determine if the guest is listening to opt-out of this. Signed-off-by: Hans de Goede --- hw/usb/redirect.c | 2 -- hw/virtio-console.c | 1 + include/char/char.h | 1 + qemu-char.c | 13 +++++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 4d565ba..0ddb081 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1310,7 +1310,6 @@ static int usbredir_initfn(USBDevice *udev) dev->compatible_speedmask = USB_SPEED_MASK_FULL | USB_SPEED_MASK_HIGH; /* Let the backend know we are ready */ - qemu_chr_fe_open(dev->cs); qemu_chr_add_handlers(dev->cs, usbredir_chardev_can_read, usbredir_chardev_read, usbredir_chardev_event, dev); @@ -1334,7 +1333,6 @@ static void usbredir_handle_destroy(USBDevice *udev) { USBRedirDevice *dev = DO_UPCAST(USBRedirDevice, dev, udev); - qemu_chr_fe_close(dev->cs); qemu_chr_delete(dev->cs); /* Note must be done after qemu_chr_close, as that causes a close event */ qemu_bh_delete(dev->chardev_close_bh); diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 8ef76e2..209ea38 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -140,6 +140,7 @@ static int virtconsole_initfn(VirtIOSerialPort *port) } if (vcon->chr) { + vcon->chr->explicit_fe_open = 1; qemu_chr_add_handlers(vcon->chr, chr_can_read, chr_read, chr_event, vcon); } diff --git a/include/char/char.h b/include/char/char.h index 3174575..27ebbc3 100644 --- a/include/char/char.h +++ b/include/char/char.h @@ -76,6 +76,7 @@ struct CharDriverState { char *filename; int be_open; int fe_open; + int explicit_fe_open; int avail_connections; QemuOpts *opts; QTAILQ_ENTRY(CharDriverState) next; diff --git a/qemu-char.c b/qemu-char.c index 554d72f..7c57971 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -194,9 +194,14 @@ void qemu_chr_add_handlers(CharDriverState *s, IOEventHandler *fd_event, void *opaque) { + int fe_open; + if (!opaque && !fd_can_read && !fd_read && !fd_event) { /* chr driver being released. */ + fe_open = 0; ++s->avail_connections; + } else { + fe_open = 1; } s->chr_can_read = fd_can_read; s->chr_read = fd_read; @@ -205,6 +210,14 @@ void qemu_chr_add_handlers(CharDriverState *s, if (s->chr_update_read_handler) s->chr_update_read_handler(s); + if (!s->explicit_fe_open) { + if (fe_open) { + qemu_chr_fe_open(s); + } else { + qemu_chr_fe_close(s); + } + } + /* We're connecting to an already opened device, so let's make sure we also get the open event */ if (s->be_open) {