135 lines
4.3 KiB
Diff
135 lines
4.3 KiB
Diff
From 276877a71778a5cef0dc5bc843e2679f0fdabb77 Mon Sep 17 00:00:00 2001
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
Date: Wed, 1 Mar 2023 22:23:57 +0100
|
|
Subject: [PATCH 30/56] migration: Move migrate_use_block() to options.c
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Peter Xu <peterx@redhat.com>
|
|
RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
|
|
RH-Bugzilla: 2057267
|
|
RH-Acked-by: Leonardo Brás <leobras@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Acked-by: quintela1 <quintela@redhat.com>
|
|
RH-Commit: [29/50] fcaeb0e07cf828f3cd0d115515b30d913525a0a2 (peterx/qemu-kvm)
|
|
|
|
Once that we are there, we rename the function to migrate_block()
|
|
to be consistent with all other capabilities.
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
|
|
(cherry picked from commit 9d4b1e5f22a838285ebeb8f0eb7cc8df1161998f)
|
|
Signed-off-by: Peter Xu <peterx@redhat.com>
|
|
---
|
|
migration/block.c | 2 +-
|
|
migration/migration.c | 11 +----------
|
|
migration/migration.h | 1 -
|
|
migration/options.c | 9 +++++++++
|
|
migration/options.h | 1 +
|
|
migration/savevm.c | 2 +-
|
|
6 files changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/migration/block.c b/migration/block.c
|
|
index 4b167fa5cf..f0977217cf 100644
|
|
--- a/migration/block.c
|
|
+++ b/migration/block.c
|
|
@@ -1001,7 +1001,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id)
|
|
|
|
static bool block_is_active(void *opaque)
|
|
{
|
|
- return migrate_use_block();
|
|
+ return migrate_block();
|
|
}
|
|
|
|
static SaveVMHandlers savevm_block_handlers = {
|
|
diff --git a/migration/migration.c b/migration/migration.c
|
|
index a4ede4294e..96f82bd165 100644
|
|
--- a/migration/migration.c
|
|
+++ b/migration/migration.c
|
|
@@ -2415,7 +2415,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
|
|
error_setg(errp, "No disk migration is required in COLO mode");
|
|
return false;
|
|
}
|
|
- if (migrate_use_block() || migrate_use_block_incremental()) {
|
|
+ if (migrate_block() || migrate_use_block_incremental()) {
|
|
error_setg(errp, "Command options are incompatible with "
|
|
"current migration capabilities");
|
|
return false;
|
|
@@ -2622,15 +2622,6 @@ static int64_t migrate_max_postcopy_bandwidth(void)
|
|
return s->parameters.max_postcopy_bandwidth;
|
|
}
|
|
|
|
-bool migrate_use_block(void)
|
|
-{
|
|
- MigrationState *s;
|
|
-
|
|
- s = migrate_get_current();
|
|
-
|
|
- return s->capabilities[MIGRATION_CAPABILITY_BLOCK];
|
|
-}
|
|
-
|
|
bool migrate_use_return_path(void)
|
|
{
|
|
MigrationState *s;
|
|
diff --git a/migration/migration.h b/migration/migration.h
|
|
index e2bb5b1e2f..d4b68b08a5 100644
|
|
--- a/migration/migration.h
|
|
+++ b/migration/migration.h
|
|
@@ -457,7 +457,6 @@ int migrate_multifd_zstd_level(void);
|
|
int migrate_use_tls(void);
|
|
uint64_t migrate_xbzrle_cache_size(void);
|
|
|
|
-bool migrate_use_block(void);
|
|
bool migrate_use_block_incremental(void);
|
|
int migrate_max_cpu_throttle(void);
|
|
bool migrate_use_return_path(void);
|
|
diff --git a/migration/options.c b/migration/options.c
|
|
index 25264c500e..fe1eadeed6 100644
|
|
--- a/migration/options.c
|
|
+++ b/migration/options.c
|
|
@@ -33,6 +33,15 @@ bool migrate_background_snapshot(void)
|
|
return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
|
|
}
|
|
|
|
+bool migrate_block(void)
|
|
+{
|
|
+ MigrationState *s;
|
|
+
|
|
+ s = migrate_get_current();
|
|
+
|
|
+ return s->capabilities[MIGRATION_CAPABILITY_BLOCK];
|
|
+}
|
|
+
|
|
bool migrate_colo(void)
|
|
{
|
|
MigrationState *s = migrate_get_current();
|
|
diff --git a/migration/options.h b/migration/options.h
|
|
index 8f76a88329..e985a5233e 100644
|
|
--- a/migration/options.h
|
|
+++ b/migration/options.h
|
|
@@ -18,6 +18,7 @@
|
|
|
|
bool migrate_auto_converge(void);
|
|
bool migrate_background_snapshot(void);
|
|
+bool migrate_block(void);
|
|
bool migrate_colo(void);
|
|
bool migrate_compress(void);
|
|
bool migrate_dirty_bitmaps(void);
|
|
diff --git a/migration/savevm.c b/migration/savevm.c
|
|
index ebcf571e37..9671211339 100644
|
|
--- a/migration/savevm.c
|
|
+++ b/migration/savevm.c
|
|
@@ -1612,7 +1612,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
|
|
return -EINVAL;
|
|
}
|
|
|
|
- if (migrate_use_block()) {
|
|
+ if (migrate_block()) {
|
|
error_setg(errp, "Block migration and snapshots are incompatible");
|
|
return -EINVAL;
|
|
}
|
|
--
|
|
2.39.1
|
|
|