From nobody Mon Feb 9 02:14:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646915173; cv=none; d=zohomail.com; s=zohoarc; b=mzfGnDuLiiLeJh2NU9eGdf9xcVw/D92N4FtoupZm9qMYhk/ayrOEGCnYK2H+EycUfSu2mMfoU+zfMjH/Od2Yj3A3Qz13gPwrMK37THBEW/KADYSOTw/ecgoU55SSeoNP7wmJr99tXZnbkSNF9kPF26ioiW29H+eJKfStx6b3bvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646915173; h=Content-Type:Content-Transfer-Encoding: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=Qt3++nE/Sm/hLQLiPOr0yqZViAhD386aDg062CI0pqk=; b=OCzQ6YsVRbd4GvsqpIdg2fh5syPFe/rvQtEipCPM6UlZjMwn2i6XxMgkizR7KhByZX2WQce5vcAbZxzQip5hUMHO8Uh3ig4iHhumHHi7il87tC0AggRpqwWrySqesnhaZ5Lo0o4yTHPdmK5AwQG07KGOK8/yqAQgxWvmgXOmwXc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 164691517302170.23778294412568; Thu, 10 Mar 2022 04:26:13 -0800 (PST) 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-380-THFZKDAENbeFFBlYuiZuCQ-1; Thu, 10 Mar 2022 07:26:08 -0500 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 7035785A5A8; Thu, 10 Mar 2022 12:26:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CE4440D2826; Thu, 10 Mar 2022 12:26:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 11926195357C; Thu, 10 Mar 2022 12:26:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BE2991953576 for ; Thu, 10 Mar 2022 12:26:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 666E41059A73; Thu, 10 Mar 2022 12:26:04 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBB071059A76 for ; Thu, 10 Mar 2022 12:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646915172; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Qt3++nE/Sm/hLQLiPOr0yqZViAhD386aDg062CI0pqk=; b=hm1Tf7TgrGRWlghdN9reKSTDY4i2e+2Bf7hdmZVkvqyrNCH9GIaXbSYmtmjmKWAPOd5RnF 0kN+fB5UNqT0C7wKDd0U3JbtrPrsompc1nqzL/1VDm5HHye1+XakxjokouOIGzOXibtJoE Y/liNgrOEld1LrI/kJGYTXRPg/lEfTU= X-MC-Unique: THFZKDAENbeFFBlYuiZuCQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/10] qemu: migration: Use 'VIR_MIGRATE_PARAM_TLS_DESTINATION' for the NBD connection Date: Thu, 10 Mar 2022 13:25:26 +0100 Message-Id: <05ffc9b2e346e95f9f616e304fc6c816e7e2b1b1.1646915027.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646915173790100003 Content-Type: text/plain; charset="utf-8" The NBD connection for non-shared storage migration can have the same issue regarding TLS certificate name match as the migration connection itself. Propagate the configured name also for the NBD connections. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1901448 Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 21 +++++++++++++++++---- src/qemu/qemu_migration_params.c | 17 +++++++++++++++++ src/qemu/qemu_migration_params.h | 3 +++ 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 42fc5c5d62..3650de3de8 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -883,7 +883,8 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(vir= DomainDiskDef *disk, const char *host, int port, const char *socket, - const char *tlsAlias) + const char *tlsAlias, + const char *tlsHostnam= e) { g_autoptr(virStorageSource) copysrc =3D NULL; @@ -910,6 +911,7 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(vir= DomainDiskDef *disk, } copysrc->tlsAlias =3D g_strdup(tlsAlias); + copysrc->tlsHostname =3D g_strdup(tlsHostname); copysrc->nodestorage =3D g_strdup_printf("migration-%s-storage", disk-= >dst); copysrc->nodeformat =3D g_strdup_printf("migration-%s-format", disk->d= st); @@ -931,6 +933,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *d= river, unsigned long long mirror_speed, unsigned int mirror_shallow, const char *tlsAlias, + const char *tlsHostname, bool syncWrites) { g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; @@ -940,7 +943,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *d= river, VIR_DEBUG("starting blockdev mirror for disk=3D%s to host=3D%s", disk-= >dst, host); - if (!(copysrc =3D qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(= disk, host, port, socket, tlsAlias))) + if (!(copysrc =3D qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(= disk, host, port, socket, + tl= sAlias, tlsHostname))) return -1; /* Migration via blockdev-mirror was supported sooner than the auto-re= ad-only @@ -1025,6 +1029,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driv= er, unsigned long long mirror_speed, bool mirror_shallow, const char *tlsAlias, + const char *tlsHostname, unsigned int flags) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -1065,6 +1070,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driv= er, mirror_speed, mirror_shallow, tlsAlias, + tlsHostname, syncWrites); } else { rc =3D qemuMigrationSrcNBDStorageCopyDriveMirror(driver, vm, diskA= lias, @@ -1114,6 +1120,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, const char **migrate_disks, virConnectPtr dconn, const char *tlsAlias, + const char *tlsHostname, const char *nbdURI, unsigned int flags) { @@ -1137,6 +1144,11 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, } mirror_speed <<=3D 20; + /* If qemu doesn't support overriding of TLS hostname for NBD connecti= ons + * we won't attempt it */ + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAM= E)) + tlsHostname =3D NULL; + /* steal NBD port and thus prevent its propagation back to destination= */ port =3D mig->nbd->port; mig->nbd->port =3D 0; @@ -1185,7 +1197,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, if (qemuMigrationSrcNBDStorageCopyOne(driver, vm, disk, host, port, socket, mirror_speed, mirror_shallow, - tlsAlias, flags) < 0) + tlsAlias, tlsHostname, flags= ) < 0) return -1; if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { @@ -4138,6 +4150,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, if (storageMigration) { if (mig->nbd) { const char *host =3D ""; + const char *tlsHostname =3D qemuMigrationParamsGetTLSHostname(= migParams); if (spec->destType =3D=3D MIGRATION_DEST_HOST || spec->destType =3D=3D MIGRATION_DEST_CONNECT_HOST) { @@ -4157,7 +4170,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, priv->migMaxBandwidth, nmigrate_disks, migrate_disks, - dconn, tlsAlias, + dconn, tlsAlias, tlsHostnam= e, nbdURI, flags) < 0) { goto error; } diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 7b225fdf4b..e30fd04ada 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -1464,3 +1464,20 @@ qemuMigrationCapsGet(virDomainObj *vm, return enabled; } + + +/** + * qemuMigrationParamsGetTLSHostname: + * @migParams: Migration params object + * + * Fetches the value of the QEMU_MIGRATION_PARAM_TLS_HOSTNAME parameter wh= ich is + * passed from the user as VIR_MIGRATE_PARAM_TLS_DESTINATION + */ +const char * +qemuMigrationParamsGetTLSHostname(qemuMigrationParams *migParams) +{ + if (!migParams->params[QEMU_MIGRATION_PARAM_TLS_HOSTNAME].set) + return NULL; + + return migParams->params[QEMU_MIGRATION_PARAM_TLS_HOSTNAME].value.s; +} diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_par= ams.h index b4de8dda7b..4a8815e776 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -167,3 +167,6 @@ qemuMigrationCapsCheck(virQEMUDriver *driver, bool qemuMigrationCapsGet(virDomainObj *vm, qemuMigrationCapability cap); + +const char * +qemuMigrationParamsGetTLSHostname(qemuMigrationParams *migParams); --=20 2.35.1