From nobody Tue Mar 24 01:07:07 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=1773853868; cv=none; d=zohomail.com; s=zohoarc; b=CiUyJpqU4tvpUXHxb2fGPTd9M7i/nfOjB3oZswQRfx+0/sieWlInqZgJnkEfKraBrcBeu4wZ0VgYj5FtcRGXyCrs1E4G+APIfBb96cdLlKMDdDgJZao8ae+tHkoyDUkdzNLaq1/39kfrqz4Uuvrn4XgN7nqs/KJC27etyXtE1z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773853868; 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=6aplR/JgpUHzMaRYIkjCyRRwtD30QGRjpoy3eJ+ATkE=; b=YAWNJLzdjEeoAOoBFzUEdBMr7lcxfKmq2HOtfm7SALo/3EyTFcuBwXr1WzItNOPp3U+2Tp0COsOkABkO5oe/9a0p1dDpsdPqkwS8nyRh9XKK5GkeTsLUxaSnG9yyzmqbzr3xZuvuAQYnM2zEY3v0r/Jq3WELcL6AByAwGQa712Y= 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 1773853868430636.1453437436918; Wed, 18 Mar 2026 10:11:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BD5C641AC1; Wed, 18 Mar 2026 13:11:07 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 30AAF41BB7; Wed, 18 Mar 2026 13:07:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3358641AF4; Wed, 18 Mar 2026 13:07:35 -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 CE3EF41BB7 for ; Wed, 18 Mar 2026 13:05:08 -0400 (EDT) Received: from mx-prod-mc-01.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-628-4C17b69ANOiOpt-3_MDFag-1; Wed, 18 Mar 2026 13:05:06 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC126195608C for ; Wed, 18 Mar 2026 17:05:05 +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 CC92730002C3 for ; Wed, 18 Mar 2026 17:05:04 +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=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773853508; 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=6aplR/JgpUHzMaRYIkjCyRRwtD30QGRjpoy3eJ+ATkE=; b=cMq+utYkrNl9x0NP3/gPdl5Av0EsbVYlQiOOZwqfNwfll94DrzKF0tvbHgaDCfRc/iZBL7 K5t4k304bYqUkCSrJ78zA1a7wj9mrDaa1SHDOQOHZ2n0wS/on5a2/M6jXhJfA9NRzxsMdi Nj63nLWOG9nhRbf0by+1eOtMDTA0iqs= X-MC-Unique: 4C17b69ANOiOpt-3_MDFag-1 X-Mimecast-MFC-AGG-ID: 4C17b69ANOiOpt-3_MDFag_1773853506 To: devel@lists.libvirt.org Subject: [PATCH 6/7] qemu: migration: Introduce 'VIR_MIGRATE_PARAM_MIGRATE_DISKS_TARGET_ZERO' Date: Wed, 18 Mar 2026 18:04:54 +0100 Message-ID: <9621061309229f699cb682a38135e66a4198a206.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: 4weNp5kUe0M3vQOUg2SpiNkUfJCPfS25MKKlLaWVrkc_1773853506 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DRJEXMSWPLUZTIQQHQGIJE5PEFPCD6R5 X-Message-ID-Hash: DRJEXMSWPLUZTIQQHQGIJE5PEFPCD6R5 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: 1773853870427154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The migration parameter allows enumerating disks selected for migration where the hypervisor may assume that the user pre-cleared the destination images of the block copy so that all offsets read 0x00 and thus optimize clearing of such targets. This patch adds the 'VIR_MIGRATE_PARAM_MIGRATE_DISKS_TARGET_ZERO' parameter and also plumbs it for the qemu driver (mirrors plumbing for 'migrate_disks_detect_zeroes'). Signed-off-by: Peter Krempa --- include/libvirt/libvirt-domain.h | 12 ++++ src/qemu/qemu_driver.c | 22 +++++-- src/qemu/qemu_migration.c | 106 ++++++++++++++++++++++++------- src/qemu/qemu_migration.h | 4 ++ 4 files changed, 117 insertions(+), 27 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-dom= ain.h index a0e0b84eb9..09a797cab6 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1285,6 +1285,18 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES "migrate_disks_d= etect_zeroes" +/** + * VIR_MIGRATE_PARAM_MIGRATE_DISKS_TARGET_ZERO: + * + * virDomainMigrate* params multiple field: The multiple values that list + * the block devices for which the hypervisor is allowed to assume that the + * destination image was zeroed out and thus may skip zeroing it beforehan= d. + * At the moment this is only supported by the QEMU driver. + * + * Since: 12.2.0 + */ +# define VIR_MIGRATE_PARAM_MIGRATE_DISKS_TARGET_ZERO "migrate_disks_target= _zero" + /** * VIR_MIGRATE_PARAM_DISKS_PORT: * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 42d0f46405..6d333275b1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10913,7 +10913,7 @@ qemuDomainMigratePerform(virDomainPtr dom, * Consume any cookie we were able to decode though */ ret =3D qemuMigrationSrcPerform(driver, dom->conn, vm, NULL, - NULL, dconnuri, uri, NULL, NULL, NULL, N= ULL, 0, + NULL, dconnuri, uri, NULL, NULL, NULL, N= ULL, NULL, 0, NULL, migParams, cookie, cookielen, NULL, NULL, /* No output cookies in v2 */ @@ -10989,7 +10989,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname, - cookieout, cookieoutlen, NULL, NULL, flag= s); + cookieout, cookieoutlen, NULL, NULL, NULL= , flags); } static char * @@ -11004,6 +11004,7 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain, const char *dname =3D NULL; g_autofree const char **migrate_disks =3D NULL; g_autofree const char **migrate_disks_detect_zeroes =3D NULL; + g_autofree const char **migrate_disks_target_zero =3D NULL; virDomainObj *vm; virCheckFlags(QEMU_MIGRATION_FLAGS, NULL); @@ -11025,6 +11026,10 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain, VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZER= OES, &migrate_disks_detect_zeroes); + virTypedParamsGetStringList(params, nparams, + VIR_MIGRATE_PARAM_MIGRATE_DISKS_TARGET_ZER= O, + &migrate_disks_target_zero); + if (!(vm =3D qemuDomainObjFromDomain(domain))) return NULL; @@ -11036,6 +11041,7 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain, return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname, cookieout, cookieoutlen, migrate_disks, migrate_disks_detect_zeroe= s, + migrate_disks_target_zero, flags); } @@ -11313,7 +11319,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, goto cleanup; ret =3D qemuMigrationSrcPerform(driver, dom->conn, vm, xmlin, NULL, - dconnuri, uri, NULL, NULL, NULL, NULL, 0, + dconnuri, uri, NULL, NULL, NULL, NULL, N= ULL, 0, NULL, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, @@ -11345,6 +11351,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, const char *listenAddress =3D NULL; g_autofree const char **migrate_disks =3D NULL; g_autofree const char **migrate_disks_detect_zeroes =3D NULL; + g_autofree const char **migrate_disks_target_zero =3D NULL; unsigned long long bandwidth =3D 0; int nbdPort =3D 0; g_autoptr(qemuMigrationParams) migParams =3D NULL; @@ -11404,6 +11411,9 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, virTypedParamsGetStringList(params, nparams, VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZER= OES, &migrate_disks_detect_zeroes); + virTypedParamsGetStringList(params, nparams, + VIR_MIGRATE_PARAM_MIGRATE_DISKS_TARGET_ZER= O, + &migrate_disks_target_zero); if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)= || migrate_disks) { @@ -11426,8 +11436,10 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, ret =3D qemuMigrationSrcPerform(driver, dom->conn, vm, dom_xml, persis= t_xml, dconnuri, uri, graphicsuri, listenAddres= s, - migrate_disks, migrate_disks_detect_zero= es, nbdPort, - nbdURI, migParams, + migrate_disks, + migrate_disks_detect_zeroes, + migrate_disks_target_zero, + nbdPort, nbdURI, migParams, cookiein, cookieinlen, cookieout, cookie= outlen, flags, dname, bandwidth, true); cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index bb62b1d48c..09985779df 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1140,7 +1140,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *= vm, const char *tlsAlias, const char *tlsHostname, bool syncWrites, - bool detect_zeroes) + bool detect_zeroes, + bool target_zeroed) { g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); @@ -1173,7 +1174,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *= vm, qemuBlockStorageSourceGetEffec= tiveNodename(copysrc), NULL, mirror_speed, 0, 0, mirror_sha= llow, - syncWrites, false); + syncWrites, target_zeroed); if (mon_ret !=3D 0) qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), dat= a); @@ -1199,6 +1200,7 @@ qemuMigrationSrcNBDStorageCopyOne(virDomainObj *vm, const char *tlsAlias, const char *tlsHostname, bool detect_zeroes, + bool target_zeroed, unsigned int flags) { qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); @@ -1224,7 +1226,8 @@ qemuMigrationSrcNBDStorageCopyOne(virDomainObj *vm, tlsAlias, tlsHostname, syncWrites, - detect_zeroes); + detect_zeroes, + target_zeroed); if (rc =3D=3D 0) { diskPriv->migrating =3D true; @@ -1261,6 +1264,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, unsigned long speed, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, virConnectPtr dconn, const char *tlsAlias, const char *tlsHostname, @@ -1333,6 +1337,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDef *disk =3D vm->def->disks[i]; bool detect_zeroes =3D false; + bool target_zero =3D false; /* check whether disk should be migrated */ if (!qemuMigrationAnyCopyDisk(disk, migrate_disks)) @@ -1341,11 +1346,14 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *drive= r, if (migrate_disks_detect_zeroes) detect_zeroes =3D g_strv_contains(migrate_disks_detect_zeroes,= disk->dst); + if (migrate_disks_target_zero) + target_zero =3D g_strv_contains(migrate_disks_target_zero, dis= k->dst); + if (qemuMigrationSrcNBDStorageCopyOne(vm, disk, host, port, socket, mirror_speed, mirror_shallow, tlsAlias, tlsHostname, detec= t_zeroes, - flags) < 0) + target_zero, flags) < 0) return -1; if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { @@ -2760,6 +2768,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, int *cookieoutlen, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, unsigned int flags) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -2767,10 +2776,13 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, VIR_DEBUG("driver=3D%p, vm=3D%p, xmlin=3D%s, dname=3D%s," " cookieout=3D%p, cookieoutlen=3D%p," - " migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p, flag= s=3D0x%x", + " migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p," + " migrate_disks_target_zero=3D%p, flags=3D0x%x", driver, vm, NULLSTR(xmlin), NULLSTR(dname), cookieout, cookieoutlen, - migrate_disks, migrate_disks_detect_zeroes, flags); + migrate_disks, migrate_disks_detect_zeroes, + migrate_disks_target_zero, + flags); /* Only set the phase if we are inside VIR_ASYNC_JOB_MIGRATION_OUT. * Otherwise we will start the async job later in the perform phase lo= sing @@ -2841,6 +2853,17 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, qemuMigrationSrcBeginPhaseValidateDiskTargetList(vm, migrate_d= isks_detect_zeroes) < 0) return NULL; + if (migrate_disks_target_zero) { + if (qemuMigrationSrcBeginPhaseValidateDiskTargetList(vm, migra= te_disks_target_zero) < 0) + return NULL; + + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_MIRROR_= TARGET_IS_ZERO)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("use of 'VIR_MIGRATE_PARAM_MIGRATE_DISKS_= TARGET_ZERO' is not supported by this QEMU")); + return NULL; + } + } + priv->nbdPort =3D 0; if (qemuMigrationHasAnyStorageMigrationDisks(vm->def, migrate_disk= s)) @@ -2858,6 +2881,11 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, return NULL; } + if (migrate_disks_target_zero) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("use of 'VIR_MIGRATE_PARAM_MIGRATE_DISKS_TARG= ET_ZERO' requires use of 'VIR_MIGRATE_NON_SHARED_DISK' or 'VIR_MIGRATE_NON_= SHARED_INC' flag")); + return NULL; + } } if (virDomainDefHasMemoryHotplug(vm->def) || @@ -3010,6 +3038,7 @@ qemuMigrationSrcBegin(virConnectPtr conn, int *cookieoutlen, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, unsigned int flags) { virQEMUDriver *driver =3D conn->privateData; @@ -3051,6 +3080,7 @@ qemuMigrationSrcBegin(virConnectPtr conn, cookieout, cookieoutlen, migrate_disks, migrate_disks_detect_zeroes, + migrate_disks_target_zero, flags))) goto endjob; @@ -4909,6 +4939,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, const char *graphicsuri, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, qemuMigrationParams *migParams, const char *nbdURI) { @@ -4934,11 +4965,13 @@ qemuMigrationSrcRun(virQEMUDriver *driver, VIR_DEBUG("driver=3D%p, vm=3D%p, cookiein=3D%s, cookieinlen=3D%d, " "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, bandwidth= =3D%lu, " "spec=3D%p (dest=3D%d, fwd=3D%d), dconn=3D%p, graphicsuri=3D= %s, " - "migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p", + "migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p" + "migrate_disks_target_zero=3D%p", driver, vm, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, bandwidth, spec, spec->destType, spec->fwdType, dconn, - NULLSTR(graphicsuri), migrate_disks, migrate_disks_detect_ze= roes); + NULLSTR(graphicsuri), migrate_disks, migrate_disks_detect_ze= roes, + migrate_disks_target_zero); if (storageMigration) storageMigration =3D qemuMigrationHasAnyStorageMigrationDisks(vm->= def, @@ -5063,6 +5096,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, priv->migMaxBandwidth, migrate_disks, migrate_disks_detect_zeroes, + migrate_disks_target_zero, dconn, tlsAlias, tlsHostname, nbdURI, flags) < 0) { goto error; @@ -5331,6 +5365,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, const char *graphicsuri, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, qemuMigrationParams *migParams, const char *nbdURI) { @@ -5340,10 +5375,12 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, VIR_DEBUG("driver=3D%p, vm=3D%p, uri=3D%s, 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, migrate_disks_detect_= zeroes=3D%p", + "graphicsuri=3D%s, migrate_disks=3D%p, migrate_disks_detect_= zeroes=3D%p " + "migrate_disks_target_zero=3D%p", driver, vm, uri, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, bandwidth, - NULLSTR(graphicsuri), migrate_disks, migrate_disks_detect_ze= roes); + NULLSTR(graphicsuri), migrate_disks, migrate_disks_detect_ze= roes, + migrate_disks_target_zero); if (!(uribits =3D qemuMigrationAnyParseURI(uri, NULL))) return -1; @@ -5405,6 +5442,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, cookieout, cookieoutlen, flags, bandwidt= h, &spec, dconn, graphicsuri, migrate_disks, migrate_disks_detect_zero= es, + migrate_disks_target_zero, migParams, nbdURI); } @@ -5467,7 +5505,7 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver, * parameters are NULL here */ ret =3D qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookiei= nlen, cookieout, cookieoutlen, flags, bandwidth, &= spec, - dconn, graphicsuri, NULL, NULL, + dconn, graphicsuri, NULL, NULL, NULL, migParams, NULL); cleanup: @@ -5507,7 +5545,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver, ret =3D qemuMigrationSrcPerformNative(driver, vm, NULL, uri, cookiein, cookieinlen, cookieout, cookieoutlen, flags, - 0, NULL, NULL, NULL, NULL, migPara= ms, NULL); + 0, NULL, NULL, NULL, NULL, NULL, m= igParams, NULL); virCloseCallbacksDomainAdd(vm, conn, qemuMigrationAnyConnectionClosed); @@ -5614,7 +5652,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driv= er, ret =3D qemuMigrationSrcPerformNative(driver, vm, NULL, uri_out, cookie, cookielen, NULL, NULL, /* No out cookie w= ith v2 migration */ - flags, bandwidth, dconn, NULL,= NULL, + flags, bandwidth, dconn, NULL,= NULL, NULL, NULL, migParams, NULL); /* Perform failed. Make sure Finish doesn't overwrite the error */ @@ -5679,6 +5717,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, const char *listenAddress, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, @@ -5705,11 +5744,13 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *dr= iver, VIR_DEBUG("driver=3D%p, sconn=3D%p, dconn=3D%p, dconnuri=3D%s, vm=3D%p= , xmlin=3D%s, " "dname=3D%s, uri=3D%s, graphicsuri=3D%s, listenAddress=3D%s,= " - "migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p, nbdPo= rt=3D%d, nbdURI=3D%s, " + "migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p, " + "migrate_disks_target_zero=3D%p, nbdPort=3D%d, nbdURI=3D%s, " "bandwidth=3D%llu, useParams=3D%d, flags=3D0x%x", driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri), - NULLSTR(listenAddress), migrate_disks, migrate_disks_detect_= zeroes, nbdPort, + NULLSTR(listenAddress), migrate_disks, migrate_disks_detect_= zeroes, + migrate_disks_target_zero, nbdPort, NULLSTR(nbdURI), bandwidth, useParams, flags); /* Unlike the virDomainMigrateVersion3 counterpart, we don't need @@ -5725,6 +5766,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, &cookieout, &cookieoutlen, migrate_disks, migrate_disks_detect_zeroes, + migrate_disks_target_zero, flags); } if (!dom_xml) @@ -5779,6 +5821,15 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *dri= ver, *d) < 0) goto cleanup; } + if (migrate_disks_target_zero) { + const char **d; + + for (d =3D migrate_disks_target_zero; *d; d++) + if (virTypedParamsAddString(¶ms, &nparams, &maxparams, + VIR_MIGRATE_PARAM_MIGRATE_DISK= S_TARGET_ZERO, + *d) < 0) + goto cleanup; + } if (nbdPort && virTypedParamsAddInt(¶ms, &nparams, &maxparams, VIR_MIGRATE_PARAM_DISKS_PORT, @@ -5892,6 +5943,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, &cookieout, &cookieoutlen, flags, bandwidth, dconn, g= raphicsuri, migrate_disks, migrate_dis= ks_detect_zeroes, + migrate_disks_target_zero, migParams, nbdURI); } @@ -6066,6 +6118,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *drive= r, const char *listenAddress, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, @@ -6191,6 +6244,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *drive= r, ret =3D qemuMigrationSrcPerformPeer2Peer3(driver, sconn, dconn, dc= onnuri, vm, xmlin, persist_xml, dname, uri, g= raphicsuri, listenAddress, migrate_dis= ks, migrate_disks_detect_zeroes, + migrate_disks_target_zero, nbdPort, nbdURI, migParams= , bandwidth, !!useParams, flags); } else { @@ -6228,6 +6282,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, const char *listenAddress, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, @@ -6277,8 +6332,9 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { ret =3D qemuMigrationSrcPerformPeer2Peer(driver, conn, vm, xmlin, = persist_xml, dconnuri, uri, graphicsuri,= listenAddress, - migrate_disks, migrate_disk= s_detect_zeroes, nbdPort, - nbdURI, + migrate_disks, migrate_disk= s_detect_zeroes, + migrate_disks_target_zero, + nbdPort, nbdURI, migParams, flags, dname, ba= ndwidth, &v3proto); } else { @@ -6287,7 +6343,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, ret =3D qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri= , cookiein, cookieinlen, cookieout, cookieoutlen, - flags, bandwidth, NULL, NULL, = NULL, NULL, + flags, bandwidth, NULL, NULL, = NULL, NULL, NULL, migParams, nbdURI); } if (ret < 0) @@ -6355,6 +6411,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, const char *graphicsuri, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, qemuMigrationParams *migParams, const char *cookiein, int cookieinlen, @@ -6391,6 +6448,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, cookieout, cookieoutlen, flags, bandwidth, NULL, graphicsuri, migrate_disks, migrate_disks_detect_= zeroes, + migrate_disks_target_zero, migParams, nbdURI) < 0) goto cleanup; @@ -6434,6 +6492,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, const char *listenAddress, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, @@ -6477,8 +6536,9 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist= _xml, dconnuri, uri, graphicsuri, listenAddress, - migrate_disks, migrate_disks_det= ect_zeroes, nbdPort, - nbdURI, migParams, + migrate_disks, migrate_disks_det= ect_zeroes, + migrate_disks_target_zero, + nbdPort, nbdURI, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, bandwidth, v3proto= ); @@ -6494,6 +6554,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, return qemuMigrationSrcPerformPhase(driver, conn, vm, persist_xml,= uri, graphicsuri, migrate_disks, migrate_disks_d= etect_zeroes, + migrate_disks_target_zero, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, @@ -6502,8 +6563,9 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml= , NULL, uri, graphicsuri, listenAddress, - migrate_disks, migrate_disks_detect_= zeroes, nbdPort, - nbdURI, migParams, + migrate_disks, migrate_disks_detect_= zeroes, + migrate_disks_target_zero, + nbdPort, nbdURI, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, bandwidth, v3proto); diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index db03144207..ef6a1563a0 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -76,6 +76,8 @@ VIR_TYPED_PARAM_MULTIPLE, \ VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES, VIR_TYPED_PARAM_STRING = | \ VIR_TYPED_PARAM_MULTIPL= E, \ + VIR_MIGRATE_PARAM_MIGRATE_DISKS_TARGET_ZERO, VIR_TYPED_PARAM_STRING | \ + VIR_TYPED_PARAM_MULTIPL= E, \ VIR_MIGRATE_PARAM_DISKS_PORT, VIR_TYPED_PARAM_INT, \ VIR_MIGRATE_PARAM_COMPRESSION, VIR_TYPED_PARAM_STRING | \ VIR_TYPED_PARAM_MULTIPLE, \ @@ -127,6 +129,7 @@ qemuMigrationSrcBegin(virConnectPtr conn, int *cookieoutlen, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, unsigned int flags); virDomainDef * @@ -181,6 +184,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, const char *listenAddress, const char **migrate_disks, const char **migrate_disks_detect_zeroes, + const char **migrate_disks_target_zero, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, --=20 2.53.0