From nobody Sun Feb 8 20:12:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1697468586; cv=none; d=zohomail.com; s=zohoarc; b=jYQrTJAlzSJRFdlfNobIKMtNal1xU094oKFk5F5MrEjGZRla0eME9GCqXtI+5lsdEF1s3OfdSb7U8wseETytIPohI0NF3ZT0wuevQa7yB/8ilj1QNYk/8ZAQDAkBB+895TDH29hW/jbNJbOa+nWPf8tRTJ+9qbIj17hofT6Rdls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697468586; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=VEe0TIUGaI8+yn0EX2NXHUG66IFY2ihecZVDhqDMfiU=; b=Fph+DUwPVdcjhazMkeh/aQqnT/RTulD0o10LjcK3l8zjSb0yv9Kqnd9IqMED/W+KjiINan0DsUNdFAeMyVpH6S/JbB9m0qSSfev+EqiPi5w1nDdB71iNWmgnBh5SdQFS1d4mBRHHC1Y83HRCbKkCPRD7qZ3amUrE3bY2YXM2MI4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1697468586893839.0307072298093; Mon, 16 Oct 2023 08:03:06 -0700 (PDT) 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-175-2wvRtYDoN9C04ZsT8Zei2g-1; Mon, 16 Oct 2023 11:02:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A9D28E8C78; Mon, 16 Oct 2023 15:02:30 +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 456D463F51; Mon, 16 Oct 2023 15:02:30 +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 33B1B1946589; Mon, 16 Oct 2023 15:02:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4B0161946595 for ; Mon, 16 Oct 2023 15:02:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3B43540C6CA6; Mon, 16 Oct 2023 15:02:29 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B3C940C6CA0 for ; Mon, 16 Oct 2023 15:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697468585; 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=VEe0TIUGaI8+yn0EX2NXHUG66IFY2ihecZVDhqDMfiU=; b=gVZ+ckJRVXeNv87zNKOanWgbKhua3pqYLEviGfMbaLMEQVCyCJMJJWjFcRid1z3Jgu1/f5 nJYipmaPf4vYMsP02b9dHrdiHay13Dr5KMA7umoqALmcQrFiUiWLOTBwZsZAuoqkqum74M G6k1jOMtZCLYh/3g5j/3boxYsj8heuo= X-MC-Unique: 2wvRtYDoN9C04ZsT8Zei2g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 28/31] qemu: Convert migration setup code to use 'format' layer node name accessors Date: Mon, 16 Oct 2023 17:01:55 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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 3.1 on 10.11.54.5 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: 1697468588402100007 Content-Type: text/plain; charset="utf-8" The blockjob, NBD export and setup of the cookie data all care about the effective nodename. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 6 +++--- src/qemu/qemu_migration.c | 4 ++-- src/qemu/qemu_migration_cookie.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index edc8edcb70..fa31028db3 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3406,11 +3406,11 @@ qemuBlockExportAddNBD(virDomainObj *vm, const char *bitmaps[2] =3D { bitmap, NULL }; if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_EXPORT_ADD)) - return qemuMonitorNBDServerAdd(priv->mon, src->nodeformat, + return qemuMonitorNBDServerAdd(priv->mon, qemuBlockStorageSourceGe= tEffectiveNodename(src), exportname, writable, bitmap); - if (!(nbdprops =3D qemuBlockExportGetNBDProps(src->nodeformat, exportn= ame, - writable, bitmaps))) + if (!(nbdprops =3D qemuBlockExportGetNBDProps(qemuBlockStorageSourceGe= tEffectiveNodename(src), + exportname, writable, bitm= aps))) return -1; return qemuMonitorBlockExportAdd(priv->mon, &nbdprops); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7d08df1fc5..949ef6d6d5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1012,7 +1012,7 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(v= irDomainDiskDef *disk, copysrc->tlsHostname =3D g_strdup(tlsHostname); qemuBlockStorageSourceSetStorageNodename(copysrc, g_strdup_printf("mig= ration-%s-storage", disk->dst)); - copysrc->nodeformat =3D g_strdup_printf("migration-%s-format", disk->d= st); + qemuBlockStorageSourceSetFormatNodename(copysrc, g_strdup_printf("migr= ation-%s-format", disk->dst)); return g_steal_pointer(©src); } @@ -1060,7 +1060,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *= vm, if (mon_ret =3D=3D 0) mon_ret =3D qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), di= skAlias, true, qemuDomainDiskGetTopNodename(d= isk), - copysrc->nodeformat, + qemuBlockStorageSourceGetEffec= tiveNodename(copysrc), mirror_speed, 0, 0, mirror_sha= llow, syncWrites); diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 7f0b7a3412..ba146960d5 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -31,6 +31,7 @@ #include "qemu_domain.h" #include "qemu_migration_cookie.h" #include "qemu_migration_params.h" +#include "qemu_block.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -507,7 +508,7 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, virDomainDiskDef *disk =3D vm->def->disks[i]; qemuBlockStats *entry; - if (!(entry =3D virHashLookup(stats, disk->src->nodeformat))) + if (!(entry =3D virHashLookup(stats, qemuBlockStorageSourceGetEffe= ctiveNodename(disk->src)))) continue; mig->nbd->disks[mig->nbd->ndisks].target =3D g_strdup(disk->dst); --=20 2.41.0