From patchwork Mon Nov 25 08:07:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Hammer X-Patchwork-Id: 293849 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BF1182C00A6 for ; Mon, 25 Nov 2013 19:08:25 +1100 (EST) Received: from localhost ([::1]:50192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkrDS-0004my-NR for incoming@patchwork.ozlabs.org; Mon, 25 Nov 2013 03:08:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkrD8-0004mc-RB for qemu-devel@nongnu.org; Mon, 25 Nov 2013 03:08:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VkrD2-0007z1-R4 for qemu-devel@nongnu.org; Mon, 25 Nov 2013 03:08:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VkrD2-0007yO-IJ for qemu-devel@nongnu.org; Mon, 25 Nov 2013 03:07:56 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAP87sO3013052 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 25 Nov 2013 03:07:55 -0500 Received: from wolverine.usersys.redhat.com.com (dhcp-4-160.tlv.redhat.com [10.35.4.160]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rAP87rfH023506; Mon, 25 Nov 2013 03:07:53 -0500 From: Gal Hammer To: qemu-devel@nongnu.org Date: Mon, 25 Nov 2013 10:07:40 +0200 Message-Id: <1385366860-14010-1-git-send-email-ghammer@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gal Hammer Subject: [Qemu-devel] [PATCH] char: restore read callback on a reattached (hotplug) chardev 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 Fix a bug that was introduced in commit 386a5a1e. A removal of a device set the chr handlers to NULL. However when the device is plugged back, its read callback is not restored so data can't be transfter from the host to the guest via the virtio-serial port. https://bugzilla.redhat.com/show_bug.cgi?id=1027181 Signed-off-by: Gal Hammer --- qemu-char.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index e00f84c..44499e4 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2510,6 +2510,16 @@ static void tcp_chr_connect(void *opaque) qemu_chr_be_generic_open(chr); } +static void tcp_chr_update_read_handler(CharDriverState *chr) +{ + TCPCharDriver *s = chr->opaque; + + if (s->chan && !chr->avail_connections) { + chr->fd_in_tag = io_add_watch_poll(s->chan, tcp_chr_read_poll, + tcp_chr_read, chr); + } +} + #define IACSET(x,a,b,c) x[0] = a; x[1] = b; x[2] = c; static void tcp_chr_telnet_init(int fd) { @@ -2665,6 +2675,7 @@ static CharDriverState *qemu_chr_open_socket_fd(int fd, bool do_nodelay, chr->get_msgfd = tcp_get_msgfd; chr->chr_add_client = tcp_chr_add_client; chr->chr_add_watch = tcp_chr_add_watch; + chr->chr_update_read_handler = tcp_chr_update_read_handler; /* be isn't opened until we get a connection */ chr->explicit_be_open = true;