From patchwork Wed Feb 10 22:00:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David S. Ahern" X-Patchwork-Id: 45060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EACB2B7CA1 for ; Thu, 11 Feb 2010 09:06:11 +1100 (EST) Received: from localhost ([127.0.0.1]:46900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfKeD-0005mm-6V for incoming@patchwork.ozlabs.org; Wed, 10 Feb 2010 17:03:01 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfKd1-0005mN-Ix for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:01:47 -0500 Received: from [199.232.76.173] (port=43582 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfKd0-0005mF-9L for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:01:46 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfKcy-0004H8-HL for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:01:45 -0500 Received: from sj-iport-5.cisco.com ([171.68.10.87]:4390) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1NfKcy-0004A0-3e for qemu-devel@nongnu.org; Wed, 10 Feb 2010 17:01:44 -0500 Authentication-Results: sj-iport-5.cisco.com; dkim=neutral (message not signed) header.i=none X-IronPort-AV: E=Sophos;i="4.49,446,1262563200"; d="scan'208";a="149044933" Received: from sj-core-2.cisco.com ([171.71.177.254]) by sj-iport-5.cisco.com with ESMTP; 10 Feb 2010 22:00:49 +0000 Received: from localhost.localdomain ([64.101.76.217]) by sj-core-2.cisco.com (8.13.8/8.14.3) with ESMTP id o1AM0nIJ016772; Wed, 10 Feb 2010 22:00:49 GMT From: David Ahern To: qemu-devel@nongnu.org Date: Wed, 10 Feb 2010 15:00:49 -0700 Message-Id: <1265839249-12068-1-git-send-email-daahern@cisco.com> X-Mailer: git-send-email 1.6.2.5 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: David Ahern Subject: [Qemu-devel] [PATCH] add close callback for tty-based char device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a tty close callback. Right now if a guest device that is connected to a tty-based chardev in the host is removed, the tty is not closed. With this patch it is closed. Example use case is connecting an emulated USB serial cable in the guest to ttyS0 of the host using the monitor command: usb_add serial::/dev/ttyS0 and then removing the device with: usb_del serial::/dev/ttyS0 Signed-off-by: David Ahern --- qemu-char.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 75dbf66..77edec9 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1173,6 +1173,20 @@ static int tty_serial_ioctl(CharDriverState *chr, int cmd, void *arg) return 0; } +static void qemu_chr_close_tty(CharDriverState *chr) +{ + FDCharDriver *s = chr->opaque; + int fd = -1; + + if (s) + fd = s->fd_in; + + fd_chr_close(chr); + + if (fd >= 0) + close(fd); +} + static CharDriverState *qemu_chr_open_tty(QemuOpts *opts) { const char *filename = qemu_opt_get(opts, "path"); @@ -1190,6 +1204,7 @@ static CharDriverState *qemu_chr_open_tty(QemuOpts *opts) return NULL; } chr->chr_ioctl = tty_serial_ioctl; + chr->chr_close = qemu_chr_close_tty; return chr; } #else /* ! __linux__ && ! __sun__ */