diff mbox series

[07/43] migration: Move migrate_use_events() to options.c

Message ID 20230302163410.11399-8-quintela@redhat.com
State New
Headers show
Series Migration: Create options.c for capabilities/params/properties | expand

Commit Message

Juan Quintela March 2, 2023, 4:33 p.m. UTC 
Once that we are there, we rename the function to migrate_events()
to be consistent with all other capabilities.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/migration.h |  1 -
 migration/options.h   |  1 +
 migration/migration.c | 11 +----------
 migration/options.c   |  9 +++++++++
 migration/ram.c       |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

Comments

Vladimir Sementsov-Ogievskiy April 20, 2023, 1 p.m. UTC | #1 
On 02.03.23 19:33, Juan Quintela wrote:
> Once that we are there, we rename the function to migrate_events()
> to be consistent with all other capabilities.
> 
> Signed-off-by: Juan Quintela<quintela@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
diff mbox series

Patch

diff --git a/migration/migration.h b/migration/migration.h
index 394728dd44..9d0b1fa45b 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -436,7 +436,6 @@  int migrate_compress_level(void);
 int migrate_compress_threads(void);
 int migrate_compress_wait_thread(void);
 int migrate_decompress_threads(void);
-bool migrate_use_events(void);
 
 /* Sending on the return path - generic and then for each message type */
 void migrate_send_rp_shut(MigrationIncomingState *mis,
diff --git a/migration/options.h b/migration/options.h
index aa9c165c94..caf3b3aa69 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -23,6 +23,7 @@  bool migrate_background_snapshot(void);
 bool migrate_colo(void);
 bool migrate_compress(void);
 bool migrate_dirty_bitmaps(void);
+bool migrate_events(void);
 bool migrate_ignore_shared(void);
 bool migrate_late_block_activate(void);
 bool migrate_pause_before_switchover(void);
diff --git a/migration/migration.c b/migration/migration.c
index 661c7c33d8..6c87aab8af 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -353,7 +353,7 @@  void migration_incoming_state_destroy(void)
 
 static void migrate_generate_event(int new_state)
 {
-    if (migrate_use_events()) {
+    if (migrate_events()) {
         qapi_event_send_migration(new_state);
     }
 }
@@ -2556,15 +2556,6 @@  int migrate_decompress_threads(void)
     return s->parameters.decompress_threads;
 }
 
-bool migrate_use_events(void)
-{
-    MigrationState *s;
-
-    s = migrate_get_current();
-
-    return s->capabilities[MIGRATION_CAPABILITY_EVENTS];
-}
-
 bool migrate_use_multifd(void)
 {
     MigrationState *s;
diff --git a/migration/options.c b/migration/options.c
index d1c44462c5..507b71631e 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -59,6 +59,15 @@  bool migrate_dirty_bitmaps(void)
     return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
 }
 
+bool migrate_events(void)
+{
+    MigrationState *s;
+
+    s = migrate_get_current();
+
+    return s->capabilities[MIGRATION_CAPABILITY_EVENTS];
+}
+
 bool migrate_ignore_shared(void)
 {
     MigrationState *s;
diff --git a/migration/ram.c b/migration/ram.c
index fb868312f4..98ad8e0130 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1252,7 +1252,7 @@  static void migration_bitmap_sync(RAMState *rs)
         rs->num_dirty_pages_period = 0;
         rs->bytes_xfer_prev = stat64_get(&ram_counters.transferred);
     }
-    if (migrate_use_events()) {
+    if (migrate_events()) {
         qapi_event_send_migration_pass(ram_counters.dirty_sync_count);
     }
 }