[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/41] buffered_file: rename opaque to migration_sta
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 17/41] buffered_file: rename opaque to migration_state |
Date: |
Tue, 2 Oct 2012 13:33:12 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
buffered_file.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index 7155800..33b700b 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 *opaque;
+ void *migration_state;
QEMUFile *file;
int freeze_output;
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) {
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);
if (ret == -EAGAIN) {
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");
if (!s->freeze_output && s->bytes_xfer < s->xfer_limit) {
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) {
buffered_flush(s);
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_free_timer(s->timer);
@@ -237,7 +237,7 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque,
s = g_malloc0(sizeof(*s));
- s->opaque = opaque;
+ s->migration_state = opaque;
s->xfer_limit = bytes_per_sec / 10;
s->put_buffer = put_buffer;
s->put_ready = put_ready;
--
1.7.11.4
- [Qemu-devel] [PATCH 05/41] migration: rename expected_time to expected_downtime, (continued)
- [Qemu-devel] [PATCH 05/41] migration: rename expected_time to expected_downtime, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 07/41] migration: print expected downtime in info migrate, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 08/41] savevm: Factorize ram globals reset in its own function, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 14/41] Separate migration bitmap, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 09/41] ram: introduce migration_bitmap_set_dirty(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 11/41] ram: Export last_ram_offset(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 06/41] migration: export migrate_get_current(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 10/41] ram: Introduce migration_bitmap_test_and_reset_dirty(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 12/41] ram: introduce migration_bitmap_sync(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 17/41] buffered_file: rename opaque to migration_state,
Juan Quintela <=
- [Qemu-devel] [PATCH 13/41] ram: create trace event for migration sync bitmap, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 15/41] migration: Add dirty_pages_rate to query migrate output, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 20/41] buffered_file: unfold migrate_fd_put_ready, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 18/41] buffered_file: opaque is MigrationState, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 16/41] BufferedFile: append, then flush, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 19/41] buffered_file: unfold migrate_fd_put_buffer, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 21/41] buffered_file: unfold migrate_fd_wait_for_unfreeze, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 26/41] migration: make migrate_fd_wait_for_unfreeze() return errors, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 22/41] buffered_file: unfold migrate_fd_close, Juan Quintela, 2012/10/02