From patchwork Tue Mar 13 22:46:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10281139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1EE616038F for ; Tue, 13 Mar 2018 23:03:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EC8428403 for ; Tue, 13 Mar 2018 23:03:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 039BB285A3; Tue, 13 Mar 2018 23:03:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B034628403 for ; Tue, 13 Mar 2018 23:03:31 +0000 (UTC) Received: from localhost ([::1]:43366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsx9-0002QV-0j for patchwork-qemu-devel@patchwork.kernel.org; Tue, 13 Mar 2018 19:03:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evshx-0005e2-3D for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evshs-00035E-3W for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:49 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:33969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evshr-00034D-TG for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:47:44 -0400 Received: by mail-wr0-x241.google.com with SMTP id o8so2597949wra.1 for ; Tue, 13 Mar 2018 15:47:43 -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=5bjd1hCyAxlBj8/w3GjH9MTFV7OQg2DgOoYAv9EPVBI=; b=F83+J/HhLALTOVaBj+oCT5eDOYh5Wmgm8K4/AprCvlUQdyhAZOiYTLaezKtVMxylqi neJiEgAiaRipxHcTach2NaMF8MAINS/lBpHd4bWI0S/o9/Kn6FjJqThDmpvXxCco2YXV ZUZpGdwldGfJwaH88o10a0Gcxzq1RG4KnQ6O+6yOxmN67eAsCPQSdDJ+p9JRSxIr3+KQ ENU9fu547mZY9OCvYQ4lWmD7lq7cGurkG63OaPJJdvy+gYRXPpB5QVFXcMbmsmkKZXDt khiHQgZEz9ynXShI0Ntrtiy2SQqcUeTCIxMSlzv5DqLm+lXqw5CNnBhuza304VuGN43E k4lg== 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=5bjd1hCyAxlBj8/w3GjH9MTFV7OQg2DgOoYAv9EPVBI=; b=QbMUOykXcKcCYcIoFVZlpsa5PPbuPWUrX9LhlfbNMUizqaV+p8r7A7K4JYT8W8pRmU wvGQUQrG7qWKpb+DzrlgDhhleUGfnqK6hjEgrPkRM75PvGqvdCmAuNxJ3Q8BZqkvtH13 ld7nTeHDm1W3SiJv9FpdjgNNMHUaPCMXrRlJq6ONwtUEPaPYS67RiPFos7kVGE/ZemKW qmY2yYChkYYrwpsK59Ov4wyASmGV0NVlNLUWdYukABZXAiB5pZnkeVIQ3O+42w5kpgy2 RQkpv7VKBqJZQVOL6i7KABwv7HBHakdXR9ySg7X75OTjREXRTzgMp34MzUYJOqkOks/l ik6w== X-Gm-Message-State: AElRT7Hoyy2boPr88J10Cx1JSFa8Ab4g3yC0naNDkVtAW4+6LjHs2Fcs Ns8/GnzKEHUnRsnsPfRnZyM28JQL X-Google-Smtp-Source: AG47ELvq9VlRekVRnR/+u0HGeDNfnWqzAdDeCr9ebO6tUHum7dVyCAkIasNvPIGKany61s4ogttSCw== X-Received: by 10.223.132.103 with SMTP id 94mr1854776wrf.275.1520981262489; Tue, 13 Mar 2018 15:47:42 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.47.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:47:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:27 +0100 Message-Id: <20180313224719.4954-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-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:c0c::241 Subject: [Qemu-devel] [PULL 17/69] chardev: tcp: let TLS run on chardev context 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: Peter Xu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Peter Xu Now qio_channel_tls_handshake() is ready to receive the context. Let socket chardev use it, then the TLS handshake of chardev will always be with the chardev's context. Signed-off-by: Peter Xu Message-Id: <20180306053320.15401-9-peterx@redhat.com> Acked-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrangé Signed-off-by: Paolo Bonzini --- chardev/char-socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index f6ad6ee4d8..36a8fcc194 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -751,7 +751,7 @@ static void tcp_chr_tls_init(Chardev *chr) tcp_chr_tls_handshake, chr, NULL, - NULL); + chr->gcontext); }