From nobody Tue Mar 24 01:00:43 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1773853550; cv=none; d=zohomail.com; s=zohoarc; b=SIr/I9y3QiaA+mO0y+ctE8pOjun0J8TI+so17s9OxGGzAV7cnt1i7JbeTc183EmAGkTedi9QzrdmjfM2xEVRqHLpfxP/8hDvAzsooKCEmpo1QPFU0SxOpGZFRXRdmGXs7GMGTsUS2calIf8SUoTJue2unmUkaq2FvIfMR2jfLCI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773853550; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=fYCQBkdk+Y7fuSfQizOH+TO3q5DCWNqhz/JMfBHdJQU=; b=MUJZ404mdyWhyzF3Bbdim+iRDa1rEalGzWdl4Idjy8JqYVQSrB3aqpwaYh6Z1XrdbCysuM9rLOKXXfP8gh6qS8c8R436VpQUz6V2mmY1n3YuEWYJadKazmPWrfyod5BSPy6fCuCkAeL3KpkI5N12rc+XYk9/kMCRrZM+uGnqX3Q= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1773853550699276.69137989021044; Wed, 18 Mar 2026 10:05:50 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 820504196A; Wed, 18 Mar 2026 13:05:49 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 2137C41A99; Wed, 18 Mar 2026 13:05:05 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B483C3F8A8; Wed, 18 Mar 2026 13:05:01 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 408443F31F for ; Wed, 18 Mar 2026 13:05:01 -0400 (EDT) Received: from mx-prod-mc-03.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-382-I0qkOPflN1iY1pXypN8Jhw-1; Wed, 18 Mar 2026 13:04:59 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BFEE6195607B for ; Wed, 18 Mar 2026 17:04:58 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.45.242.5]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 04E3D30002C3 for ; Wed, 18 Mar 2026 17:04:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773853500; 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=fYCQBkdk+Y7fuSfQizOH+TO3q5DCWNqhz/JMfBHdJQU=; b=M82+mYUNLDs5FIcE3QoMIYyiMhCI+EW1zOUlknMEAZlvKzntFOBz1ranBsE9EVOgfgABlu 449i83Jdwl1Qu49T9piMrfCOqubD5YRg16QNK1mwvV0DWxV/U29PhmeDih3P/iYU3/W4nC IFyIsv60OcYjghsB4DK6pjqYDHJiIFE= X-MC-Unique: I0qkOPflN1iY1pXypN8Jhw-1 X-Mimecast-MFC-AGG-ID: I0qkOPflN1iY1pXypN8Jhw_1773853498 To: devel@lists.libvirt.org Subject: [PATCH 1/7] qemuMigrationSrcPerformTunnel: Remove 'migrate_disks' argument Date: Wed, 18 Mar 2026 18:04:49 +0100 Message-ID: <6a900d173861eaa8ea8d9d34dca0d2dafa705c95.1773853407.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: js_2-grO8POOwFVm2l673i984TgMbs8oMTFH8FRWexI_1773853498 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 4LRLSE5NZUSO7NQTZW5XKAHJ64OSERMF X-Message-ID-Hash: 4LRLSE5NZUSO7NQTZW5XKAHJ64OSERMF X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1773853558132154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Any QEMU we support requires use of NBD for disk migration which is not supported on tunnelled migration. This is validated in 'qemuMigrationSrcBeginPhase'. Passing the list of disks to migrate is thus pointless. Remove the argument. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_migration.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fec808ccfb..4d136e259b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5428,7 +5428,6 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver, unsigned long bandwidth, virConnectPtr dconn, const char *graphicsuri, - const char **migrate_disks, qemuMigrationParams *migParams) { int ret =3D -1; @@ -5437,10 +5436,10 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver, VIR_DEBUG("driver=3D%p, vm=3D%p, st=3D%p, cookiein=3D%s, cookieinlen= =3D%d, " "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, bandwidth= =3D%lu, " - "graphicsuri=3D%s, migrate_disks=3D%p", + "graphicsuri=3D%s", driver, vm, st, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, bandwidth, - NULLSTR(graphicsuri), migrate_disks); + NULLSTR(graphicsuri)); spec.fwdType =3D MIGRATION_FWD_STREAM; spec.fwd.stream =3D st; @@ -5464,11 +5463,11 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver, goto cleanup; } - /* Migration with NBD is not supported with _TUNNELLED, thus - * 'migrate_disks_detect_zeroes' is NULL here */ + /* Migration with NBD is not supported with _TUNNELLED, thus all corre= sponding + * parameters are NULL here */ ret =3D qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookiei= nlen, cookieout, cookieoutlen, flags, bandwidth, &= spec, - dconn, graphicsuri, migrate_disks, NULL, + dconn, graphicsuri, NULL, NULL, migParams, NULL); cleanup: @@ -5610,7 +5609,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driv= er, ret =3D qemuMigrationSrcPerformTunnel(driver, vm, st, NULL, NULL, 0, NULL, NULL, flags, bandwidth, dconn, - NULL, NULL, migParams); + NULL, migParams); else ret =3D qemuMigrationSrcPerformNative(driver, vm, NULL, uri_out, cookie, cookielen, @@ -5886,7 +5885,6 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, cookiein, cookieinlen, &cookieout, &cookieoutlen, flags, bandwidth, dconn, g= raphicsuri, - migrate_disks, migParams); } else { ret =3D qemuMigrationSrcPerformNative(driver, vm, persist_xml,= uri, --=20 2.53.0