[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/41] buffered_file: unfold migrate_fd_wait_for_unf
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 21/41] buffered_file: unfold migrate_fd_wait_for_unfreeze |
Date: |
Tue, 2 Oct 2012 13:33:16 +0200 |
We only used it once, just remove the callback indirection.
Signed-off-by: Juan Quintela <address@hidden>
---
buffered_file.c | 5 +----
buffered_file.h | 2 --
migration.c | 4 +---
migration.h | 1 +
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index 4c6a797..d257496 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -23,7 +23,6 @@
typedef struct QEMUFileBuffered
{
- BufferedWaitForUnfreezeFunc *wait_for_unfreeze;
BufferedCloseFunc *close;
MigrationState *migration_state;
QEMUFile *file;
@@ -145,7 +144,7 @@ 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->migration_state);
+ migrate_fd_wait_for_unfreeze(s->migration_state);
}
ret = s->close(s->migration_state);
@@ -226,7 +225,6 @@ static void buffered_rate_tick(void *opaque)
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t bytes_per_sec,
- BufferedWaitForUnfreezeFunc
*wait_for_unfreeze,
BufferedCloseFunc *close)
{
QEMUFileBuffered *s;
@@ -235,7 +233,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState
*migration_state,
s->migration_state = migration_state;
s->xfer_limit = bytes_per_sec / 10;
- s->wait_for_unfreeze = wait_for_unfreeze;
s->close = close;
s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL,
diff --git a/buffered_file.h b/buffered_file.h
index dd239b3..926e5c6 100644
--- a/buffered_file.h
+++ b/buffered_file.h
@@ -17,12 +17,10 @@
#include "hw/hw.h"
#include "migration.h"
-typedef void (BufferedWaitForUnfreezeFunc)(void *opaque);
typedef int (BufferedCloseFunc)(void *opaque);
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t xfer_limit,
- BufferedWaitForUnfreezeFunc
*wait_for_unfreeze,
BufferedCloseFunc *close);
#endif
diff --git a/migration.c b/migration.c
index 051b1b5..30def68 100644
--- a/migration.c
+++ b/migration.c
@@ -370,9 +370,8 @@ static void migrate_fd_cancel(MigrationState *s)
migrate_fd_cleanup(s);
}
-static void migrate_fd_wait_for_unfreeze(void *opaque)
+void migrate_fd_wait_for_unfreeze(MigrationState *s)
{
- MigrationState *s = opaque;
int ret;
DPRINTF("wait for unfreeze\n");
@@ -434,7 +433,6 @@ void migrate_fd_connect(MigrationState *s)
s->state = MIG_STATE_ACTIVE;
s->file = qemu_fopen_ops_buffered(s,
s->bandwidth_limit,
- migrate_fd_wait_for_unfreeze,
migrate_fd_close);
DPRINTF("beginning savevm\n");
diff --git a/migration.h b/migration.h
index 031c2ab..d6341d6 100644
--- a/migration.h
+++ b/migration.h
@@ -81,6 +81,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 migrate_fd_wait_for_unfreeze(MigrationState *s);
void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify);
--
1.7.11.4
- [Qemu-devel] [PATCH 10/41] ram: Introduce migration_bitmap_test_and_reset_dirty(), (continued)
- [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, 2012/10/02
- [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 <=
- [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
- [Qemu-devel] [PATCH 30/41] savevm: make qemu_fflush() return an error code, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 29/41] savevm: Remove qemu_fseek(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 28/41] virtio-net: use qemu_get_buffer() in a temp buffer, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 33/41] savevm: make qemu_fill_buffer() be consistent, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 36/41] block-migration: make flush_blks() return errors, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 37/41] block-migration: Switch meaning of return value, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 38/41] block-migration: handle errors with the return codes correctly, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 40/41] savevm: make qemu_file_put_notify() return errors, Juan Quintela, 2012/10/02