From nobody Mon Feb 9 01:14:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1727703195430436.8362624404323; Mon, 30 Sep 2024 06:33:15 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 665DA1187; Mon, 30 Sep 2024 09:33:14 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A251D1458; Mon, 30 Sep 2024 09:30:09 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 725F11259; Mon, 30 Sep 2024 09:30:00 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id DC5F112DC for ; Mon, 30 Sep 2024 09:29:49 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-Ii71HGJRNgy8FPwbNuP9ag-1; Mon, 30 Sep 2024 09:29:46 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 32ACE19033CC for ; Mon, 30 Sep 2024 13:29:46 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.12]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6E80319541A0 for ; Mon, 30 Sep 2024 13:29:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727702989; h=from:from: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; bh=MWJbt3f7/Kwe82/4dXPgCHjJNhMh0JLlKraRztf1f8M=; b=foHu5B4TfRHXVkmkgQyXCSPTByhTurSa9j5Cpg/t8C5su6uXazLJqGfL9L2heHSJhCr9kX ofDb3Adczx/p+ligjVXwGhqa+v+8YD9LNhss1iqwafYDzFjkkkgkxpcAhFH+8/1k1EmVj/ QgKS133LBgQJOQBOJR1ScF0LW6qL0Ms= X-MC-Unique: Ii71HGJRNgy8FPwbNuP9ag-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 07/13] qemuMigrationSrcBeginPhaseBlockDirtyBitmaps: Use qemuMigrationAnyCopyDisk() Date: Mon, 30 Sep 2024 15:29:29 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 4WMMHGDD3XC47PQ6L7ZZ6Z4Z57CBO5XO X-Message-ID-Hash: 4WMMHGDD3XC47PQ6L7ZZ6Z4Z57CBO5XO X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1727703197268116600 Content-Type: text/plain; charset="utf-8" The function open-coded the checking whether a disk is being migrated with non-shared storage and did so badly (not taking into account if user doesn't explicitly provide list of disks to migrate). Use the existing helper instead. Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b686e42e58..a2c5be3e82 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2466,19 +2466,8 @@ qemuMigrationSrcBeginPhaseBlockDirtyBitmaps(qemuMigr= ationCookie *mig, if (!nodedata) continue; - if (migrate_disks) { - bool migrating =3D false; - - for (j =3D 0; j < nmigrate_disks; j++) { - if (STREQ(migrate_disks[j], diskdef->dst)) { - migrating =3D true; - break; - } - } - - if (!migrating) - continue; - } + if (!qemuMigrationAnyCopyDisk(diskdef, nmigrate_disks, migrate_dis= ks)) + continue; for (j =3D 0; j < nodedata->nbitmaps; j++) { qemuMigrationBlockDirtyBitmapsDiskBitmap *bitmap; --=20 2.46.0