[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/23] migration: Use bandwidth_limit directly
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 18/23] migration: Use bandwidth_limit directly |
Date: |
Tue, 20 Sep 2011 16:19:46 +0200 |
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 57cb1f8..b8632e5 100644
--- a/migration.c
+++ b/migration.c
@@ -31,14 +31,14 @@
do { } while (0)
#endif
-/* Migration speed throttling */
-static int64_t max_throttle = (32 << 20);
+#define MAX_THROTTLE (32 << 20) /* Migration speed throttling */
/* When we add fault tolerance, we could have several
migrations at once. For now we don't need to add
dynamic creation of migration */
static MigrationState current_migration_static = {
.state = MIG_STATE_NONE,
+ .bandwidth_limit = MAX_THROTTLE,
};
static MigrationState *current_migration = ¤t_migration_static;
@@ -375,14 +375,12 @@ 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)
{
memset(current_migration, 0, sizeof(current_migration));
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) {
@@ -408,7 +406,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(current_migration, p);
@@ -448,9 +446,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.6.2
- [Qemu-devel] [PATCH 09/23] migration: Refactor and simplify error checking in migrate_fd_put_ready, (continued)
- [Qemu-devel] [PATCH 09/23] migration: Refactor and simplify error checking in migrate_fd_put_ready, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 13/23] migration: Remove migration cancel() callback, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 23/23] migration: make migration-{tcp, unix} consistent, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 12/23] migration: Remove get_status() accessor, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 14/23] migration: Move exported functions to the end of the file, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 06/23] migration: Make all posible migration functions static, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 15/23] migration: use global variable directly, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 21/23] migration: Don't use callback on file defining it, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 19/23] migration: Export a function that tells if the migration has finished correctly, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 17/23] migration: make sure we always have a migration state, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 18/23] migration: Use bandwidth_limit directly,
Juan Quintela <=
- [Qemu-devel] [PATCH 16/23] migration: another case of global variable assigned to local one, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 20/23] migration: Make state definitions local, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH 22/23] migration: propagate error correctly, Juan Quintela, 2011/09/20
- [Qemu-devel] [PATCH v3 00/23] Refactor and cleanup migration code, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 02/23] migration: Use FdMigrationState instead of MigrationState when possible, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 01/23] migration: Make *start_outgoing_migration return FdMigrationState, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 03/23] migration: Fold MigrationState into FdMigrationState, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 04/23] migration: Rename FdMigrationState MigrationState, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 08/23] migration: Introduce MIG_STATE_NONE, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 07/23] migration: move migrate_create_state to do_migrate, Juan Quintela, 2011/09/23