42a945317b
- kvm-virtio-iommu-Fix-64kB-host-page-size-VFIO-device-ass.patch [bz#2211609 bz#2211634] - kvm-virtio-iommu-Rework-the-traces-in-virtio_iommu_set_p.patch [bz#2211609 bz#2211634] - kvm-vfio-pci-add-support-for-VF-token.patch [bz#2192818] - kvm-vfio-migration-Skip-log_sync-during-migration-SETUP-.patch [bz#2192818] - kvm-vfio-pci-Static-Resizable-BAR-capability.patch [bz#2192818] - kvm-vfio-pci-Fix-a-use-after-free-issue.patch [bz#2192818] - kvm-util-vfio-helpers-Use-g_file_read_link.patch [bz#2192818] - kvm-migration-Make-all-functions-check-have-the-same-for.patch [bz#2192818] - kvm-migration-Move-migration_properties-to-options.c.patch [bz#2192818] - kvm-migration-Add-switchover-ack-capability.patch [bz#2192818] - kvm-migration-Implement-switchover-ack-logic.patch [bz#2192818] - kvm-migration-Enable-switchover-ack-capability.patch [bz#2192818] - kvm-vfio-migration-Refactor-vfio_save_block-to-return-sa.patch [bz#2192818] - kvm-vfio-migration-Store-VFIO-migration-flags-in-VFIOMig.patch [bz#2192818] - kvm-vfio-migration-Add-VFIO-migration-pre-copy-support.patch [bz#2192818] - kvm-vfio-migration-Add-support-for-switchover-ack-capabi.patch [bz#2192818] - kvm-vfio-Implement-a-common-device-info-helper.patch [bz#2192818] - kvm-hw-vfio-pci-quirks-Support-alternate-offset-for-GPUD.patch [bz#2192818] - kvm-vfio-pci-Call-vfio_prepare_kvm_msi_virq_batch-in-MSI.patch [bz#2192818] - kvm-vfio-migration-Reset-bytes_transferred-properly.patch [bz#2192818] - kvm-vfio-migration-Make-VFIO-migration-non-experimental.patch [bz#2192818] - kvm-vfio-pci-Fix-a-segfault-in-vfio_realize.patch [bz#2192818] - kvm-vfio-pci-Free-leaked-timer-in-vfio_realize-error-pat.patch [bz#2192818] - kvm-hw-vfio-pci-quirks-Sanitize-capability-pointer.patch [bz#2192818] - kvm-vfio-pci-Disable-INTx-in-vfio_realize-error-path.patch [bz#2192818] - kvm-vfio-migration-Change-vIOMMU-blocker-from-global-to-.patch [bz#2192818] - kvm-vfio-migration-Free-resources-when-vfio_migration_re.patch [bz#2192818] - kvm-vfio-migration-Remove-print-of-Migration-disabled.patch [bz#2192818] - kvm-vfio-migration-Return-bool-type-for-vfio_migration_r.patch [bz#2192818] - kvm-vfio-Fix-null-pointer-dereference-bug-in-vfio_bars_f.patch [bz#2192818] - kvm-pc-bios-s390-ccw-Makefile-Use-z-noexecstack-to-silen.patch [bz#2220866] - kvm-pc-bios-s390-ccw-Fix-indentation-in-start.S.patch [bz#2220866] - kvm-pc-bios-s390-ccw-Provide-space-for-initial-stack-fra.patch [bz#2220866] - kvm-pc-bios-s390-ccw-Don-t-use-__bss_start-with-the-larl.patch [bz#2220866] - kvm-ui-Fix-pixel-colour-channel-order-for-PNG-screenshot.patch [bz#2222579] - kvm-block-blkio-fix-module_block.py-parsing.patch [bz#2213317] - kvm-Fix-virtio-blk-vhost-vdpa-typo-in-spec-file.patch [bz#2213317] - Resolves: bz#2211609 (With virtio-iommu and vfio-pci, qemu reports "warning: virtio-iommu page mask 0xfffffffffffff000 does not match 0x40201000") - Resolves: bz#2211634 ([aarch64] With virtio-iommu and vfio-pci, qemu coredump when host using kernel-64k package) - Resolves: bz#2192818 ([VFIO LM] Live migration) - Resolves: bz#2220866 (Misaligned symbol for s390-ccw image during qemu-kvm build) - Resolves: bz#2222579 (PNG screendump doesn't save screen correctly) - Resolves: bz#2213317 (Enable libblkio-based block drivers in QEMU)
432 lines
9.6 KiB
Diff
432 lines
9.6 KiB
Diff
From eaccfc91b34f93dcaf597e6b39f78741da618ff3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
|
|
Date: Wed, 12 Jul 2023 17:46:57 +0200
|
|
Subject: [PATCH 08/37] migration: Make all functions check have the same
|
|
format
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Cédric Le Goater <clg@redhat.com>
|
|
RH-MergeRequest: 179: vfio: live migration support
|
|
RH-Bugzilla: 2192818
|
|
RH-Acked-by: Eric Auger <eric.auger@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [6/28] 774df2a81502d3eab5d5b8f64fa9b69f8be43669 (clegoate/qemu-kvm-c9s)
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/2192818
|
|
|
|
commit 8f9c532756c5
|
|
Author: Juan Quintela <quintela@redhat.com>
|
|
Date: Wed Mar 1 23:11:08 2023 +0100
|
|
|
|
migration: Make all functions check have the same format
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
|
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
|
---
|
|
migration/options.c | 153 +++++++++++---------------------------------
|
|
1 file changed, 39 insertions(+), 114 deletions(-)
|
|
|
|
diff --git a/migration/options.c b/migration/options.c
|
|
index e51d667e14..bcfe244fa9 100644
|
|
--- a/migration/options.c
|
|
+++ b/migration/options.c
|
|
@@ -33,27 +33,21 @@
|
|
|
|
bool migrate_auto_converge(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE];
|
|
}
|
|
|
|
bool migrate_background_snapshot(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
|
|
}
|
|
|
|
bool migrate_block(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_BLOCK];
|
|
}
|
|
@@ -61,95 +55,76 @@ bool migrate_block(void)
|
|
bool migrate_colo(void)
|
|
{
|
|
MigrationState *s = migrate_get_current();
|
|
+
|
|
return s->capabilities[MIGRATION_CAPABILITY_X_COLO];
|
|
}
|
|
|
|
bool migrate_compress(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_COMPRESS];
|
|
}
|
|
|
|
bool migrate_dirty_bitmaps(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
|
|
}
|
|
|
|
bool migrate_events(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_EVENTS];
|
|
}
|
|
|
|
bool migrate_ignore_shared(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED];
|
|
}
|
|
|
|
bool migrate_late_block_activate(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE];
|
|
}
|
|
|
|
bool migrate_multifd(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_MULTIFD];
|
|
}
|
|
|
|
bool migrate_pause_before_switchover(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER];
|
|
}
|
|
|
|
bool migrate_postcopy_blocktime(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME];
|
|
}
|
|
|
|
bool migrate_postcopy_preempt(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT];
|
|
}
|
|
|
|
bool migrate_postcopy_ram(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM];
|
|
}
|
|
@@ -163,54 +138,42 @@ bool migrate_rdma_pin_all(void)
|
|
|
|
bool migrate_release_ram(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM];
|
|
}
|
|
|
|
bool migrate_return_path(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
|
|
}
|
|
|
|
bool migrate_validate_uuid(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID];
|
|
}
|
|
|
|
bool migrate_xbzrle(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_XBZRLE];
|
|
}
|
|
|
|
bool migrate_zero_blocks(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS];
|
|
}
|
|
|
|
bool migrate_zero_copy_send(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND];
|
|
}
|
|
@@ -224,9 +187,7 @@ bool migrate_postcopy(void)
|
|
|
|
bool migrate_tls(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.tls_creds && *s->parameters.tls_creds;
|
|
}
|
|
@@ -491,126 +452,98 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
|
|
|
|
bool migrate_block_incremental(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.block_incremental;
|
|
}
|
|
|
|
uint32_t migrate_checkpoint_delay(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.x_checkpoint_delay;
|
|
}
|
|
|
|
int migrate_compress_level(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.compress_level;
|
|
}
|
|
|
|
int migrate_compress_threads(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.compress_threads;
|
|
}
|
|
|
|
int migrate_compress_wait_thread(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.compress_wait_thread;
|
|
}
|
|
|
|
uint8_t migrate_cpu_throttle_increment(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.cpu_throttle_increment;
|
|
}
|
|
|
|
uint8_t migrate_cpu_throttle_initial(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.cpu_throttle_initial;
|
|
}
|
|
|
|
bool migrate_cpu_throttle_tailslow(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.cpu_throttle_tailslow;
|
|
}
|
|
|
|
int migrate_decompress_threads(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.decompress_threads;
|
|
}
|
|
|
|
uint8_t migrate_max_cpu_throttle(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.max_cpu_throttle;
|
|
}
|
|
|
|
uint64_t migrate_max_bandwidth(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.max_bandwidth;
|
|
}
|
|
|
|
int64_t migrate_max_postcopy_bandwidth(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.max_postcopy_bandwidth;
|
|
}
|
|
|
|
int migrate_multifd_channels(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.multifd_channels;
|
|
}
|
|
|
|
MultiFDCompression migrate_multifd_compression(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
assert(s->parameters.multifd_compression < MULTIFD_COMPRESSION__MAX);
|
|
return s->parameters.multifd_compression;
|
|
@@ -618,36 +551,28 @@ MultiFDCompression migrate_multifd_compression(void)
|
|
|
|
int migrate_multifd_zlib_level(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.multifd_zlib_level;
|
|
}
|
|
|
|
int migrate_multifd_zstd_level(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.multifd_zstd_level;
|
|
}
|
|
|
|
uint8_t migrate_throttle_trigger_threshold(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.throttle_trigger_threshold;
|
|
}
|
|
|
|
uint64_t migrate_xbzrle_cache_size(void)
|
|
{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
+ MigrationState *s = migrate_get_current();
|
|
|
|
return s->parameters.xbzrle_cache_size;
|
|
}
|
|
--
|
|
2.39.3
|
|
|