aboutsummaryrefslogtreecommitdiff
path: root/buffered_file.c
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2012-07-20 13:16:28 +0200
committerJuan Quintela <quintela@redhat.com>2012-10-17 18:34:59 +0200
commit749f7909d942f5c7425d0895242ce720cd663e92 (patch)
tree2d625090481b6ca0a59b006508bcbd694d549a15 /buffered_file.c
parent2c9adcb850bba7a24caec4d666dc01deca9f7649 (diff)
buffered_file: unfold migrate_fd_wait_for_unfreeze
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.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/buffered_file.c b/buffered_file.c
index 4c6a7976b1..d257496b7e 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -23,7 +23,6 @@
typedef struct QEMUFileBuffered
{
- BufferedWaitForUnfreezeFunc *wait_for_unfreeze;
BufferedCloseFunc *close;
MigrationState *migration_state;
QEMUFile *file;
@@ -145,7 +144,7 @@ static int buffered_close(void *opaque)
while (!qemu_file_get_error(s->file) && s->buffer_size) {
buffered_flush(s);
if (s->freeze_output)
- s->wait_for_unfreeze(s->migration_state);
+ migrate_fd_wait_for_unfreeze(s->migration_state);
}
ret = s->close(s->migration_state);
@@ -226,7 +225,6 @@ static void buffered_rate_tick(void *opaque)
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t bytes_per_sec,
- BufferedWaitForUnfreezeFunc *wait_for_unfreeze,
BufferedCloseFunc *close)
{
QEMUFileBuffered *s;
@@ -235,7 +233,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
s->migration_state = migration_state;
s->xfer_limit = bytes_per_sec / 10;
- s->wait_for_unfreeze = wait_for_unfreeze;
s->close = close;
s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL,