From nobody Wed May 14 15:00:24 2025 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 1727703359866501.4302331515546; Mon, 30 Sep 2024 06:35:59 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C26EACF8; Mon, 30 Sep 2024 09:35:58 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EE0061296; Mon, 30 Sep 2024 09:30:18 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A8424137D; Mon, 30 Sep 2024 09:30:10 -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 9F5581430 for ; Mon, 30 Sep 2024 09:29:55 -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-271-d8SJU5EkObG8q8xWyy9RAQ-1; Mon, 30 Sep 2024 09:29:53 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 00CE818DB432 for ; Mon, 30 Sep 2024 13:29:53 +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 D73CA19541A0 for ; Mon, 30 Sep 2024 13:29:51 +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=1727702995; 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=bM/VpjNGabcK2Lokcmy5wMTkwBHFKck0NtthknL86OI=; b=Lu3vuL0mRwgwuDMCABCmn75y/sDg6OdWkCHFrEmyKk05a6SRi0byOXQ6z2CKUrnK5CNsv7 z1DzzhVaKp1VVVeAP6LM3IEiwhhEQDDvEzQNgZ9E/VV22SexUbTzOsnlvg+eOq6ksKHXge fwKeO7b4i8UjGHeRFwINIK6m2i11XS4= X-MC-Unique: d8SJU5EkObG8q8xWyy9RAQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 12/13] qemu: Introduce and wire in 'VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES' Date: Mon, 30 Sep 2024 15:29:34 +0200 Message-ID: <2ff4317b1a28705aafa58e7aa593b8a01b073186.1727702835.git.pkrempa@redhat.com> 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: 7JZ7YH6K7W2SVILPIL6TBYPMRZTWICR5 X-Message-ID-Hash: 7JZ7YH6K7W2SVILPIL6TBYPMRZTWICR5 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: 1727703362257116600 Content-Type: text/plain; charset="utf-8" The new 'VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES' migration parameter allows users of migration to pass in a list of disks where zero-detection (which avoids transferring the zeroed-blocks) should be enabled for the migration connection. This comes at the cost of extra CPU cycles needed to check each block if it's all-zero. This is useful for storage backends where information about the allocation state of a block is not available and thus without this the image would become fully allocated on the destination. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- include/libvirt/libvirt-domain.h | 13 ++++ src/qemu/qemu_driver.c | 20 ++++-- src/qemu/qemu_migration.c | 105 +++++++++++++++++++++++-------- src/qemu/qemu_migration.h | 4 ++ 4 files changed, 110 insertions(+), 32 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-dom= ain.h index 4266237abe..6d4cc69c5d 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1240,6 +1240,19 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_MIGRATE_DISKS "migrate_disks" +/** + * VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES: + * + * virDomainMigrate* params multiple field: The multiple values that list + * the block devices for which zero detection (to avoid transferring zero = blocks) + * is to be enabled. This may increase CPU overhead of the migration. At t= he + * moment this is only supported by the QEMU driver but not for the tunnel= led + * migration. + * + * Since: 10.9.0 + */ +# define VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES "migrate_disks_d= etect_zeroes" + /** * VIR_MIGRATE_PARAM_DISKS_PORT: * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cec700a36c..472bcd1fd3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10782,7 +10782,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, 0, + NULL, dconnuri, uri, NULL, NULL, NULL, N= ULL, 0, NULL, migParams, cookie, cookielen, NULL, NULL, /* No output cookies in v2 */ @@ -10858,7 +10858,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname, - cookieout, cookieoutlen, NULL, flags); + cookieout, cookieoutlen, NULL, NULL, flag= s); } static char * @@ -10872,6 +10872,7 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain, const char *xmlin =3D NULL; const char *dname =3D NULL; g_autofree const char **migrate_disks =3D NULL; + g_autofree const char **migrate_disks_detect_zeroes =3D NULL; virDomainObj *vm; virCheckFlags(QEMU_MIGRATION_FLAGS, NULL); @@ -10889,6 +10890,10 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain, virTypedParamsGetStringList(params, nparams, VIR_MIGRATE_PARAM_MIGRATE= _DISKS, &migrate_disks); + virTypedParamsGetStringList(params, nparams, + VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZER= OES, + &migrate_disks_detect_zeroes); + if (!(vm =3D qemuDomainObjFromDomain(domain))) return NULL; @@ -10899,7 +10904,8 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain, return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname, cookieout, cookieoutlen, - migrate_disks, flags); + migrate_disks, migrate_disks_detect_zeroe= s, + flags); } @@ -11180,7 +11186,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, goto cleanup; ret =3D qemuMigrationSrcPerform(driver, dom->conn, vm, xmlin, NULL, - dconnuri, uri, NULL, NULL, NULL, 0, + dconnuri, uri, NULL, NULL, NULL, NULL, 0, NULL, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, @@ -11211,6 +11217,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, const char *graphicsuri =3D NULL; const char *listenAddress =3D NULL; g_autofree const char **migrate_disks =3D NULL; + g_autofree const char **migrate_disks_detect_zeroes =3D NULL; unsigned long long bandwidth =3D 0; int nbdPort =3D 0; g_autoptr(qemuMigrationParams) migParams =3D NULL; @@ -11267,6 +11274,9 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, virTypedParamsGetStringList(params, nparams, VIR_MIGRATE_PARAM_MIGRATE= _DISKS, &migrate_disks); + virTypedParamsGetStringList(params, nparams, + VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZER= OES, + &migrate_disks_detect_zeroes); if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)= || migrate_disks) { @@ -11289,7 +11299,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, ret =3D qemuMigrationSrcPerform(driver, dom->conn, vm, dom_xml, persis= t_xml, dconnuri, uri, graphicsuri, listenAddres= s, - migrate_disks, nbdPort, + migrate_disks, migrate_disks_detect_zero= es, nbdPort, nbdURI, migParams, cookiein, cookieinlen, cookieout, cookie= outlen, flags, dname, bandwidth, true); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 94636e778d..7ae19dd0ce 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1022,7 +1022,8 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(v= irDomainDiskDef *disk, int port, const char *socket, const char *tlsAlias, - const char *tlsHostnam= e) + const char *tlsHostnam= e, + bool detect_zeroes) { g_autoptr(virStorageSource) copysrc =3D NULL; @@ -1031,6 +1032,9 @@ qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(v= irDomainDiskDef *disk, copysrc->protocol =3D VIR_STORAGE_NET_PROTOCOL_NBD; copysrc->format =3D VIR_STORAGE_FILE_RAW; + if (detect_zeroes) + copysrc->detect_zeroes =3D VIR_DOMAIN_DISK_DETECT_ZEROES_ON; + copysrc->backingStore =3D virStorageSourceNew(); if (!(copysrc->path =3D qemuAliasDiskDriveFromDisk(disk))) @@ -1067,7 +1071,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *= vm, unsigned int mirror_shallow, const char *tlsAlias, const char *tlsHostname, - bool syncWrites) + bool syncWrites, + bool detect_zeroes) { g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); @@ -1081,7 +1086,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virDomainObj *= vm, VIR_DEBUG("starting blockdev mirror for disk=3D%s to host=3D%s", disk-= >dst, host); if (!(copysrc =3D qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(= disk, host, port, socket, - tl= sAlias, tlsHostname))) + tl= sAlias, tlsHostname, + de= tect_zeroes))) return -1; if (!(data =3D qemuBlockStorageSourceAttachPrepareBlockdev(copysrc, @@ -1123,6 +1129,7 @@ qemuMigrationSrcNBDStorageCopyOne(virDomainObj *vm, bool mirror_shallow, const char *tlsAlias, const char *tlsHostname, + bool detect_zeroes, unsigned int flags) { qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); @@ -1147,7 +1154,8 @@ qemuMigrationSrcNBDStorageCopyOne(virDomainObj *vm, mirror_shallow, tlsAlias, tlsHostname, - syncWrites); + syncWrites, + detect_zeroes); if (rc =3D=3D 0) { diskPriv->migrating =3D true; @@ -1183,6 +1191,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver, const char *host, unsigned long speed, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, virConnectPtr dconn, const char *tlsAlias, const char *tlsHostname, @@ -1254,15 +1263,20 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *drive= r, for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDef *disk =3D vm->def->disks[i]; + bool detect_zeroes =3D false; /* check whether disk should be migrated */ if (!qemuMigrationAnyCopyDisk(disk, migrate_disks)) continue; + if (migrate_disks_detect_zeroes) + detect_zeroes =3D g_strv_contains(migrate_disks_detect_zeroes,= disk->dst); + if (qemuMigrationSrcNBDStorageCopyOne(vm, disk, host, port, socket, mirror_speed, mirror_shallow, - tlsAlias, tlsHostname, flags= ) < 0) + tlsAlias, tlsHostname, detec= t_zeroes, + flags) < 0) return -1; if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { @@ -2607,6 +2621,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, char **cookieout, int *cookieoutlen, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, unsigned int flags) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -2614,10 +2629,10 @@ 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, flags=3D0x%x", + " migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p, flag= s=3D0x%x", driver, vm, NULLSTR(xmlin), NULLSTR(dname), cookieout, cookieoutlen, - migrate_disks, flags); + migrate_disks, migrate_disks_detect_zeroes, 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 @@ -2684,6 +2699,10 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, qemuMigrationSrcBeginPhaseValidateDiskTargetList(vm, migrate_d= isks) < 0) return NULL; + if (migrate_disks_detect_zeroes && + qemuMigrationSrcBeginPhaseValidateDiskTargetList(vm, migrate_d= isks_detect_zeroes) < 0) + return NULL; + priv->nbdPort =3D 0; if (qemuMigrationHasAnyStorageMigrationDisks(vm->def, migrate_disk= s)) @@ -2694,6 +2713,13 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, _("use of 'VIR_MIGRATE_PARAM_MIGRATE_DISKS' req= uires use of 'VIR_MIGRATE_NON_SHARED_DISK' or 'VIR_MIGRATE_NON_SHARED_INC' = flag")); return NULL; } + + if (migrate_disks_detect_zeroes) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("use of 'VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETE= CT_ZEROES' requires use of 'VIR_MIGRATE_NON_SHARED_DISK' or 'VIR_MIGRATE_NO= N_SHARED_INC' flag")); + return NULL; + } + } if (virDomainDefHasMemoryHotplug(vm->def) || @@ -2844,6 +2870,7 @@ qemuMigrationSrcBegin(virConnectPtr conn, char **cookieout, int *cookieoutlen, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, unsigned int flags) { virQEMUDriver *driver =3D conn->privateData; @@ -2893,7 +2920,9 @@ qemuMigrationSrcBegin(virConnectPtr conn, if (!(xml =3D qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname, cookieout, cookieoutlen, - migrate_disks, flags))) + migrate_disks, + migrate_disks_detect_zeroes, + flags))) goto endjob; if ((flags & VIR_MIGRATE_CHANGE_PROTECTION)) { @@ -4740,6 +4769,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, virConnectPtr dconn, const char *graphicsuri, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, qemuMigrationParams *migParams, const char *nbdURI) { @@ -4765,11 +4795,11 @@ 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, resource= =3D%lu, " "spec=3D%p (dest=3D%d, fwd=3D%d), dconn=3D%p, graphicsuri=3D= %s, " - "migrate_disks=3D%p", + "migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p", driver, vm, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, spec, spec->destType, spec->fwdType, dconn, - NULLSTR(graphicsuri), migrate_disks); + NULLSTR(graphicsuri), migrate_disks, migrate_disks_detect_ze= roes); if (storageMigration) storageMigration =3D qemuMigrationHasAnyStorageMigrationDisks(vm->= def, @@ -4907,6 +4937,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, host, priv->migMaxBandwidth, migrate_disks, + migrate_disks_detect_zeroes, dconn, tlsAlias, tlsHostname, nbdURI, flags) < 0) { goto error; @@ -5176,6 +5207,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, virConnectPtr dconn, const char *graphicsuri, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, qemuMigrationParams *migParams, const char *nbdURI) { @@ -5186,10 +5218,10 @@ 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, resource= =3D%lu, " - "graphicsuri=3D%s, migrate_disks=3D%p", + "graphicsuri=3D%s, migrate_disks=3D%p, migrate_disks_detect_= zeroes=3D%p", driver, vm, uri, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, - NULLSTR(graphicsuri), migrate_disks); + NULLSTR(graphicsuri), migrate_disks, migrate_disks_detect_ze= roes); if (!(uribits =3D qemuMigrationAnyParseURI(uri, NULL))) return -1; @@ -5255,7 +5287,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, ret =3D qemuMigrationSrcRun(driver, vm, xmlin, persist_xml, cookie= in, cookieinlen, cookieout, cookieoutlen, flags, resource, &spec, dconn, graphicsuri, - migrate_disks, + migrate_disks, migrate_disks_detect_zero= es, migParams, nbdURI); } @@ -5316,9 +5348,11 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver, goto cleanup; } + /* Migration with NBD is not supported with _TUNNELED, thus + * 'migrate_disks_detect_zeroes' is NULL here */ ret =3D qemuMigrationSrcRun(driver, vm, xmlin, persist_xml, cookiein, = cookieinlen, cookieout, cookieoutlen, flags, resource, &s= pec, - dconn, graphicsuri, migrate_disks, + dconn, graphicsuri, migrate_disks, NULL, migParams, NULL); cleanup: @@ -5358,7 +5392,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver, ret =3D qemuMigrationSrcPerformNative(driver, vm, NULL, NULL, uri, cookiein, cookieinlen, cookieout, cookieoutlen, flags, - 0, NULL, NULL, NULL, migParams, NU= LL); + 0, NULL, NULL, NULL, NULL, migPara= ms, NULL); virCloseCallbacksDomainAdd(vm, conn, qemuMigrationAnyConnectionClosed); @@ -5466,7 +5500,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driv= er, cookie, cookielen, NULL, NULL, /* No out cookie w= ith v2 migration */ flags, resource, dconn, NULL, = NULL, - migParams, NULL); + NULL, migParams, NULL); /* Perform failed. Make sure Finish doesn't overwrite the error */ if (ret < 0) @@ -5529,6 +5563,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, const char *graphicsuri, const char *listenAddress, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, @@ -5555,11 +5590,11 @@ 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, nbdPort=3D%d, nbdURI=3D%s, " + "migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p, nbdPo= rt=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, nbdPort, + NULLSTR(listenAddress), migrate_disks, migrate_disks_detect_= zeroes, nbdPort, NULLSTR(nbdURI), bandwidth, useParams, flags); /* Unlike the virDomainMigrateVersion3 counterpart, we don't need @@ -5573,7 +5608,9 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, } else { dom_xml =3D qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname, &cookieout, &cookieoutlen, - migrate_disks, flags); + migrate_disks, + migrate_disks_detect_zeroes, + flags); } if (!dom_xml) goto cleanup; @@ -5618,6 +5655,15 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *dri= ver, *d) < 0) goto cleanup; } + if (migrate_disks_detect_zeroes) { + const char **d; + + for (d =3D migrate_disks_detect_zeroes; *d; d++) + if (virTypedParamsAddString(¶ms, &nparams, &maxparams, + VIR_MIGRATE_PARAM_MIGRATE_DISK= S_DETECT_ZEROES, + *d) < 0) + goto cleanup; + } if (nbdPort && virTypedParamsAddInt(¶ms, &nparams, &maxparams, VIR_MIGRATE_PARAM_DISKS_PORT, @@ -5731,7 +5777,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, cookiein, cookieinlen, &cookieout, &cookieoutlen, flags, bandwidth, dconn, g= raphicsuri, - migrate_disks, + migrate_disks, migrate_dis= ks_detect_zeroes, migParams, nbdURI); } @@ -5905,6 +5951,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *drive= r, const char *graphicsuri, const char *listenAddress, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, @@ -6029,7 +6076,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *drive= r, if (*v3proto) { ret =3D qemuMigrationSrcPerformPeer2Peer3(driver, sconn, dconn, dc= onnuri, vm, xmlin, persist_xml, dname, uri, g= raphicsuri, - listenAddress, migrate_dis= ks, + listenAddress, migrate_dis= ks, migrate_disks_detect_zeroes, nbdPort, nbdURI, migParams= , resource, !!useParams, flags); } else { @@ -6066,6 +6113,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, const char *graphicsuri, const char *listenAddress, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, @@ -6116,7 +6164,7 @@ 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, nbdPort, + migrate_disks, migrate_disk= s_detect_zeroes, nbdPort, nbdURI, migParams, flags, dname, re= source, &v3proto); @@ -6126,7 +6174,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, ret =3D qemuMigrationSrcPerformNative(driver, vm, xmlin, persist_x= ml, uri, cookiein, cookieinlen, cookieout, cookieoutlen, - flags, resource, NULL, NULL, N= ULL, + flags, resource, NULL, NULL, N= ULL, NULL, migParams, nbdURI); } if (ret < 0) @@ -6194,6 +6242,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, const char *uri, const char *graphicsuri, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, qemuMigrationParams *migParams, const char *cookiein, int cookieinlen, @@ -6229,7 +6278,8 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, if (qemuMigrationSrcPerformNative(driver, vm, xmlin, persist_xml, uri,= cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, NULL, graphicsuri, - migrate_disks, migParams, nbdURI) < = 0) + migrate_disks, migrate_disks_detect_= zeroes, + migParams, nbdURI) < 0) goto cleanup; virCloseCallbacksDomainAdd(vm, conn, qemuMigrationAnyConnectionClosed); @@ -6271,6 +6321,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, const char *graphicsuri, const char *listenAddress, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, @@ -6314,7 +6365,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist= _xml, dconnuri, uri, graphicsuri, listenAddress, - migrate_disks, nbdPort, + migrate_disks, migrate_disks_det= ect_zeroes, nbdPort, nbdURI, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, @@ -6330,7 +6381,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, if (v3proto) { return qemuMigrationSrcPerformPhase(driver, conn, vm, xmlin, persi= st_xml, uri, graphicsuri, - migrate_disks, + migrate_disks, migrate_disks_d= etect_zeroes, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, @@ -6339,7 +6390,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml= , NULL, uri, graphicsuri, listenAddress, - migrate_disks, nbdPort, + migrate_disks, migrate_disks_detect_= zeroes, nbdPort, nbdURI, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, flags, diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 4dced4b166..4b7ef9688a 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -74,6 +74,8 @@ VIR_MIGRATE_PARAM_LISTEN_ADDRESS, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_MIGRATE_DISKS, VIR_TYPED_PARAM_STRING | \ VIR_TYPED_PARAM_MULTIPLE, \ + VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES, 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, \ @@ -123,6 +125,7 @@ qemuMigrationSrcBegin(virConnectPtr conn, char **cookieout, int *cookieoutlen, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, unsigned int flags); virDomainDef * @@ -174,6 +177,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, const char *graphicsuri, const char *listenAddress, const char **migrate_disks, + const char **migrate_disks_detect_zeroes, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, --=20 2.46.0