From nobody Sat May 11 08:58:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682670914; cv=none; d=zohomail.com; s=zohoarc; b=SavOgmNrRGYsQrRMg01vf9Iq06HeXSa8ie2YkkiAWoMewdQ5sWWnTnCS71mj7HyzlQtigNV77uFk+ffqUawLvgWQnKOQQLtwxaRiXC4UAgrT2FBfVuQDgjYa3xD6pQS4nw/L9a9+PvrkpTgKb6JfYMlU2/PXPAa0noNNESrQRWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682670914; h=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=21zJ9OHYfCjdqi0xMTuVLkKEC6/QM+t/Y7XcAmYUI6Q=; b=LC7OHiPcTIL1aWRsImERbmCajcLrv3F5/zbm1RNQ+LAUB/q6nG7ABZzWgvu138J4f1U5SsUM4pVX2XttyMEl+YYz1wbPFs+3TM++dh0zt7uHBX4nEq36o5Cz55u5jp2xZyZg78eHbHKYmQPqtem6Q9VLapb4z2ZWEIPGopmoNRg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682670914615532.8666756049788; Fri, 28 Apr 2023 01:35:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psJYr-00064Q-Rk; Fri, 28 Apr 2023 04:34:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psJYo-00063j-IC for qemu-devel@nongnu.org; Fri, 28 Apr 2023 04:34:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psJYl-000305-LA for qemu-devel@nongnu.org; Fri, 28 Apr 2023 04:34:32 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-493-d8MQ7eg2PuaIvgh978254A-1; Fri, 28 Apr 2023 04:34:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3D4D43815EEC; Fri, 28 Apr 2023 08:34:24 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 54C4B40C6EC4; Fri, 28 Apr 2023 08:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682670869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=21zJ9OHYfCjdqi0xMTuVLkKEC6/QM+t/Y7XcAmYUI6Q=; b=C0K6DA/SLw6lq4tUNdm+PfA/LqLBs0TPuTr1o58SlBm35iSmzBP+zpyjJ/6RUL7hA27xWt L0lS4CtrqgAaaCUHOwikvEyZjBMDiCX5NMCX/wNwDWJS5+Kx/E6XbrsjFaGYJAAkY3MDSZ psO+c1KhyN05rqhwCTnrP78a2ESo60E= X-MC-Unique: d8MQ7eg2PuaIvgh978254A-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras , Vladimir Sementsov-Ogievskiy Subject: [PATCH 1/2] migration: Drop unused parameter for migration_tls_get_creds() Date: Fri, 28 Apr 2023 10:34:20 +0200 Message-Id: <20230428083421.34701-2-quintela@redhat.com> In-Reply-To: <20230428083421.34701-1-quintela@redhat.com> References: <20230428083421.34701-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682670916057100001 Content-Type: text/plain; charset="utf-8" It is not needed since we moved the accessor for tls properties to options.c. Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- migration/tls.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/migration/tls.c b/migration/tls.c index cd29177957..d4a76cf590 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -29,9 +29,7 @@ #include "trace.h" =20 static QCryptoTLSCreds * -migration_tls_get_creds(MigrationState *s, - QCryptoTLSCredsEndpoint endpoint, - Error **errp) +migration_tls_get_creds(QCryptoTLSCredsEndpoint endpoint, Error **errp) { Object *creds; const char *tls_creds =3D migrate_tls_creds(); @@ -80,8 +78,7 @@ void migration_tls_channel_process_incoming(MigrationStat= e *s, QCryptoTLSCreds *creds; QIOChannelTLS *tioc; =20 - creds =3D migration_tls_get_creds( - s, QCRYPTO_TLS_CREDS_ENDPOINT_SERVER, errp); + creds =3D migration_tls_get_creds(QCRYPTO_TLS_CREDS_ENDPOINT_SERVER, e= rrp); if (!creds) { return; } @@ -124,8 +121,7 @@ QIOChannelTLS *migration_tls_client_create(MigrationSta= te *s, { QCryptoTLSCreds *creds; =20 - creds =3D migration_tls_get_creds( - s, QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, errp); + creds =3D migration_tls_get_creds(QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT, e= rrp); if (!creds) { return NULL; } --=20 2.40.0 From nobody Sat May 11 08:58:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682670906; cv=none; d=zohomail.com; s=zohoarc; b=eww6gLBTPh2H013nWXN8WU/McUosD0jzYgm+MaLZ9+Z02f7hQQXs7mzg70PMsqIEVD7C7N5YD4T1rSSnTX/vDY/CRHP9HtTH0imTG/soEQ2tPsjJXMJWy7zjfw9pQIBMZUN/yF1J6Y4l248e3+dUx/1jIw0rDAFvPMkVyZtG0aw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682670906; h=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=PmueY/JkvaaAxHxY4uDGMTR/xv1pNhQgFztTvvViGhk=; b=bpxHDO/uwY74N3EYThIeophb8mJieh1uFqlh9WrMBXE5OMtWjSzxeNSteVrnKGy/arNN1jL4wLcliiDX4w0nyKyjIjHTMdmVD+1Vlr3ienjWXlxRgYQd+ZVu3DEVsB1oYN6V5H64bCLpdKduUs7L4QwU3LQFWSklAiDqUgk4DWI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682670906466490.4092867076266; Fri, 28 Apr 2023 01:35:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psJYq-00064B-D1; Fri, 28 Apr 2023 04:34:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psJYn-00063k-Ab for qemu-devel@nongnu.org; Fri, 28 Apr 2023 04:34:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psJYl-000309-L3 for qemu-devel@nongnu.org; Fri, 28 Apr 2023 04:34:33 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-227-ie0yN1ztMfSv79DlWNHNcA-1; Fri, 28 Apr 2023 04:34:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BDCDE858F09; Fri, 28 Apr 2023 08:34:25 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8166A40C6EC4; Fri, 28 Apr 2023 08:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682670869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PmueY/JkvaaAxHxY4uDGMTR/xv1pNhQgFztTvvViGhk=; b=UA18PRBIYbNG/gjVSY/uYN21Z7seatUzhEydxVtRn0QdWvhb8GXsskx/52YFDyu956OsPG 4zjAOuugoOIeApLREByvQvIoKrIEcMSIuu5v2SyeiVXCvTZi5AkmH47hJl0YqBbinhNXdy QptJWbZpgNdp0H1wkEvpCTSn52w8Cso= X-MC-Unique: ie0yN1ztMfSv79DlWNHNcA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Peter Xu , Leonardo Bras , Vladimir Sementsov-Ogievskiy Subject: [PATCH 2/2] migration: Drop unused parameter for migration_tls_client_create() Date: Fri, 28 Apr 2023 10:34:21 +0200 Message-Id: <20230428083421.34701-3-quintela@redhat.com> In-Reply-To: <20230428083421.34701-1-quintela@redhat.com> References: <20230428083421.34701-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682670908833100003 Content-Type: text/plain; charset="utf-8" It is not needed since we moved the accessor for tls properties to options.c. Suggested-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- migration/multifd.c | 2 +- migration/postcopy-ram.c | 2 +- migration/tls.c | 5 ++--- migration/tls.h | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index 6a59c03dd2..5019a79ff4 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -823,7 +823,7 @@ static void multifd_tls_channel_connect(MultiFDSendPara= ms *p, const char *hostname =3D s->hostname; QIOChannelTLS *tioc; =20 - tioc =3D migration_tls_client_create(s, ioc, hostname, errp); + tioc =3D migration_tls_client_create(ioc, hostname, errp); if (!tioc) { return; } diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 75aa276bb1..5615ec29eb 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -1632,7 +1632,7 @@ postcopy_preempt_send_channel_new(QIOTask *task, gpoi= nter opaque) } =20 if (migrate_channel_requires_tls_upgrade(ioc)) { - tioc =3D migration_tls_client_create(s, ioc, s->hostname, &local_e= rr); + tioc =3D migration_tls_client_create(ioc, s->hostname, &local_err); if (!tioc) { goto out; } diff --git a/migration/tls.c b/migration/tls.c index d4a76cf590..fa03d9136c 100644 --- a/migration/tls.c +++ b/migration/tls.c @@ -114,8 +114,7 @@ static void migration_tls_outgoing_handshake(QIOTask *t= ask, object_unref(OBJECT(ioc)); } =20 -QIOChannelTLS *migration_tls_client_create(MigrationState *s, - QIOChannel *ioc, +QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc, const char *hostname, Error **errp) { @@ -141,7 +140,7 @@ void migration_tls_channel_connect(MigrationState *s, { QIOChannelTLS *tioc; =20 - tioc =3D migration_tls_client_create(s, ioc, hostname, errp); + tioc =3D migration_tls_client_create(ioc, hostname, errp); if (!tioc) { return; } diff --git a/migration/tls.h b/migration/tls.h index 98e23c9b0e..5797d153cb 100644 --- a/migration/tls.h +++ b/migration/tls.h @@ -28,8 +28,7 @@ void migration_tls_channel_process_incoming(MigrationStat= e *s, QIOChannel *ioc, Error **errp); =20 -QIOChannelTLS *migration_tls_client_create(MigrationState *s, - QIOChannel *ioc, +QIOChannelTLS *migration_tls_client_create(QIOChannel *ioc, const char *hostname, Error **errp); =20 --=20 2.40.0