From nobody Mon Feb 9 19:04:30 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; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com 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 163662219739442.333567033213626; Thu, 11 Nov 2021 01:16:37 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-74-gn996VPdOfSChmTqFurxTw-1; Thu, 11 Nov 2021 04:16:34 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0CBE19057A2; Thu, 11 Nov 2021 09:16:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C265918A8F; Thu, 11 Nov 2021 09:16:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7E06A4EA2A; Thu, 11 Nov 2021 09:16:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AB9C4v4027452 for ; Thu, 11 Nov 2021 04:12:04 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6F15B1121319; Thu, 11 Nov 2021 09:12:04 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A6CE1121318 for ; Thu, 11 Nov 2021 09:12:01 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 7E53C1066681 for ; Thu, 11 Nov 2021 09:12:01 +0000 (UTC) Received: from relay.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-417-DcajHqz5Pw2xZfWRbcLYRg-1; Thu, 11 Nov 2021 04:11:59 -0500 Received: from [10.28.15.237] (helo=vz8.sw.ru) by relay.sw.ru with esmtp (Exim 4.94.2) (envelope-from ) id 1ml5sB-008xIO-Pl for libvir-list@redhat.com; Thu, 11 Nov 2021 11:55:55 +0300 X-MC-Unique: gn996VPdOfSChmTqFurxTw-1 X-MC-Unique: DcajHqz5Pw2xZfWRbcLYRg-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH 7/9] qemu: support instant mode in qemuMigrationSrcToFile Date: Thu, 11 Nov 2021 11:55:52 +0300 Message-Id: <20211111085554.14685-8-nshirokovskiy@virtuozzo.com> In-Reply-To: <20211111085554.14685-1-nshirokovskiy@virtuozzo.com> References: <20211111085554.14685-1-nshirokovskiy@virtuozzo.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1636622198116100001 Content-Type: text/plain; charset="utf-8" We only need to turn QEMU_MIGRATION_CAP_BACKGROUND_SNAPSHOT migration capabiliti for this. Signed-off-by: Nikolay Shirokovskiy --- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_migration.c | 20 +++++++++++++++----- src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_params.c | 1 + src/qemu/qemu_migration_params.h | 1 + src/qemu/qemu_saveimage.c | 3 ++- src/qemu/qemu_saveimage.h | 1 + src/qemu/qemu_snapshot.c | 5 +++-- 8 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6a77d9f513..8edc38d343 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2855,7 +2855,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, xml =3D NULL; =20 ret =3D qemuSaveImageCreate(driver, vm, path, data, compressor, - flags, QEMU_ASYNC_JOB_SAVE); + flags, false, QEMU_ASYNC_JOB_SAVE); if (ret < 0) goto endjob; =20 @@ -3238,7 +3238,7 @@ doCoreDump(virQEMUDriver *driver, if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; =20 - rc =3D qemuMigrationSrcToFile(driver, vm, fd, compressor, + rc =3D qemuMigrationSrcToFile(driver, vm, fd, compressor, false, QEMU_ASYNC_JOB_DUMP); } =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9729041846..18a01df3d0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5898,6 +5898,7 @@ int qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, int fd, virCommand *compressor, + bool instant, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -5924,6 +5925,11 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDom= ainObj *vm, QEMU_DOMAIN_MIG_BANDWIDTH_MAX * 1024= * 1024) < 0) return -1; =20 + if (instant) + qemuMigrationParamsSetCapability(migParams, + QEMU_MIGRATION_CAP_BACKGROUND= _SNAPSHOT, + true); + if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams) < 0) return -1; =20 @@ -6018,11 +6024,15 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDo= mainObj *vm, /* Restore max migration bandwidth */ if (virDomainObjIsActive(vm)) { if (bwParam) { - if (qemuMigrationParamsSetULL(migParams, - QEMU_MIGRATION_PARAM_MAX_BANDWID= TH, - saveMigBandwidth * 1024 * 1024) = =3D=3D 0) - ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob, - migParams)); + qemuMigrationParamsSetULL(migParams, + QEMU_MIGRATION_PARAM_MAX_BANDWIDTH, + saveMigBandwidth * 1024 * 1024); + if (instant) + qemuMigrationParamsSetCapability(migParams, + QEMU_MIGRATION_CAP_BACKGR= OUND_SNAPSHOT, + false); + ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob, + migParams)); } else { if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) =3D= =3D 0) { qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth); diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index dd74f8bc88..9d91fbc882 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -209,6 +209,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, int fd, virCommand *compressor, + bool instant, qemuDomainAsyncJob asyncJob) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 11081dc11c..148aa2d12d 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -90,6 +90,7 @@ VIR_ENUM_IMPL(qemuMigrationCapability, "late-block-activate", "multifd", "dirty-bitmaps", + "background-snapshot", ); =20 =20 diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_par= ams.h index 5ca171226f..844ebf92eb 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -40,6 +40,7 @@ typedef enum { QEMU_MIGRATION_CAP_LATE_BLOCK_ACTIVATE, QEMU_MIGRATION_CAP_MULTIFD, QEMU_MIGRATION_CAP_BLOCK_DIRTY_BITMAPS, + QEMU_MIGRATION_CAP_BACKGROUND_SNAPSHOT, =20 QEMU_MIGRATION_CAP_LAST } qemuMigrationCapability; diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index e03b79c303..b2b48610e6 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -258,6 +258,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, virQEMUSaveData *data, virCommand *compressor, unsigned int flags, + bool instant, qemuDomainAsyncJob asyncJob) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -295,7 +296,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, goto cleanup; =20 /* Perform the migration */ - if (qemuMigrationSrcToFile(driver, vm, fd, compressor, asyncJob) < 0) + if (qemuMigrationSrcToFile(driver, vm, fd, compressor, instant, asyncJ= ob) < 0) goto cleanup; =20 /* Touch up file header to mark image complete. */ diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h index 0710426742..2e87d6485a 100644 --- a/src/qemu/qemu_saveimage.h +++ b/src/qemu/qemu_saveimage.h @@ -96,6 +96,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, virQEMUSaveData *data, virCommand *compressor, unsigned int flags, + bool instant, qemuDomainAsyncJob asyncJob); =20 int diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 7e4dadb876..b521634f2a 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1344,6 +1344,7 @@ qemuSnapshotSaveMemory(virQEMUDriver *driver, virDomainObj *vm, virDomainSnapshotDef *snapdef, bool running, + bool instant, virQEMUDriverConfig *cfg) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -1377,7 +1378,7 @@ qemuSnapshotSaveMemory(virQEMUDriver *driver, xml =3D NULL; =20 if (qemuSaveImageCreate(driver, vm, snapdef->memorysnapshotfile, - data, compressor, 0, + data, compressor, 0, instant, QEMU_ASYNC_JOB_SNAPSHOT) < 0) return -1; =20 @@ -1471,7 +1472,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, if (memory) { memory_existing =3D virFileExists(snapdef->memorysnapshotfile); =20 - if (qemuSnapshotSaveMemory(driver, vm, snapdef, resume, cfg) < 0) + if (qemuSnapshotSaveMemory(driver, vm, snapdef, resume, false, cfg= ) < 0) goto cleanup; =20 /* the memory image was created, remove it on errors */ --=20 2.27.0