aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2012-07-20 13:19:36 +0200
committerJuan Quintela <quintela@redhat.com>2012-10-17 18:34:59 +0200
commit11c7674129a81b5b69e00ad252a63186e15bf6b6 (patch)
treef154b439ba0497bf1626c47dc49f47d852ab00da
parent749f7909d942f5c7425d0895242ce720cd663e92 (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>
-rw-r--r--buffered_file.c7
-rw-r--r--buffered_file.h5
-rw-r--r--migration.c8
-rw-r--r--migration.h1
4 files changed, 6 insertions, 15 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,
diff --git a/buffered_file.h b/buffered_file.h
index 926e5c6fc5..8a38754146 100644
--- a/buffered_file.h
+++ b/buffered_file.h
@@ -17,10 +17,7 @@
#include "hw/hw.h"
#include "migration.h"
-typedef int (BufferedCloseFunc)(void *opaque);
-
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
- size_t xfer_limit,
- BufferedCloseFunc *close);
+ size_t xfer_limit);
#endif
diff --git a/migration.c b/migration.c
index 30def68f1d..f647a3fccb 100644
--- a/migration.c
+++ b/migration.c
@@ -392,10 +392,8 @@ void migrate_fd_wait_for_unfreeze(MigrationState *s)
}
}
-static int migrate_fd_close(void *opaque)
+int migrate_fd_close(MigrationState *s)
{
- MigrationState *s = opaque;
-
qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
return s->close(s);
}
@@ -431,9 +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,
- migrate_fd_close);
+ s->file = qemu_fopen_ops_buffered(s, s->bandwidth_limit);
DPRINTF("beginning savevm\n");
ret = qemu_savevm_state_begin(s->file, &s->params);
diff --git a/migration.h b/migration.h
index d6341d66a3..ec022d604f 100644
--- a/migration.h
+++ b/migration.h
@@ -82,6 +82,7 @@ ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data,
size_t size);
void migrate_fd_put_ready(MigrationState *s);
void migrate_fd_wait_for_unfreeze(MigrationState *s);
+int migrate_fd_close(MigrationState *s);
void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify);