Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Juan Quintela committed May 18, 2023
1 parent d0a14a2 commit 8e4b2a7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
6 changes: 6 additions & 0 deletions migration/migration-stats.h
Expand Up @@ -15,6 +15,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
Expand Down
4 changes: 2 additions & 2 deletions migration/migration.c
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
/*
Expand Down
6 changes: 5 additions & 1 deletion migration/qemu-file.c
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8e4b2a7

Please sign in to comment.