diff options
| author | Juan Quintela <quintela@redhat.com> | 2012-07-20 13:07:17 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2012-10-17 18:34:58 +0200 |
| commit | c7a8f0cdd25ed552e6dba124877bd3364054c55c (patch) | |
| tree | 25dd542604104aefcdd9c4e8fd9a9720ac8f9510 | |
| parent | 8e92c9e24f8c4edd7976aca82abf90e9a12667b4 (diff) | |
buffered_file: opaque is MigrationState
It always have that type, just change it.
We will remove buffered file later on the migration thread series.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | buffered_file.c | 6 | ||||
| -rw-r--r-- | buffered_file.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/buffered_file.c b/buffered_file.c index 33b700be50..59d952df0a 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -27,7 +27,7 @@ typedef struct QEMUFileBuffered BufferedPutReadyFunc *put_ready; BufferedWaitForUnfreezeFunc *wait_for_unfreeze; BufferedCloseFunc *close; - void *migration_state; + MigrationState *migration_state; QEMUFile *file; int freeze_output; size_t bytes_xfer; @@ -226,7 +226,7 @@ static void buffered_rate_tick(void *opaque) buffered_put_buffer(s, NULL, 0, 0); } -QEMUFile *qemu_fopen_ops_buffered(void *opaque, +QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, size_t bytes_per_sec, BufferedPutFunc *put_buffer, BufferedPutReadyFunc *put_ready, @@ -237,7 +237,7 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque, s = g_malloc0(sizeof(*s)); - s->migration_state = opaque; + s->migration_state = migration_state; s->xfer_limit = bytes_per_sec / 10; s->put_buffer = put_buffer; s->put_ready = put_ready; diff --git a/buffered_file.h b/buffered_file.h index 98d358baea..39f7fa005d 100644 --- a/buffered_file.h +++ b/buffered_file.h @@ -15,13 +15,15 @@ #define QEMU_BUFFERED_FILE_H #include "hw/hw.h" +#include "migration.h" typedef ssize_t (BufferedPutFunc)(void *opaque, const void *data, size_t size); typedef void (BufferedPutReadyFunc)(void *opaque); typedef void (BufferedWaitForUnfreezeFunc)(void *opaque); typedef int (BufferedCloseFunc)(void *opaque); -QEMUFile *qemu_fopen_ops_buffered(void *opaque, size_t xfer_limit, +QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, + size_t xfer_limit, BufferedPutFunc *put_buffer, BufferedPutReadyFunc *put_ready, BufferedWaitForUnfreezeFunc *wait_for_unfreeze, |