From patchwork Tue Aug 21 17:02:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 960669 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="jhOftxff"; 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 41vyvZ6q7zz9ryn for ; Wed, 22 Aug 2018 03:53:14 +1000 (AEST) Received: from localhost ([::1]:55201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsAq8-0001UF-J6 for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:53:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA4y-0002Sh-5a 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 1fsA4q-0007G3-6V 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]:36958) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA4p-0007F0-Ui for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:20 -0400 Received: by mail-wm0-x233.google.com with SMTP id n11-v6so3497324wmc.2 for ; Tue, 21 Aug 2018 10:04:19 -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=t8QE7qzACmSTUNJeiuY1pDLnffGygGEId5TJe5B1cos=; b=jhOftxffHEwUIeQ1JmwjEg6RWL6Y6YTPwd/t7ObAGSjmvnSzQftw14Fav9mmHIi+FN F4D+KASbsF6GRq+yJdjIS172RZda150x4B/k+MEf/PkaKdMDpDCy3UUDH2Tcp5F6reCG JJMQVplR/e1Q9ZXepfxWWYxIOv0yPQWUPqKmt2djloNFfMFYQonwNj2Ge8ar6jTY1jaY /T11TW+qPML6ARN2g3Kp5fsbtZiJn8O0GoVgb5YQNHWR4vwRptfG/nimEjx6vrAwmsjp XnZ2T8JvjfxfPtuupyHIU+ixSeaCFUNgiukzPQxfWdO/VJy5g092RYsxDusLizpGtmC7 anRA== 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=t8QE7qzACmSTUNJeiuY1pDLnffGygGEId5TJe5B1cos=; b=eJdqnYLl9oiSsZ74nDQ8V1r5lyuhUVBOQIwDzSyYr3krNLsZTY25/F3STWFSflVys2 leOpBbJQxhKkDcK9q1s7vzGhNtjEN0ZJovq57WiIp10K/gsvOlWmx5rPhqlUsLRs6Gfe 6BpxiJwbw93pgptmI+/Z5OnevTu8Rk5B5H9ykeh6wBZ6gK6tv0zfUlkVFP4Cbn+LnEKd /T+ybR3c3vfW0gVOHMdTqzpaDG1MmQposuHUzxRO+MrX4P+lmVYPscPQNM9eCk3NON5x ii0NwXn2r1PeM7v8yfZ5jxS9A5951TdwTiUeKPNPA6zJUNJO1L2I0cAId6YREN2/Z/wM +8HA== X-Gm-Message-State: APzg51BcAxLI/5FRiq5yO/8YO4DVxCaeFsacw5se4eI2RQwKvwYm9+/d l38xqtOpGHNYZxqyC2VJhumMjh+v X-Google-Smtp-Source: ANB0VdYzx2Ac4UCETrTU3pHv1c2j+xlj6A0yYCOrKeBLwk0nEXnGCLJWxi7o23DaVOvvIyBOpRfYCA== X-Received: by 2002:a1c:9550:: with SMTP id x77-v6mr113435wmd.135.1534871058720; Tue, 21 Aug 2018 10:04:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:04:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:43 +0200 Message-Id: <1534870966-9287-72-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 71/74] Revert "chardev: tcp: postpone TLS work until machine done" 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 99f2f54174a595e3ada6e4332fcd2b37ebb0d55d. See next commit reverting 25679e5d58e258e9950685ffbd0cae4cd40d9cc2 as well for rationale. Signed-off-by: Marc-André Lureau Message-Id: <20180817135224.22971-2-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini Signed-off-by: Marc-André Lureau --- chardev/char-socket.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index efbad6e..e28d2cc 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -32,7 +32,6 @@ #include "qapi/error.h" #include "qapi/clone-visitor.h" #include "qapi/qapi-visit-sockets.h" -#include "sysemu/sysemu.h" #include "chardev/char-io.h" @@ -724,11 +723,6 @@ static void tcp_chr_tls_init(Chardev *chr) Error *err = NULL; gchar *name; - if (!machine_init_done) { - /* This will be postponed to machine_done notifier */ - return; - } - if (s->is_listen) { tioc = qio_channel_tls_new_server( s->ioc, s->tls_creds, @@ -1169,10 +1163,6 @@ static int tcp_chr_machine_done_hook(Chardev *chr) tcp_chr_connect_async(chr); } - if (s->ioc && s->tls_creds) { - tcp_chr_tls_init(chr); - } - return 0; }