diff options
| author | Juan Quintela <quintela@redhat.com> | 2023-05-15 21:56:54 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-05-18 18:40:51 +0200 |
| commit | 8e4b2a70599b3700b12b5a6059c819f81da9588c (patch) | |
| tree | a4a65062bec28ec3e0314ebf1be741f17c0c2415 | |
| parent | d0a14a2ba01c7b200e6ce3e7979e1ed3ede1d5c7 (diff) | |
| download | focaccia-qemu-8e4b2a70599b3700b12b5a6059c819f81da9588c.tar.gz focaccia-qemu-8e4b2a70599b3700b12b5a6059c819f81da9588c.zip | |
migration: Don't use INT64_MAX for unlimited rate
Define and use RATE_LIMIT_DISABLED instead. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com> Message-Id: <20230515195709.63843-2-quintela@redhat.com>
| -rw-r--r-- | migration/migration-stats.h | 6 | ||||
| -rw-r--r-- | migration/migration.c | 4 | ||||
| -rw-r--r-- | migration/qemu-file.c | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/migration/migration-stats.h b/migration/migration-stats.h index cf8a4f0410..e7f1269769 100644 --- a/migration/migration-stats.h +++ b/migration/migration-stats.h @@ -16,6 +16,12 @@ #include "qemu/stats64.h" /* + * If rate_limit_max is 0, there is special code to remove the rate + * limit. + */ +#define RATE_LIMIT_DISABLED 0 + +/* * These are the ram migration statistic counters. It is loosely * based on MigrationStats. We change to Stat64 any counter that * needs to be updated using atomic ops (can be accessed by more than diff --git a/migration/migration.c b/migration/migration.c index 039bba4804..3ceaf29798 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2304,7 +2304,7 @@ static void migration_completion(MigrationState *s) * them if migration fails or is cancelled. */ s->block_inactive = !migrate_colo(); - qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX); + qemu_file_set_rate_limit(s->to_dst_file, RATE_LIMIT_DISABLED); ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false, s->block_inactive); } @@ -3048,7 +3048,7 @@ static void *bg_migration_thread(void *opaque) rcu_register_thread(); object_ref(OBJECT(s)); - qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX); + qemu_file_set_rate_limit(s->to_dst_file, RATE_LIMIT_DISABLED); setup_start = qemu_clock_get_ms(QEMU_CLOCK_HOST); /* diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 597054759d..9728002de5 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -27,6 +27,7 @@ #include "qemu/error-report.h" #include "qemu/iov.h" #include "migration.h" +#include "migration-stats.h" #include "qemu-file.h" #include "trace.h" #include "options.h" @@ -732,7 +733,10 @@ int qemu_file_rate_limit(QEMUFile *f) if (qemu_file_get_error(f)) { return 1; } - if (f->rate_limit_max > 0 && f->rate_limit_used > f->rate_limit_max) { + if (f->rate_limit_max == RATE_LIMIT_DISABLED) { + return 0; + } + if (f->rate_limit_used > f->rate_limit_max) { return 1; } return 0; |