ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Use bandwidth_limit directly 

Now that current_migration always exist, there is no reason for
max_throotle variable.

Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2011-02-23 00:33:19 +01:00
parent 17549e84e0
commit d0ae46c197
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
migration.c
View File

@ -31,8 +31,7 @@
do { } while (0) do { } while (0)
#endif #endif
/* Migration speed throttling */ #define MAX_THROTTLE (32 << 20) /* Migration speed throttling */
static int64_t max_throttle = (32 << 20);
static NotifierList migration_state_notifiers = static NotifierList migration_state_notifiers =
NOTIFIER_LIST_INITIALIZER(migration_state_notifiers); NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
@ -45,6 +44,7 @@ static MigrationState *migrate_get_current(void)
{ {
static MigrationState current_migration = { static MigrationState current_migration = {
.state = MIG_STATE_SETUP, .state = MIG_STATE_SETUP,
.bandwidth_limit = MAX_THROTTLE,
}; };
return &current_migration; return &current_migration;
@ -391,12 +391,13 @@ void migrate_fd_connect(MigrationState *s)
migrate_fd_put_ready(s); migrate_fd_put_ready(s);
} }
static MigrationState *migrate_init(Monitor *mon, int64_t bandwidth_limit, static MigrationState *migrate_init(Monitor *mon, int detach, int blk, int inc)
int detach, int blk, int inc)
{ {
MigrationState *s = migrate_get_current(); MigrationState *s = migrate_get_current();
int64_t bandwidth_limit = s->bandwidth_limit;
memset(s, 0, sizeof(*s)); memset(s, 0, sizeof(*s));
s->bandwidth_limit = bandwidth_limit;
s->blk = blk; s->blk = blk;
s->shared = inc; s->shared = inc;
s->mon = NULL; s->mon = NULL;
@ -429,7 +430,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
return -1; return -1;
} }
s = migrate_init(mon, max_throttle, detach, blk, inc); s = migrate_init(mon, detach, blk, inc);
if (strstart(uri, "tcp:", &p)) { if (strstart(uri, "tcp:", &p)) {
ret = tcp_start_outgoing_migration(s, p); ret = tcp_start_outgoing_migration(s, p);
@ -470,10 +471,10 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
if (d < 0) { if (d < 0) {
d = 0; d = 0;
} }
max_throttle = d;
s = migrate_get_current(); s = migrate_get_current();
qemu_file_set_rate_limit(s->file, max_throttle); s->bandwidth_limit = d;
qemu_file_set_rate_limit(s->file, s->bandwidth_limit);
return 0; return 0;
} }