Message ID | 1538295197-23704-51-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> 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=<UNKNOWN>) 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="HHFQbzpx"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NKN4128qz9s55 for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 19:08:52 +1000 (AEST) Received: from localhost ([::1]:54525 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1g6Xib-0004Mc-O0 for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 05:08:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WsB-00031t-Ld for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WsA-0001FV-M4 for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:39 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:50896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WsA-0000yK-Aa for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:38 -0400 Received: by mail-wm1-x333.google.com with SMTP id s12-v6so5813887wmc.0 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:14:13 -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=HHFQbzpxoB7aLKPotJmJutzJFdYAQAx5rp0IvRDM3AJDvMLDUZdchL9gfrqS7rhQ1n J1iZjJpwfjbHYvVV0lsjIXha9GPynRi2uLreXL16FV6WN5k5P/dE7jUtiMObaWloDO/w ipuj+4NxsgWMU5TbFWpqh+jj9Cmb//ZEuiWZnsI1Ru4W0DoExEMGOFjU/uD54rqVp8yp ttaqTNZe10r7GX0ADAdVB9IBrAiOcrz1R6N0XLj8q8l2rMZIKnuHyB6n3pj+gatpOPyX pR1OSzko5YuMUYgPhdOvkYTg3nvGIWS0Z1eMJedxLs5iwZAv91M/nJTDOZAc9pTF1aXL SJrw== 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=sb5t80eQqBAg5Gp0ZGflZDuOV8X+Z41Q6hyQwc6qvgqC67Y/lAH/lpiVMs1MgeCnb/ QPrLZ8HzAHYk9AI82EAcn9ysY0xoeTIuMlOpjO5iH7Hi/s+QkWlWs36F3HXO3XLTh0Yz MyXEJOrERFTrqx5Cppjb4NLn98hIvndgMHx5sXgUmiqZh/wFstijQEtgoZ8+YMUiO2fA OUKLm7H2o+0bthc3GQidoCVRw9C2Blj4yvh+shUsimg3p4nMPOB7rw3oGXm0z6GYw4uP YD0XmqfcoushQuqidFhVr9xaGK2IGXzutGQgxWDgrj4tRCAJd3dphD2PeMYNWHODR/55 VQRQ== X-Gm-Message-State: ABuFfogBlgZICWR/0tka3Ok5Fb/gavCh6NhJe52btHhZpyrz/6singC0 heUZGJMimA2fo/sMjrsgV+y3O6zl X-Google-Smtp-Source: ACcGV62g/Kss0yqWKNISVFAbrvGAk9GI9GxbuClCQBt8jZJEKiKo2wfR5jzSNyaSnbadJbA+6ANszg== X-Received: by 2002:a1c:d9cc:: with SMTP id q195-v6mr5627936wmg.23.1538295252172; Sun, 30 Sep 2018 01:14:12 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.14.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:11 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:48 +0200 Message-Id: <1538295197-23704-51-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 Subject: [Qemu-devel] [PULL 50/79] 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/79] virtio: Return true from virtio_queue_empty if broken
|
expand
|
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; }