From patchwork Wed Feb 3 16:18:15 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: 44391 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 CC93EB7D41 for ; Thu, 4 Feb 2010 03:28:55 +1100 (EST) Received: from localhost ([127.0.0.1]:54076 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nchx3-0002rY-Ng for incoming@patchwork.ozlabs.org; Wed, 03 Feb 2010 11:19:37 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nchvr-0002r5-MU for qemu-devel@nongnu.org; Wed, 03 Feb 2010 11:18:23 -0500 Received: from [199.232.76.173] (port=59043 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nchvr-0002qt-BT for qemu-devel@nongnu.org; Wed, 03 Feb 2010 11:18:23 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nchvm-0001du-Cz for qemu-devel@nongnu.org; Wed, 03 Feb 2010 11:18:22 -0500 Received: from sj-iport-6.cisco.com ([171.71.176.117]:57776) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1Nchvl-0001dW-W0 for qemu-devel@nongnu.org; Wed, 03 Feb 2010 11:18:18 -0500 Authentication-Results: sj-iport-6.cisco.com; dkim=neutral (message not signed) header.i=none X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApoEAEswaUurR7Ht/2dsb2JhbADBCpgRhEUE X-IronPort-AV: E=Sophos;i="4.49,399,1262563200"; d="scan'208";a="477567973" Received: from sj-core-1.cisco.com ([171.71.177.237]) by sj-iport-6.cisco.com with ESMTP; 03 Feb 2010 16:18:15 +0000 Received: from [10.89.3.230] (rcdn-vpn-client-10-89-3-230.cisco.com [10.89.3.230]) by sj-core-1.cisco.com (8.13.8/8.14.3) with ESMTP id o13GIF0V010529; Wed, 3 Feb 2010 16:18:15 GMT Message-ID: <4B69A1C7.80708@cisco.com> Date: Wed, 03 Feb 2010 09:18:15 -0700 From: "David S. Ahern" User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.7) Gecko/20100120 Fedora/3.0.1-1.fc11 Thunderbird/3.0.1 MIME-Version: 1.0 To: qemu-devel@nongnu.org X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: kvm-devel 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 tty0 of the host using the monitor command: usb_add serial::/dev/tty0 and then removing the device with: usb_del serial::/dev/tty0 Signed-off-by: David Ahern const char *filename = qemu_opt_get(opts, "path"); @@ -1187,6 +1201,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__ */ diff --git a/qemu-char.c b/qemu-char.c index 800ee6c..ecd84ec 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1173,6 +1173,20 @@ static int tty_serial_ioctl(CharDriverState *chr, int cmd 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) {