Patchwork [19/28] migration: Use bandwidth_limit directly

login
register
mail settings
Submitter Juan Quintela
Date Feb. 23, 2011, 9:47 p.m.
Message ID <4cbc825787599c0099d71c3b57adb612648d4d0d.1298492768.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/84270/
State New
Headers show

Comments

Juan Quintela - Feb. 23, 2011, 9:47 p.m.
Now that current_migration is static, there is no reason for max_throotle
variable.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

Patch

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(&current_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;
 }