From nobody Mon Feb 9 13:03:41 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=1697468648; cv=none; d=zohomail.com; s=zohoarc; b=Tznzt07hcHHEyHHOgG5qEnm7vJNSY5leL1V5HVDp5gb+8S7R0Vq9G+K4Gf6PzYMfmof6Vbnplqi9yztLYdAlrtZ4Lnzr8TOyUD3aKSgBVsRPyU9jvJ1wgmxswBz5MejAJlzQBwcINVt54V6gJyC/Pjlt00566wpCo5784WzJwoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697468648; 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=N7Iyri2HNfQj8hJ9uFshk6M7FB9tjJSBEFg8EB9HORM=; b=ncJLn5anJqluyS/SJ9RTwF6/8zzPO+EEWwcivBZZjNmq+IOnU+5tar4IsCYjwO3nwr5dg9c5ow2XilHZqeinYAkcj6WJvUtkPQ1xwPcfneyTYy4pRdmLeIgfggbZgutqxupQ+pMKv3EbF8PlkX0vMQAiqBDxNVCU6dWL8Hnac2Y= 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 1697468648791363.0097716300105; Mon, 16 Oct 2023 08:04:08 -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-648-DP9a8AWoNi-ij8xYIZTZjg-1; Mon, 16 Oct 2023 11:03:06 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 A317E1029F49; Mon, 16 Oct 2023 15:02:32 +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 8EDDE1102E14; Mon, 16 Oct 2023 15:02:32 +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 7DA3A194658C; Mon, 16 Oct 2023 15:02:32 +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 BE7AF194658D for ; Mon, 16 Oct 2023 15:02:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 90D0840C6F7F; Mon, 16 Oct 2023 15:02:30 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id F347040C6CA0 for ; Mon, 16 Oct 2023 15:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697468647; 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=N7Iyri2HNfQj8hJ9uFshk6M7FB9tjJSBEFg8EB9HORM=; b=espfRzcJrbH6vBYZT9LbdA6mYEjRAa2eSC5cc/VZPK8kd6nyEQzbLFj73GTGzorIDGNOOX DEYuSL9cA35vKrltxUIR+2KrRahiEwyObfBpM5Il/fbtLRe+zv7ALlzZB407NAW45L6F95 zXvjoI88OdMssAupsUlVV64G285lEl0= X-MC-Unique: DP9a8AWoNi-ij8xYIZTZjg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 29/31] qemu: migration: Use 'format' nodename accessors in dirty bitmap migration Date: Mon, 16 Oct 2023 17:01:56 +0200 Message-ID: <80890686c5541a8592b24f2c533134796a5b1272.1697468414.git.pkrempa@redhat.com> 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.3 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: 1697468650692100011 Content-Type: text/plain; charset="utf-8" The persistent bitmaps are stored in the format layer, using 'effective' bitmap name is the most reasonable approach in this case. Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 11 ++++++----- src/qemu/qemu_migration_cookie.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 949ef6d6d5..76da981d08 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2393,7 +2393,8 @@ qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(qemuMigra= tionCookie *mig, qemuMigrationBlockDirtyBitmapsDisk *disk; GSList *bitmaps =3D NULL; virDomainDiskDef *diskdef =3D vm->def->disks[i]; - qemuBlockNamedNodeData *nodedata =3D virHashLookup(blockNamedNodeD= ata, diskdef->src->nodeformat); + qemuBlockNamedNodeData *nodedata =3D virHashLookup(blockNamedNodeD= ata, + qemuBlockStorageS= ourceGetEffectiveNodename(diskdef->src)); size_t j; if (!nodedata) @@ -4456,7 +4457,7 @@ qemuMigrationSrcRunPrepareBlockDirtyBitmapsMerge(virD= omainObj *vm, granularity =3D b->granularity; if (qemuMonitorTransactionBitmapMergeSourceAddBitmap(merge, - n->no= deformat, + qemuB= lockStorageSourceGetEffectiveNodename(n), b->na= me) < 0) return -1; } @@ -4465,19 +4466,19 @@ qemuMigrationSrcRunPrepareBlockDirtyBitmapsMerge(vi= rDomainObj *vm, bitmap->persistent =3D VIR_TRISTATE_BOOL_YES; if (qemuMonitorTransactionBitmapAdd(actions, - disk->disk->src->nodeforma= t, + qemuBlockStorageSourceGetE= ffectiveNodename(disk->disk->src), bitmap->sourcebitmap, false, false, granularity)= < 0) return -1; if (qemuMonitorTransactionBitmapMerge(actions, - disk->disk->src->nodefor= mat, + qemuBlockStorageSourceGe= tEffectiveNodename(disk->disk->src), bitmap->sourcebitmap, &merge) < 0) return -1; tmpbmp =3D g_new0(qemuDomainJobPrivateMigrateTempBitmap, 1); - tmpbmp->nodename =3D g_strdup(disk->disk->src->nodeformat); + tmpbmp->nodename =3D g_strdup(qemuBlockStorageSourceGetEffecti= veNodename(disk->disk->src)); tmpbmp->bitmapname =3D g_strdup(bitmap->sourcebitmap); tmpbitmaps =3D g_slist_prepend(tmpbitmaps, tmpbmp); } diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index ba146960d5..5505fdaf22 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1573,7 +1573,7 @@ qemuMigrationCookieBlockDirtyBitmapsMatchDisks(virDom= ainDef *def, return -1; } - disk->nodename =3D disk->disk->src->nodeformat; + disk->nodename =3D qemuBlockStorageSourceGetEffectiveNodename(disk= ->disk->src); } return 0; --=20 2.41.0