diff options
| author | Juan Quintela <quintela@redhat.com> | 2012-07-20 13:19:36 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2012-10-17 18:34:59 +0200 |
| commit | 11c7674129a81b5b69e00ad252a63186e15bf6b6 (patch) | |
| tree | f154b439ba0497bf1626c47dc49f47d852ab00da /buffered_file.c | |
| parent | 749f7909d942f5c7425d0895242ce720cd663e92 (diff) | |
buffered_file: unfold migrate_fd_close
We only used it once, just remove the callback indirection.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'buffered_file.c')
| -rw-r--r-- | buffered_file.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/buffered_file.c b/buffered_file.c index d257496b7e..4fca774dd8 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -23,7 +23,6 @@ typedef struct QEMUFileBuffered { - BufferedCloseFunc *close; MigrationState *migration_state; QEMUFile *file; int freeze_output; @@ -147,7 +146,7 @@ static int buffered_close(void *opaque) migrate_fd_wait_for_unfreeze(s->migration_state); } - ret = s->close(s->migration_state); + ret = migrate_fd_close(s->migration_state); qemu_del_timer(s->timer); qemu_free_timer(s->timer); @@ -224,8 +223,7 @@ static void buffered_rate_tick(void *opaque) } QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, - size_t bytes_per_sec, - BufferedCloseFunc *close) + size_t bytes_per_sec) { QEMUFileBuffered *s; @@ -233,7 +231,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, s->migration_state = migration_state; s->xfer_limit = bytes_per_sec / 10; - s->close = close; s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, buffered_close, buffered_rate_limit, |