diff options
| author | Juan Quintela <quintela@redhat.com> | 2012-07-20 13:33:53 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2012-10-17 18:34:59 +0200 |
| commit | 796b4b0f5011e30cffbc57ed5a4ab93c6f5eaab7 (patch) | |
| tree | bd353edd96463d89a8040fe5b4aa0d07b5a68f5e | |
| parent | 11c7674129a81b5b69e00ad252a63186e15bf6b6 (diff) | |
| download | qemu-796b4b0f5011e30cffbc57ed5a4ab93c6f5eaab7.tar.gz qemu-796b4b0f5011e30cffbc57ed5a4ab93c6f5eaab7.tar.bz2 qemu-796b4b0f5011e30cffbc57ed5a4ab93c6f5eaab7.zip | |
buffered_file: We can access directly to bandwidth_limit
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | buffered_file.c | 5 | ||||
| -rw-r--r-- | buffered_file.h | 3 | ||||
| -rw-r--r-- | migration.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/buffered_file.c b/buffered_file.c index 4fca774dd8..43e68b6515 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -222,15 +222,14 @@ static void buffered_rate_tick(void *opaque) buffered_put_buffer(s, NULL, 0, 0); } -QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, - size_t bytes_per_sec) +QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state) { QEMUFileBuffered *s; s = g_malloc0(sizeof(*s)); s->migration_state = migration_state; - s->xfer_limit = bytes_per_sec / 10; + s->xfer_limit = migration_state->bandwidth_limit / 10; s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, buffered_close, buffered_rate_limit, diff --git a/buffered_file.h b/buffered_file.h index 8a38754146..ef010febfe 100644 --- a/buffered_file.h +++ b/buffered_file.h @@ -17,7 +17,6 @@ #include "hw/hw.h" #include "migration.h" -QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, - size_t xfer_limit); +QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state); #endif diff --git a/migration.c b/migration.c index f647a3fccb..ea21dc40e1 100644 --- a/migration.c +++ b/migration.c @@ -429,7 +429,7 @@ void migrate_fd_connect(MigrationState *s) int ret; s->state = MIG_STATE_ACTIVE; - s->file = qemu_fopen_ops_buffered(s, s->bandwidth_limit); + s->file = qemu_fopen_ops_buffered(s); DPRINTF("beginning savevm\n"); ret = qemu_savevm_state_begin(s->file, &s->params); |