From patchwork Tue Aug 21 17:02:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 960639 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uobK8YPc"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vyQb2Z0Dz9s3Z for ; Wed, 22 Aug 2018 03:31:35 +1000 (AEST) Received: from localhost ([::1]:55090 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsAVA-0004IB-Sb for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:31:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA4y-0002Sa-5J for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsA4r-0007I3-NN for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:25 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:39711) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA4r-0007GR-6i for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:21 -0400 Received: by mail-wm0-x233.google.com with SMTP id q8-v6so3503072wmq.4 for ; Tue, 21 Aug 2018 10:04:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lU2cRxf5K+Pv2BJrGTRLoxHU06WE1M7LmH/7RT3PKX4=; b=uobK8YPcdyVelGZe/V4BmJM2p6IMzeZO6iBOKtN6y2mlOtHTnAThNwQhFcrpsW6oYa zmVAnPLKl5rqbZ2IPblD3QXT0VHfQuWVw8WbBlGaqMC/Zlmol0ZM3zMEnxEVjgNxC/gj 7VxGoQXtyhezVzuex8DRXWhag1pUj0Azr0wVlVEopkLLKqE0f68XOJpUBFQbuYALOpjW ZV/SFpIWQG5uP+rPdJ8gTzlLUh9ZWszn8i003kbglovVocf6sxwSBXKTFvar36bye+7E KkBzBF5oM1oCKnTuaXEXmN+nKFUEYcibEOUDreUYQW5dkA8T9FTpkHK18un6bXP8HCFK qTUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lU2cRxf5K+Pv2BJrGTRLoxHU06WE1M7LmH/7RT3PKX4=; b=dg/S4piQDoHnrRHCjO/Av+US007HztMwPApNdwykxCo/4NkrNBxjYfBS0W9BMzqdEl jnqd5XZEirUb3EZoCX+bDob4NSJs64bAvXtbZbV0XRPXoSgzvCuWINu7D51h3nmo+iPq JMCYN7QiNqn5VW5BlSXIhviMzNoHX0sHrMZBcsn0yA7mfKDN7LBHcxdesa+4o9o6F/JU NSeSWz7SP5brqoGKmgCbq4mF+hx5Ok/oaoUrOf5WNTenlgFqQRmpbSgIX7tYiRKpD8SI oNPIhXtc/Rn8+lyTL4Q9I8D8zHitCz3QtwZml4yKT4BlwyzQhs38u89eSf9KLA4Y4toX ZF5A== X-Gm-Message-State: APzg51AMb+2nXaX3TgscWNCDQRNYLST9j95y4Cb6jRHt+ayfPv/2nxyd 8XTc9SvL+cewP2L5vCPez4SQz42m X-Google-Smtp-Source: ANB0VdZsvI7TFoc0ri9YrwbO78sydrZMc3b4D8vHWE7ZPLX9tXTkaT+GkmMBzZLS/XVGGIbfJsDWtA== X-Received: by 2002:a1c:ca0f:: with SMTP id a15-v6mr149903wmg.102.1534871059712; Tue, 21 Aug 2018 10:04:19 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.04.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:04:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:44 +0200 Message-Id: <1534870966-9287-73-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PULL 72/74] Revert "chardev: tcp: postpone async connection setup" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau This reverts commit 25679e5d58e258e9950685ffbd0cae4cd40d9cc2. This commit broke "reconnect socket" chardev that are created after "machine_done": they no longer try to connect. It broke also vhost-user-test that uses chardev while there is no "machine_done" event. The goal of this patch was to move the "connect" source to the frontend context. chr->gcontext is set with qemu_chr_fe_set_handlers(). But there is no guarantee that it will be called, so we can't delay connection until then: the chardev should still attempt to connect during open(). qemu_chr_fe_set_handlers() is eventually called later and will update the context. Unless there is a good reason to not use initially the default context, I think we should revert to the previous state to fix the regressions. Signed-off-by: Marc-André Lureau Message-Id: <20180817135224.22971-3-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini Signed-off-by: Marc-André Lureau --- chardev/char-socket.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index e28d2cc..14f6567 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1005,8 +1005,9 @@ static void qmp_chardev_open_socket(Chardev *chr, s->reconnect_time = reconnect; } - /* If reconnect_time is set, will do that in chr_machine_done. */ - if (!s->reconnect_time) { + if (s->reconnect_time) { + tcp_chr_connect_async(chr); + } else { if (s->is_listen) { char *name; s->listener = qio_net_listener_new(); @@ -1155,17 +1156,6 @@ char_socket_get_connected(Object *obj, Error **errp) return s->connected; } -static int tcp_chr_machine_done_hook(Chardev *chr) -{ - SocketChardev *s = SOCKET_CHARDEV(chr); - - if (s->reconnect_time) { - tcp_chr_connect_async(chr); - } - - return 0; -} - static void char_socket_class_init(ObjectClass *oc, void *data) { ChardevClass *cc = CHARDEV_CLASS(oc); @@ -1181,7 +1171,6 @@ static void char_socket_class_init(ObjectClass *oc, void *data) cc->chr_add_client = tcp_chr_add_client; cc->chr_add_watch = tcp_chr_add_watch; cc->chr_update_read_handler = tcp_chr_update_read_handler; - cc->chr_machine_done = tcp_chr_machine_done_hook; object_class_property_add(oc, "addr", "SocketAddress", char_socket_get_addr, NULL,