Skip to contentSkip to conversation

migration: use migration_is_active to represent active state

PATCH In review Wei Yang 3 participants 5 messages Jul 17, 2019 – Oct 11, 2019

lore
Share & tools
lore

Wei Yang

author
#0 lore raw

PATCH 1/1 migration: use migration_is_active to represent active state

Wrap the check into a function to make it easy to read.

---
 include/migration/misc.h |  1 +
 migration/migration.c    | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
include/migration/misc.h +1 -0
index 5cdbabd094..42d6abc920 100644
@@ -61,6 +61,7 @@ void migration_object_init(void);
 void migration_shutdown(void);
 void qemu_start_incoming_migration(const char *uri, Error **errp);
 bool migration_is_idle(void);
+bool migration_is_active(MigrationState *);
 void add_migration_state_change_notifier(Notifier *notify);
 void remove_migration_state_change_notifier(Notifier *notify);
 bool migration_in_setup(MigrationState *);
migration/migration.c +8 -4
index 43fd8297ef..4c066fc85c 100644
@@ -1529,8 +1529,7 @@ static void migrate_fd_cleanup(MigrationState *s)
         qemu_fclose(tmp);
     }
 
-    assert((s->state != MIGRATION_STATUS_ACTIVE) &&
-           (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE));
+    assert(!migration_is_active(s));
 
     if (s->state == MIGRATION_STATUS_CANCELLING) {
         migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
@@ -1690,6 +1689,12 @@ bool migration_is_idle(void)
     return false;
 }
 
