提交 c7a8f0cd 编写于 作者: J Juan Quintela

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: NJuan Quintela <quintela@redhat.com>
Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 8e92c9e2
...@@ -27,7 +27,7 @@ typedef struct QEMUFileBuffered ...@@ -27,7 +27,7 @@ typedef struct QEMUFileBuffered
BufferedPutReadyFunc *put_ready; BufferedPutReadyFunc *put_ready;
BufferedWaitForUnfreezeFunc *wait_for_unfreeze; BufferedWaitForUnfreezeFunc *wait_for_unfreeze;
BufferedCloseFunc *close; BufferedCloseFunc *close;
void *migration_state; MigrationState *migration_state;
QEMUFile *file; QEMUFile *file;
int freeze_output; int freeze_output;
size_t bytes_xfer; size_t bytes_xfer;
...@@ -226,7 +226,7 @@ static void buffered_rate_tick(void *opaque) ...@@ -226,7 +226,7 @@ static void buffered_rate_tick(void *opaque)
buffered_put_buffer(s, NULL, 0, 0); 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, size_t bytes_per_sec,
BufferedPutFunc *put_buffer, BufferedPutFunc *put_buffer,
BufferedPutReadyFunc *put_ready, BufferedPutReadyFunc *put_ready,
...@@ -237,7 +237,7 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque, ...@@ -237,7 +237,7 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque,
s = g_malloc0(sizeof(*s)); s = g_malloc0(sizeof(*s));
s->migration_state = opaque; s->migration_state = migration_state;
s->xfer_limit = bytes_per_sec / 10; s->xfer_limit = bytes_per_sec / 10;
s->put_buffer = put_buffer; s->put_buffer = put_buffer;
s->put_ready = put_ready; s->put_ready = put_ready;
......
...@@ -15,13 +15,15 @@ ...@@ -15,13 +15,15 @@
#define QEMU_BUFFERED_FILE_H #define QEMU_BUFFERED_FILE_H
#include "hw/hw.h" #include "hw/hw.h"
#include "migration.h"
typedef ssize_t (BufferedPutFunc)(void *opaque, const void *data, size_t size); typedef ssize_t (BufferedPutFunc)(void *opaque, const void *data, size_t size);
typedef void (BufferedPutReadyFunc)(void *opaque); typedef void (BufferedPutReadyFunc)(void *opaque);
typedef void (BufferedWaitForUnfreezeFunc)(void *opaque); typedef void (BufferedWaitForUnfreezeFunc)(void *opaque);
typedef int (BufferedCloseFunc)(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, BufferedPutFunc *put_buffer,
BufferedPutReadyFunc *put_ready, BufferedPutReadyFunc *put_ready,
BufferedWaitForUnfreezeFunc *wait_for_unfreeze, BufferedWaitForUnfreezeFunc *wait_for_unfreeze,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册