ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buffered_file: rename opaque to migration_state 

Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Juan Quintela 2012-07-20 13:04:42 +02:00
parent 2dddf6f413
commit 8e92c9e24f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buffered_file.c
View File

@ -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 *opaque; void *migration_state;
QEMUFile *file; QEMUFile *file;
int freeze_output; int freeze_output;
size_t bytes_xfer; size_t bytes_xfer;
@ -78,7 +78,7 @@ static void buffered_flush(QEMUFileBuffered *s)
while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) { while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) {
ssize_t ret; ssize_t ret;
ret = s->put_buffer(s->opaque, s->buffer + offset, ret = s->put_buffer(s->migration_state, s->buffer + offset,
s->buffer_size - offset); s->buffer_size - offset);
if (ret == -EAGAIN) { if (ret == -EAGAIN) {
DPRINTF("backend not ready, freezing\n"); DPRINTF("backend not ready, freezing\n");
@ -129,7 +129,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in
DPRINTF("file is ready\n"); DPRINTF("file is ready\n");
if (!s->freeze_output && s->bytes_xfer < s->xfer_limit) { if (!s->freeze_output && s->bytes_xfer < s->xfer_limit) {
DPRINTF("notifying client\n"); DPRINTF("notifying client\n");
s->put_ready(s->opaque); s->put_ready(s->migration_state);
} }
} }
@ -147,10 +147,10 @@ static int buffered_close(void *opaque)
while (!qemu_file_get_error(s->file) && s->buffer_size) { while (!qemu_file_get_error(s->file) && s->buffer_size) {
buffered_flush(s); buffered_flush(s);
if (s->freeze_output) if (s->freeze_output)
s->wait_for_unfreeze(s->opaque); s->wait_for_unfreeze(s->migration_state);
} }
ret = s->close(s->opaque); ret = s->close(s->migration_state);
qemu_del_timer(s->timer); qemu_del_timer(s->timer);
qemu_free_timer(s->timer); qemu_free_timer(s->timer);
@ -237,7 +237,7 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque,
s = g_malloc0(sizeof(*s)); s = g_malloc0(sizeof(*s));
s->opaque = opaque; s->migration_state = opaque;
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;