diff options
| author | Juan Quintela <quintela@redhat.com> | 2012-07-20 13:13:59 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2012-10-17 18:34:58 +0200 |
| commit | 2c9adcb850bba7a24caec4d666dc01deca9f7649 (patch) | |
| tree | 4ca3bc645e4ae1c5f09f5160f21d3021c1d36181 | |
| parent | c87b015bc71734db74f5bdffeda122a224c75bbb (diff) | |
| download | qemu-2c9adcb850bba7a24caec4d666dc01deca9f7649.tar.gz | |
buffered_file: unfold migrate_fd_put_ready
We only use it once, just remove the callback indirection.
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 | 2 | ||||
| -rw-r--r-- | migration.c | 4 | ||||
| -rw-r--r-- | migration.h | 1 |
4 files changed, 3 insertions, 9 deletions
diff --git a/buffered_file.c b/buffered_file.c index 702a7266b6..4c6a7976b1 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -23,7 +23,6 @@ typedef struct QEMUFileBuffered { - BufferedPutReadyFunc *put_ready; BufferedWaitForUnfreezeFunc *wait_for_unfreeze; BufferedCloseFunc *close; MigrationState *migration_state; @@ -128,7 +127,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in DPRINTF("file is ready\n"); if (!s->freeze_output && s->bytes_xfer < s->xfer_limit) { DPRINTF("notifying client\n"); - s->put_ready(s->migration_state); + migrate_fd_put_ready(s->migration_state); } } @@ -227,7 +226,6 @@ static void buffered_rate_tick(void *opaque) QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, size_t bytes_per_sec, - BufferedPutReadyFunc *put_ready, BufferedWaitForUnfreezeFunc *wait_for_unfreeze, BufferedCloseFunc *close) { @@ -237,7 +235,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, s->migration_state = migration_state; s->xfer_limit = bytes_per_sec / 10; - s->put_ready = put_ready; s->wait_for_unfreeze = wait_for_unfreeze; s->close = close; diff --git a/buffered_file.h b/buffered_file.h index ca7e62d4b3..dd239b3d02 100644 --- a/buffered_file.h +++ b/buffered_file.h @@ -17,13 +17,11 @@ #include "hw/hw.h" #include "migration.h" -typedef void (BufferedPutReadyFunc)(void *opaque); typedef void (BufferedWaitForUnfreezeFunc)(void *opaque); typedef int (BufferedCloseFunc)(void *opaque); QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, size_t xfer_limit, - BufferedPutReadyFunc *put_ready, BufferedWaitForUnfreezeFunc *wait_for_unfreeze, BufferedCloseFunc *close); diff --git a/migration.c b/migration.c index f6ee7cdb6a..051b1b56aa 100644 --- a/migration.c +++ b/migration.c @@ -318,9 +318,8 @@ ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, return ret; } -static void migrate_fd_put_ready(void *opaque) +void migrate_fd_put_ready(MigrationState *s) { - MigrationState *s = opaque; int ret; if (s->state != MIG_STATE_ACTIVE) { @@ -435,7 +434,6 @@ void migrate_fd_connect(MigrationState *s) s->state = MIG_STATE_ACTIVE; s->file = qemu_fopen_ops_buffered(s, s->bandwidth_limit, - migrate_fd_put_ready, migrate_fd_wait_for_unfreeze, migrate_fd_close); diff --git a/migration.h b/migration.h index 02d0219e86..031c2ab2ed 100644 --- a/migration.h +++ b/migration.h @@ -80,6 +80,7 @@ void migrate_fd_connect(MigrationState *s); ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, size_t size); +void migrate_fd_put_ready(MigrationState *s); void add_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify); |