[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/28] migration: Use bandwidth_limit directly
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 19/28] migration: Use bandwidth_limit directly |
Date: |
Wed, 23 Feb 2011 22:47:28 +0100 |
Now that current_migration is static, there is no reason for max_throotle
variable.
Signed-off-by: Juan Quintela <address@hidden>
---
migration.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/migration.c b/migration.c
index f8c6d09..49cdf72 100644
--- a/migration.c
+++ b/migration.c
@@ -31,11 +31,11 @@
do { } while (0)
#endif
-/* Migration speed throttling */
-static int64_t max_throttle = (32 << 20);
+#define MAX_THROTTLE (32 << 20) /* Migration speed throttling */
static MigrationState current_migration = {
.state = MIG_STATE_NONE,
+ .bandwidth_limit = MAX_THROTTLE,
};
static NotifierList migration_state_notifiers =
@@ -369,13 +369,11 @@ void migrate_fd_connect(MigrationState *s)
migrate_fd_put_ready(s);
}
-static void migrate_init_state(Monitor *mon, int64_t bandwidth_limit,
- int detach, int blk, int inc)
+static void migrate_init_state(Monitor *mon, int detach, int blk, int inc)
{
current_migration.blk = blk;
current_migration.shared = inc;
current_migration.mon = NULL;
- current_migration.bandwidth_limit = bandwidth_limit;
current_migration.state = MIG_STATE_NONE;
if (!detach) {
@@ -401,7 +399,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject
**ret_data)
return -1;
}
- migrate_init_state(mon, max_throttle, detach, blk, inc);
+ migrate_init_state(mon, detach, blk, inc);
if (strstart(uri, "tcp:", &p)) {
ret = tcp_start_outgoing_migration(¤t_migration, p);
@@ -441,9 +439,10 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict,
QObject **ret_data)
if (d < 0) {
d = 0;
}
- max_throttle = d;
+ current_migration.bandwidth_limit = d;
- qemu_file_set_rate_limit(current_migration.file, max_throttle);
+ qemu_file_set_rate_limit(current_migration.file,
+ current_migration.bandwidth_limit);
return 0;
}
--
1.7.4
- Re: [Qemu-devel] [PATCH 16/28] migration: use global variable directly, (continued)
- Re: [Qemu-devel] [PATCH 16/28] migration: use global variable directly, Anthony Liguori, 2011/02/23
- [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Juan Quintela, 2011/02/23
- [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Anthony Liguori, 2011/02/23
- [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Juan Quintela, 2011/02/23
- Re: [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Markus Armbruster, 2011/02/24
- [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Paolo Bonzini, 2011/02/24
[Qemu-devel] [PATCH 17/28] migration: another case of global variable assigned to local one, Juan Quintela, 2011/02/23
[Qemu-devel] [PATCH 18/28] migration: convert current_migration from pointer to struct, Juan Quintela, 2011/02/23
[Qemu-devel] [PATCH 19/28] migration: Use bandwidth_limit directly,
Juan Quintela <=
[Qemu-devel] [PATCH 07/28] migration: move migrate_create_state to do_migrate, Juan Quintela, 2011/02/23
[Qemu-devel] [PATCH 20/28] migration: Export a function that tells if the migration has finished correctly, Juan Quintela, 2011/02/23
[Qemu-devel] [PATCH 21/28] migration: Make state definitions local, Juan Quintela, 2011/02/23
[Qemu-devel] [PATCH 05/28] migration: Refactor MigrationState creation, Juan Quintela, 2011/02/23
[Qemu-devel] [PATCH 23/28] migration: add error handling to migrate_fd_put_notify()., Juan Quintela, 2011/02/23
[Qemu-devel] [PATCH 22/28] savevm: avoid qemu_savevm_state_iteate() to return 1 when qemu file has error., Juan Quintela, 2011/02/23
[Qemu-devel] [PATCH 24/28] migration: Don't use callback on file defining it, Juan Quintela, 2011/02/23