+bool migration_is_active(MigrationState *s)
+{
+    return (s->state == MIGRATION_STATUS_ACTIVE ||
+            s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
+}
+
 void migrate_init(MigrationState *s)
 {
     /*
@@ -3226,8 +3231,7 @@ static void *migration_thread(void *opaque)
 
     trace_migration_thread_setup_complete();
 
-    while (s->state == MIGRATION_STATUS_ACTIVE ||
-           s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
+    while (migration_is_active(s)) {
         int64_t current_time;
 
         if (urgent || !qemu_file_rate_limit(s->to_dst_file)) {
Signature · 1 line
2.17.1
#1 lore raw
Quoted 2 lines · Wei Yang

Wrap the check into a function to make it easy to read.

Hi, Dave & Juan

Do you like this one :-) ?

Quoted 58 lines

---
include/migration/misc.h | 1 +
migration/migration.c | 12 ++++++++----

2 files changed, 9 insertions(+), 4 deletions(-)
include/migration/misc.h +1 -0
index 5cdbabd094..42d6abc920 100644
@@ -61,6 +61,7 @@ void migration_object_init(void);
 void migration_shutdown(void);
 void qemu_start_incoming_migration(const char *uri, Error **errp);
 bool migration_is_idle(void);
+bool migration_is_active(MigrationState *);
 void add_migration_state_change_notifier(Notifier *notify);
 void remove_migration_state_change_notifier(Notifier *notify);
 bool migration_in_setup(MigrationState *);
migration/migration.c +8 -4
index 43fd8297ef..4c066fc85c 100644
@@ -1529,8 +1529,7 @@ static void migrate_fd_cleanup(MigrationState *s)
        qemu_fclose(tmp);
    }
 
-    assert((s->state != MIGRATION_STATUS_ACTIVE) &&
-           (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE));
+    assert(!migration_is_active(s));
 
    if (s->state == MIGRATION_STATUS_CANCELLING) {
        migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
@@ -1690,6 +1689,12 @@ bool migration_is_idle(void)
    return false;
 }
 
+bool migration_is_active(MigrationState *s)
+{
+    return (s->state == MIGRATION_STATUS_ACTIVE ||
+            s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
+}
+
 void migrate_init(MigrationState *s)
 {
    /*
@@ -3226,8 +3231,7 @@ static void *migration_thread(void *opaque)
 
    trace_migration_thread_setup_complete();
 
-    while (s->state == MIGRATION_STATUS_ACTIVE ||
-           s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
+    while (migration_is_active(s)) {
        int64_t current_time;
 
        if (urgent || !qemu_file_rate_limit(s->to_dst_file)) {
Signature · 1 line
2.17.1
Signature · 2 lines
Wei Yang
Help you, Help me
author
#2 lore raw
Quoted 8 lines · Wei Yang
Quoted 2 lines · Wei Yang

Wrap the check into a function to make it easy to read.

Hi, Dave & Juan

Do you like this one :-) ?

Sorry for ping again.

Quoted 62 lines
Quoted 58 lines

---
include/migration/misc.h | 1 +
migration/migration.c | 12 ++++++++----

2 files changed, 9 insertions(+), 4 deletions(-)
include/migration/misc.h +1 -0
index 5cdbabd094..42d6abc920 100644
@@ -61,6 +61,7 @@ void migration_object_init(void);
 void migration_shutdown(void);
 void qemu_start_incoming_migration(const char *uri, Error **errp);
 bool migration_is_idle(void);
+bool migration_is_active(MigrationState *);
 void add_migration_state_change_notifier(Notifier *notify);
 void remove_migration_state_change_notifier(Notifier *notify);
 bool migration_in_setup(MigrationState *);
migration/migration.c +8 -4
index 43fd8297ef..4c066fc85c 100644
@@ -1529,8 +1529,7 @@ static void migrate_fd_cleanup(MigrationState *s)
        qemu_fclose(tmp);
    }
 
-    assert((s->state != MIGRATION_STATUS_ACTIVE) &&
-           (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE));
+    assert(!migration_is_active(s));
 
    if (s->state == MIGRATION_STATUS_CANCELLING) {
        migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
@@ -1690,6 +1689,12 @@ bool migration_is_idle(void)
    return false;
 }
 
+bool migration_is_active(MigrationState *s)
+{
+    return (s->state == MIGRATION_STATUS_ACTIVE ||
+            s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
+}
+
 void migrate_init(MigrationState *s)
 {
    /*
@@ -3226,8 +3231,7 @@ static void *migration_thread(void *opaque)
 
    trace_migration_thread_setup_complete();
 
-    while (s->state == MIGRATION_STATUS_ACTIVE ||
-           s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
+    while (migration_is_active(s)) {
        int64_t current_time;
 
        if (urgent || !qemu_file_rate_limit(s->to_dst_file)) {
Signature · 1 line
2.17.1
Signature · 2 lines
Wei Yang
Help you, Help me
Signature · 2 lines
Wei Yang
Help you, Help me
Reviewed-by on v1 1/1
#3 lore raw
In reply to Wei Yang
Quoted 3 lines · * Wei Yang ([email protected]) wrote:

Wrap the check into a function to make it easy to read.

Quoted 57 lines
---
 include/migration/misc.h |  1 +
 migration/migration.c    | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
include/migration/misc.h +1 -0
index 5cdbabd094..42d6abc920 100644
@@ -61,6 +61,7 @@ void migration_object_init(void);
 void migration_shutdown(void);
 void qemu_start_incoming_migration(const char *uri, Error **errp);
 bool migration_is_idle(void);
+bool migration_is_active(MigrationState *);
 void add_migration_state_change_notifier(Notifier *notify);
 void remove_migration_state_change_notifier(Notifier *notify);
 bool migration_in_setup(MigrationState *);
migration/migration.c +8 -4
index 43fd8297ef..4c066fc85c 100644
@@ -1529,8 +1529,7 @@ static void migrate_fd_cleanup(MigrationState *s)
         qemu_fclose(tmp);
     }
 
-    assert((s->state != MIGRATION_STATUS_ACTIVE) &&
-           (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE));
+    assert(!migration_is_active(s));
 
     if (s->state == MIGRATION_STATUS_CANCELLING) {
         migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
@@ -1690,6 +1689,12 @@ bool migration_is_idle(void)
     return false;
 }
 
+bool migration_is_active(MigrationState *s)
+{
+    return (s->state == MIGRATION_STATUS_ACTIVE ||
+            s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
+}
+
 void migrate_init(MigrationState *s)
 {
     /*
@@ -3226,8 +3231,7 @@ static void *migration_thread(void *opaque)
 
     trace_migration_thread_setup_complete();
 
-    while (s->state == MIGRATION_STATUS_ACTIVE ||
-           s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
+    while (migration_is_active(s)) {
         int64_t current_time;
 
         if (urgent || !qemu_file_rate_limit(s->to_dst_file)) {
Signature · 1 line
2.17.1

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#4 lore raw
Quoted 6 lines · * Dr. David Alan Gilbert ([email protected]) wrote:
Quoted 3 lines · * Wei Yang ([email protected]) wrote:

Wrap the check into a function to make it easy to read.

Queued

Quoted 54 lines
Quoted 54 lines
---
 include/migration/misc.h |  1 +
 migration/migration.c    | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
include/migration/misc.h +1 -0
index 5cdbabd094..42d6abc920 100644
@@ -61,6 +61,7 @@ void migration_object_init(void);
 void migration_shutdown(void);
 void qemu_start_incoming_migration(const char *uri, Error **errp);
 bool migration_is_idle(void);
+bool migration_is_active(MigrationState *);
 void add_migration_state_change_notifier(Notifier *notify);
 void remove_migration_state_change_notifier(Notifier *notify);
 bool migration_in_setup(MigrationState *);
migration/migration.c +8 -4
index 43fd8297ef..4c066fc85c 100644
@@ -1529,8 +1529,7 @@ static void migrate_fd_cleanup(MigrationState *s)
         qemu_fclose(tmp);
     }
 
-    assert((s->state != MIGRATION_STATUS_ACTIVE) &&
-           (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE));
+    assert(!migration_is_active(s));
 
     if (s->state == MIGRATION_STATUS_CANCELLING) {
         migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
@@ -1690,6 +1689,12 @@ bool migration_is_idle(void)
     return false;
 }
 
+bool migration_is_active(MigrationState *s)
+{
+    return (s->state == MIGRATION_STATUS_ACTIVE ||
+            s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
+}
+
 void migrate_init(MigrationState *s)
 {
     /*
@@ -3226,8 +3231,7 @@ static void *migration_thread(void *opaque)
 
     trace_migration_thread_setup_complete();
 
-    while (s->state == MIGRATION_STATUS_ACTIVE ||
-           s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
+    while (migration_is_active(s)) {
         int64_t current_time;
 
Quoted 7 lines
Quoted 4 lines
migration/migration.c +0 -0
         if (urgent || !qemu_file_rate_limit(s->to_dst_file)) {
Signature · 1 line
2.17.1

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK