From nobody Wed May 8 01:59:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1599964729; cv=none; d=zohomail.com; s=zohoarc; b=AXwPhibimXtB5pkH22nhMhhD5e3wvG7jAjHrzMdisVqs9lGhp7dMahgUcvaal38YXRykmoW4qsJoQ581LXIEUGioT/RuJm26YISlagHQw3hhmWwvJDmBxZTTzKsSRzZf5eNHeYfyzxKXxQocUgRPykLeLMmyBpqzImS2iEww834= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599964729; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9cPZIvMQKWRDs2VRPbouXW2RwtDiFJTVPDp1GYXLBgg=; b=i+e+PsrQAo/FAK8GSXgsIoLcVMyrGo5a5ehpzGUDGhrY8vKHsaj+aDmMcmKu7UGIJfM3kNOIlI7XFU39CtW3/sVG1kkdFJmZ3wzh5MOAtXQg9W9mdFcYJm5pWXLCg2KcOuSAkOtM/Iq4+INUWkj/SkbU0k6D649VfwPJhovezQo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599964729373760.6892576094313; Sat, 12 Sep 2020 19:38:49 -0700 (PDT) Received: from localhost ([::1]:47736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHHui-0000jK-69 for importer@patchew.org; Sat, 12 Sep 2020 22:38:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsm-0004w3-El for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:48 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4687 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsk-0003VV-2o for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:48 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 48310EAA34D88BAAF7AE; Sun, 13 Sep 2020 10:36:38 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sun, 13 Sep 2020 10:36:32 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v3 1/6] migration/tls: save hostname into MigrationState Date: Sun, 13 Sep 2020 10:47:31 +0800 Message-ID: <1599965256-72150-2-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> References: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.190; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/12 22:36:39 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhengchuan@huawei.com, zhang.zhanghailiang@huawei.com, yuxiating@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, jinyan12@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" hostname is need in multifd-tls, save hostname into MigrationState. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin --- migration/channel.c | 6 ++++++ migration/migration.c | 1 + migration/migration.h | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/migration/channel.c b/migration/channel.c index 20e4c8e..0e4104a 100644 --- a/migration/channel.c +++ b/migration/channel.c @@ -66,6 +66,11 @@ void migration_channel_connect(MigrationState *s, trace_migration_set_outgoing_channel( ioc, object_get_typename(OBJECT(ioc)), hostname, error); =20 + /* Save hostname into MigrationState for handshake */ + if (hostname) { + s->hostname =3D g_strdup(hostname); + } + if (!error) { if (s->parameters.tls_creds && *s->parameters.tls_creds && @@ -90,5 +95,6 @@ void migration_channel_connect(MigrationState *s, } } migrate_fd_connect(s, error); + g_free(s->hostname); error_free(error); } diff --git a/migration/migration.c b/migration/migration.c index 58a5452..e20b778 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1883,6 +1883,7 @@ void migrate_init(MigrationState *s) s->migration_thread_running =3D false; error_free(s->error); s->error =3D NULL; + s->hostname =3D NULL; =20 migrate_set_state(&s->state, MIGRATION_STATUS_NONE, MIGRATION_STATUS_S= ETUP); =20 diff --git a/migration/migration.h b/migration/migration.h index bdc7450..bc96322 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -259,6 +259,11 @@ struct MigrationState * (which is in 4M chunk). */ uint8_t clear_bitmap_shift; + + /* + * This save hostname when out-going migration starts + */ + char *hostname; }; =20 void migrate_set_state(int *state, int old_state, int new_state); --=20 1.8.3.1 From nobody Wed May 8 01:59:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1599964665; cv=none; d=zohomail.com; s=zohoarc; b=R2OaCYZSorFVJB9vx4uEVxcZQrShvotDtPaXPS6HEV/XWAV9xAI08Ubi2jZzet5apqZVr7v3uuTi5JIa5YuR5GCWiNw+rmsSmSf6Y6hE8q4kx5pUvCBCLe8maZ0aSlThjcOBo0t3wrDIurHp70aC9AnMe10Cdbiyw9lsYIw6px8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599964665; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7uMKJVfCK5FTBSM+lxiEciub1c/tv33ikHhq/GDQUpI=; b=O/D9wdVKGjo9Wg22P8s69MdUiyYHCoYPYmf/GIC2oM/HldQz0SvnCAOTCH1gbor2ocFf5rgYmNca+z6j+/ZST2Bef2GS7cyrZOhk/EeaqqzBXVwT8OlT8nWCIWdA1znxVpORn8rAyNHzLSakhS2wdbTeEogcfUP2gapFE2W+SCE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599964665064563.6175453866144; Sat, 12 Sep 2020 19:37:45 -0700 (PDT) Received: from localhost ([::1]:41736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHHtf-0006k4-NO for importer@patchew.org; Sat, 12 Sep 2020 22:37:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsq-0004zb-EZ for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:52 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:43808 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsn-0003W0-1O for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:52 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 65B18A9DFD09193D55E8; Sun, 13 Sep 2020 10:36:43 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sun, 13 Sep 2020 10:36:32 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v3 2/6] migration/tls: extract migration_tls_client_create for common-use Date: Sun, 13 Sep 2020 10:47:32 +0800 Message-ID: <1599965256-72150-3-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> References: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.35; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/12 22:36:44 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhengchuan@huawei.com, zhang.zhanghailiang@huawei.com, yuxiating@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, jinyan12@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" migration_tls_client_create will be used in multifd-tls, let's extract it. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/tls.c | 26 ++++++++++++++++++-------- migration/tls.h | 6 ++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/migration/tls.c b/migration/tls.c index 7a02ec8..186be8a 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -22,7 +22,6 @@ #include "channel.h" #include "migration.h" #include "tls.h" -#include "io/channel-tls.h" #include "crypto/tlscreds.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -125,11 +124,10 @@ static void migration_tls_outgoing_handshake(QIOTask = *task, object_unref(OBJECT(ioc)); } =20 - -void migration_tls_channel_connect(MigrationState *s, - QIOChannel *ioc, - const char *hostname, - Error **errp) +QIOChannelTLS *migration_tls_client_create(MigrationState *s, + QIOChannel *ioc, + const char *hostname, + Error **errp) { QCryptoTLSCreds *creds; QIOChannelTLS *tioc; @@ -137,7 +135,7 @@ void migration_tls_channel_connect(MigrationState *s, creds =3D migration_tls_get_creds( s, QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp); if (!creds) { - return; + return NULL; } =20 if (s->parameters.tls_hostname && *s->parameters.tls_hostname) { @@ -145,11 +143,23 @@ void migration_tls_channel_connect(MigrationState *s, } if (!hostname) { error_setg(errp, "No hostname available for TLS"); - return; + return NULL; } =20 tioc =3D qio_channel_tls_new_client( ioc, creds, hostname, errp); + + return tioc; +} + +void migration_tls_channel_connect(MigrationState *s, + QIOChannel *ioc, + const char *hostname, + Error **errp) +{ + QIOChannelTLS *tioc; + + tioc =3D migration_tls_client_create(s, ioc, hostname, errp); if (!tioc) { return; } diff --git a/migration/tls.h b/migration/tls.h index cdd7000..0cfbe36 100644 --- a/migration/tls.h +++ b/migration/tls.h @@ -22,11 +22,17 @@ #define QEMU_MIGRATION_TLS_H =20 #include "io/channel.h" +#include "io/channel-tls.h" =20 void migration_tls_channel_process_incoming(MigrationState *s, QIOChannel *ioc, Error **errp); =20 +QIOChannelTLS *migration_tls_client_create(MigrationState *s, + QIOChannel *ioc, + const char *hostname, + Error **errp); + void migration_tls_channel_connect(MigrationState *s, QIOChannel *ioc, const char *hostname, --=20 1.8.3.1 From nobody Wed May 8 01:59:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1599964661; cv=none; d=zohomail.com; s=zohoarc; b=X6JdzaoCFE0bQWuDOeguiXB+rzLXf9vodQbeP+DUUuvZctCBdaXjbMsVABJ1kbf5q0s6QbNfUWGuIXkBwmOSfhh+Tyuym5pQr9gPiQAq6dHAR5UnE9BEaTQWgo5J++W8wkCMZEvye7EvCflLppLpMkQ48DymXBx1/ZCIRpuFrxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599964661; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fn2R97bZsvnGssbn4tPZ9jN95XIplABFqd38W0yPtck=; b=fcoiflMZU5dkV2KiEy/gvj9uT4HoL4jNUwJRyjeVzmWRxUVYhp1XcbPeAWeRZgVH48D+3DE1XlkL2wDQGz7E5vJVnUUD56NatD1jpx5brBQkxFb2eaDkiHNYfr8B62j6+y9u239MXYK2fxf4Vrmt9wjnS/nEfIkHGDdqtNXKeGM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599964661495223.32100010690453; Sat, 12 Sep 2020 19:37:41 -0700 (PDT) Received: from localhost ([::1]:41212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHHtb-0006Wz-Kn for importer@patchew.org; Sat, 12 Sep 2020 22:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHso-0004wl-MR for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:50 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:43814 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsl-0003W1-5p for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:50 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 6A5BD4E9FF9FDBB6C7DE; Sun, 13 Sep 2020 10:36:43 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sun, 13 Sep 2020 10:36:33 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v3 3/6] migration/tls: add MigrationState and tls_hostname into MultiFDSendParams Date: Sun, 13 Sep 2020 10:47:33 +0800 Message-ID: <1599965256-72150-4-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> References: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.35; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/12 22:36:44 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhengchuan@huawei.com, zhang.zhanghailiang@huawei.com, yuxiating@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, jinyan12@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" MigrationState is need for tls session build and tls hostname is need for tls handshake, add both MigrationState and tls_hostname into MultiFDSendParams. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin --- migration/multifd.c | 5 +++++ migration/multifd.h | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/migration/multifd.c b/migration/multifd.c index d044120..3e41d9e 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -543,11 +543,14 @@ void multifd_save_cleanup(void) =20 socket_send_channel_destroy(p->c); p->c =3D NULL; + p->s =3D NULL; qemu_mutex_destroy(&p->mutex); qemu_sem_destroy(&p->sem); qemu_sem_destroy(&p->sem_sync); g_free(p->name); p->name =3D NULL; + g_free(p->tls_hostname); + p->tls_hostname =3D NULL; multifd_pages_clear(p->pages); p->pages =3D NULL; p->packet_len =3D 0; @@ -779,6 +782,8 @@ int multifd_save_setup(Error **errp) p->packet->magic =3D cpu_to_be32(MULTIFD_MAGIC); p->packet->version =3D cpu_to_be32(MULTIFD_VERSION); p->name =3D g_strdup_printf("multifdsend_%d", i); + p->s =3D migrate_get_current(); + p->tls_hostname =3D g_strdup(p->s->hostname); socket_send_channel_create(multifd_new_send_channel_async, p); } =20 diff --git a/migration/multifd.h b/migration/multifd.h index 448a03d..2b400e7 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -66,11 +66,15 @@ typedef struct { } MultiFDPages_t; =20 typedef struct { + /* Migration State */ + MigrationState *s; /* this fields are not changed once the thread is created */ /* channel number */ uint8_t id; /* channel thread name */ char *name; + /* tls hostname */ + char *tls_hostname; /* channel thread id */ QemuThread thread; /* communication channel */ --=20 1.8.3.1 From nobody Wed May 8 01:59:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1599964783; cv=none; d=zohomail.com; s=zohoarc; b=GrTxno19k1eS+e8m3M4pkcftxrPSoEE7Txfoqfn30qFxc9SKCcsV/8daQcXUcC7geJcPtHlx7Q4TQfGePuLf3vwv+lhl/xxu0oqolquQyC++Cc8FbWyuB42aHc2knX1r3RnZs+ye87DIKFJLfrSuTtUxng6Zv4ddqpzFX0s1OyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599964783; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=68mjOGFUOy5Hus5hEMTOSaETZsIJxzbIEDCgTJqXmIk=; b=C08Ud2sMEdI1ZwSk78nqxUUUAsiR0sNEr/LfNMG8jGcQ6wOvur4yFrd8frYR7sDMCqAjZgxsKqVaLzIYmfzQvFoFG7u4DjWIg4vba1cjS+vF62xizcfH2RsiaadbUZNqXwWAr8eoIMzAdOlQofNTzn9slVwbkDlsJ9HW89DbGS4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159996478346372.90548810755627; Sat, 12 Sep 2020 19:39:43 -0700 (PDT) Received: from localhost ([::1]:50864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHHva-00021c-73 for importer@patchew.org; Sat, 12 Sep 2020 22:39:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsn-0004wS-VI for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:49 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:43810 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsl-0003W2-69 for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:49 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 610A2AAA757FD8435F1E; Sun, 13 Sep 2020 10:36:43 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sun, 13 Sep 2020 10:36:34 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v3 4/6] migration/tls: extract cleanup function for common-use Date: Sun, 13 Sep 2020 10:47:34 +0800 Message-ID: <1599965256-72150-5-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> References: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.35; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/12 22:36:44 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhengchuan@huawei.com, zhang.zhanghailiang@huawei.com, yuxiating@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, jinyan12@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" multifd channel cleanup is need if multifd handshake failed, let's extract it. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/multifd.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index 3e41d9e..fe08911 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -720,6 +720,23 @@ out: return NULL; } =20 +static void multifd_new_send_channel_cleanup(MultiFDSendParams *p, + QIOChannel *ioc, Error *err) +{ + migrate_set_error(migrate_get_current(), err); + /* Error happen, we need to tell who pay attention to me */ + qemu_sem_post(&multifd_send_state->channels_ready); + qemu_sem_post(&p->sem_sync); + /* + * Although multifd_send_thread is not created, but main migration + * thread neet to judge whether it is running, so we need to mark + * its status. + */ + p->quit =3D true; + object_unref(OBJECT(ioc)); + error_free(err); +} + static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque) { MultiFDSendParams *p =3D opaque; @@ -728,25 +745,18 @@ static void multifd_new_send_channel_async(QIOTask *t= ask, gpointer opaque) =20 trace_multifd_new_send_channel_async(p->id); if (qio_task_propagate_error(task, &local_err)) { - migrate_set_error(migrate_get_current(), local_err); - /* Error happen, we need to tell who pay attention to me */ - qemu_sem_post(&multifd_send_state->channels_ready); - qemu_sem_post(&p->sem_sync); - /* - * Although multifd_send_thread is not created, but main migration - * thread neet to judge whether it is running, so we need to mark - * its status. - */ - p->quit =3D true; - object_unref(OBJECT(sioc)); - error_free(local_err); + goto cleanup; } else { p->c =3D QIO_CHANNEL(sioc); qio_channel_set_delay(p->c, false); p->running =3D true; qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, QEMU_THREAD_JOINABLE); + return; } + +cleanup: + multifd_new_send_channel_cleanup(p, sioc, local_err); } =20 int multifd_save_setup(Error **errp) --=20 1.8.3.1 From nobody Wed May 8 01:59:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1599964661; cv=none; d=zohomail.com; s=zohoarc; b=ALecMJtuHlhTY6Mcqvka3OjzL4acDQWOxJD8JPOyhXdVSgD/CeO7FVp4KC+4TnzyUcCWCI79BfsIMZbLAkBErHE6MrjGffxkyvE+anX4lv8rDOdrUnQg8kNVpQgG45/sBi86zHzL6KV+E5I1h23JVO72q2zMTU9OPczX5mgtDFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599964661; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Lu+wrY+tJba37y0b4tawzATY1AVed6TCvC53PReiE4w=; b=nD4MtXX/F1Q/hVT42knOayEfBtDwe+YjgYM0g+d4pn5rhjXRVRHmvs4gIqh36KcZGfi/sOeTQFQtwBR4Qo6nEVaLULMzUPoJxS53Z9fuuivYyagKHNAwIo6AOpXMnUh3lZZ/pieIP1gF+vJvmwkwn0RjKJNb+jtRZR9+6mSS44g= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159996466129060.83305827219783; Sat, 12 Sep 2020 19:37:41 -0700 (PDT) Received: from localhost ([::1]:41256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHHtb-0006Y8-HP for importer@patchew.org; Sat, 12 Sep 2020 22:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHso-0004wp-TI for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:50 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:43812 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsl-0003W5-8h for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:50 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 56B86DB37B92CDC846AC; Sun, 13 Sep 2020 10:36:43 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sun, 13 Sep 2020 10:36:34 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v3 5/6] migration/tls: add support for multifd tls-handshake Date: Sun, 13 Sep 2020 10:47:35 +0800 Message-ID: <1599965256-72150-6-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> References: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.35; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/12 22:36:44 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhengchuan@huawei.com, zhang.zhanghailiang@huawei.com, yuxiating@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, jinyan12@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Similar like migration main thread, we need to do handshake for each multifd thread. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/multifd.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++= ++-- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index fe08911..8aea4e0 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -20,6 +20,7 @@ #include "ram.h" #include "migration.h" #include "socket.h" +#include "tls.h" #include "qemu-file.h" #include "trace.h" #include "multifd.h" @@ -720,6 +721,77 @@ out: return NULL; } =20 +static bool multifd_channel_connect(MultiFDSendParams *p, + QIOChannel *ioc, + Error *error); + +static void multifd_tls_outgoing_handshake(QIOTask *task, + gpointer opaque) +{ + MultiFDSendParams *p =3D opaque; + QIOChannel *ioc =3D QIO_CHANNEL(qio_task_get_source(task)); + Error *err =3D NULL; + + qio_task_propagate_error(task, &err); + multifd_channel_connect(p, ioc, err); +} + +static void multifd_tls_channel_connect(MultiFDSendParams *p, + QIOChannel *ioc, + Error **errp) +{ + MigrationState *s =3D p->s; + const char *hostname =3D p->tls_hostname; + QIOChannelTLS *tioc; + + tioc =3D migration_tls_client_create(s, ioc, hostname, errp); + if (!tioc) { + return; + } + + qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing"); + qio_channel_tls_handshake(tioc, + multifd_tls_outgoing_handshake, + p, + NULL, + NULL); + +} + +static bool multifd_channel_connect(MultiFDSendParams *p, + QIOChannel *ioc, + Error *error) +{ + MigrationState *s =3D p->s; + + if (!error) { + if (s->parameters.tls_creds && + *s->parameters.tls_creds && + !object_dynamic_cast(OBJECT(ioc), + TYPE_QIO_CHANNEL_TLS)) { + multifd_tls_channel_connect(p, ioc, &error); + if (!error) { + /* + * tls_channel_connect will call back to this + * function after the TLS handshake, + * so we mustn't call multifd_send_thread until then + */ + return false; + } else { + return true; + } + } else { + /* update for tls qio channel */ + p->c =3D ioc; + qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, + QEMU_THREAD_JOINABLE); + } + return false; + } + + return true; +} + static void multifd_new_send_channel_cleanup(MultiFDSendParams *p, QIOChannel *ioc, Error *err) { @@ -750,8 +822,9 @@ static void multifd_new_send_channel_async(QIOTask *tas= k, gpointer opaque) p->c =3D QIO_CHANNEL(sioc); qio_channel_set_delay(p->c, false); p->running =3D true; - qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, - QEMU_THREAD_JOINABLE); + if (multifd_channel_connect(p, sioc, local_err)) { + goto cleanup; + } return; } =20 --=20 1.8.3.1 From nobody Wed May 8 01:59:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1599964728; cv=none; d=zohomail.com; s=zohoarc; b=atVrJ/rvU6w+KA+TFSRLwaW4Xi4hVZKO3OZmxR3vvBF8AqZsKIwqWJEqGXcX22UP5HcbJDQe6q9nc+nNU/4B9fbsMg9hJ7/NHGzlLPP7XzwS+HAI9kRRXB69ySD5PuDIxg0VzjG1oT6PNxYfsFz74SjlX9RuC1C3/9zLA7tk7Ls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599964728; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x3xUTqxVFVWwcsCbvYJ00hdBvBi6zLj5OU5S8GkXmJY=; b=IimfshfriHcyzbKA2s5NM/iASdGlBrcOO9UWJ7NgTAEK1yCBjCQ8gs2mH1gpsDNhAM5+mhiBviBmuidXUKVPUvFxK32NOC+38S3FBcmPGH1AksjHjhgFhNAR/lz9tR669D1Ton2WUUVox+vlHp/4/6KUV3nd5S02sM22N8S/nsE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599964728310804.0073041037732; Sat, 12 Sep 2020 19:38:48 -0700 (PDT) Received: from localhost ([::1]:47672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHHuh-0000hc-3l for importer@patchew.org; Sat, 12 Sep 2020 22:38:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsq-0004ya-37 for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:52 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:43806 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHHsm-0003W3-Ui for qemu-devel@nongnu.org; Sat, 12 Sep 2020 22:36:51 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 5BF4D1059D727A614219; Sun, 13 Sep 2020 10:36:43 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Sun, 13 Sep 2020 10:36:35 +0800 From: Chuan Zheng To: , , , Subject: [PATCH v3 6/6] migration/tls: add trace points for multifd-tls Date: Sun, 13 Sep 2020 10:47:36 +0800 Message-ID: <1599965256-72150-7-git-send-email-zhengchuan@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> References: <1599965256-72150-1-git-send-email-zhengchuan@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.35; envelope-from=zhengchuan@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/12 22:36:44 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhengchuan@huawei.com, zhang.zhanghailiang@huawei.com, yuxiating@huawei.com, qemu-devel@nongnu.org, xiexiangyou@huawei.com, alex.chen@huawei.com, jinyan12@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" add trace points for multifd-tls for debug. Signed-off-by: Chuan Zheng Signed-off-by: Yan Jin Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/multifd.c | 10 +++++++++- migration/trace-events | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/migration/multifd.c b/migration/multifd.c index 8aea4e0..0760502 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -732,7 +732,11 @@ static void multifd_tls_outgoing_handshake(QIOTask *ta= sk, QIOChannel *ioc =3D QIO_CHANNEL(qio_task_get_source(task)); Error *err =3D NULL; =20 - qio_task_propagate_error(task, &err); + if (qio_task_propagate_error(task, &err)) { + trace_multifd_tls_outgoing_handshake_error(ioc, error_get_pretty(e= rr)); + } else { + trace_multifd_tls_outgoing_handshake_complete(ioc); + } multifd_channel_connect(p, ioc, err); } =20 @@ -749,6 +753,7 @@ static void multifd_tls_channel_connect(MultiFDSendPara= ms *p, return; } =20 + trace_multifd_tls_outgoing_handshake_start(ioc, tioc, hostname); qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing"); qio_channel_tls_handshake(tioc, multifd_tls_outgoing_handshake, @@ -764,6 +769,9 @@ static bool multifd_channel_connect(MultiFDSendParams *= p, { MigrationState *s =3D p->s; =20 + trace_multifd_set_outgoing_channel( + ioc, object_get_typename(OBJECT(ioc)), s->hostname, error); + if (!error) { if (s->parameters.tls_creds && *s->parameters.tls_creds && diff --git a/migration/trace-events b/migration/trace-events index 7ba2fa6..faf52a8 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -129,6 +129,10 @@ multifd_send_sync_main_wait(uint8_t id) "channel %d" multifd_send_terminate_threads(bool error) "error %d" multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 multifd_send_thread_start(uint8_t id) "%d" +multifd_tls_outgoing_handshake_start(void *ioc, void *tioc, const char *ho= stname) "ioc=3D%p tioc=3D%p hostname=3D%s" +multifd_tls_outgoing_handshake_error(void *ioc, const char *err) "ioc=3D%p= err=3D%s" +multifd_tls_outgoing_handshake_complete(void *ioc, void) "ioc=3D%p" +multifd_set_outgoing_channel(void *ioc, const char *ioctype, const char *h= ostname, void *err) "ioc=3D%p ioctype=3D%s hostname=3D%s err=3D%p" =20 # migration.c await_return_path_close_on_source_close(void) "" --=20 1.8.3.1