[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/27] buffered_file: unfold migrate_fd_put_buffer
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 17/27] buffered_file: unfold migrate_fd_put_buffer |
Date: |
Tue, 24 Jul 2012 20:36:42 +0200 |
We only used it once, just remove the callback indirection.
Signed-off-by: Juan Quintela <address@hidden>
---
buffered_file.c | 7 ++-----
buffered_file.h | 5 +----
migration.c | 8 ++------
migration.h | 1 +
4 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index d257496..4fca774 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -23,7 +23,6 @@
typedef struct QEMUFileBuffered
{
- BufferedCloseFunc *close;
MigrationState *migration_state;
QEMUFile *file;
int freeze_output;
@@ -147,7 +146,7 @@ static int buffered_close(void *opaque)
migrate_fd_wait_for_unfreeze(s->migration_state);
}
- ret = s->close(s->migration_state);
+ ret = migrate_fd_close(s->migration_state);
qemu_del_timer(s->timer);
qemu_free_timer(s->timer);
@@ -224,8 +223,7 @@ static void buffered_rate_tick(void *opaque)
}
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
- size_t bytes_per_sec,
- BufferedCloseFunc *close)
+ size_t bytes_per_sec)
{
QEMUFileBuffered *s;
@@ -233,7 +231,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState
*migration_state,
s->migration_state = migration_state;
s->xfer_limit = bytes_per_sec / 10;
- s->close = close;
s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL,
buffered_close, buffered_rate_limit,
diff --git a/buffered_file.h b/buffered_file.h
index 926e5c6..8a38754 100644
--- a/buffered_file.h
+++ b/buffered_file.h
@@ -17,10 +17,7 @@
#include "hw/hw.h"
#include "migration.h"
-typedef int (BufferedCloseFunc)(void *opaque);
-
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
- size_t xfer_limit,
- BufferedCloseFunc *close);
+ size_t xfer_limit);
#endif
diff --git a/migration.c b/migration.c
index 3561b16..c639c99 100644
--- a/migration.c
+++ b/migration.c
@@ -396,10 +396,8 @@ void migrate_fd_wait_for_unfreeze(MigrationState *s)
}
}
-static int migrate_fd_close(void *opaque)
+int migrate_fd_close(MigrationState *s)
{
- MigrationState *s = opaque;
-
qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
return s->close(s);
}
@@ -435,9 +433,7 @@ void migrate_fd_connect(MigrationState *s)
int ret;
s->state = MIG_STATE_ACTIVE;
- s->file = qemu_fopen_ops_buffered(s,
- s->bandwidth_limit,
- migrate_fd_close);
+ s->file = qemu_fopen_ops_buffered(s, s->bandwidth_limit);
DPRINTF("beginning savevm\n");
ret = qemu_savevm_state_begin(s->file, &s->params);
diff --git a/migration.h b/migration.h
index 62fc4f3..f3a684a 100644
--- a/migration.h
+++ b/migration.h
@@ -79,6 +79,7 @@ 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);
+int migrate_fd_close(MigrationState *s);
void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify);
--
1.7.10.4
- [Qemu-devel] [PATCH 05/27] protect the ramlist with a separate mutex, (continued)
- [Qemu-devel] [PATCH 05/27] protect the ramlist with a separate mutex, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 03/27] savevm: Factorize ram globals reset in its own function, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 08/27] ram: Export last_ram_offset(), Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 09/27] ram: introduce migration_bitmap_sync(), Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 12/27] buffered_file: rename opaque to migration_state, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 10/27] Separate migration bitmap, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 07/27] ram: Introduce migration_bitmap_test_and_reset_dirty(), Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 11/27] BufferedFile: append, then flush, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 17/27] buffered_file: unfold migrate_fd_put_buffer,
Juan Quintela <=
- [Qemu-devel] [PATCH 16/27] buffered_file: unfold migrate_fd_put_buffer, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 13/27] buffered_file: opaque is MigrationState, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 22/27] migration: make writes blocking, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 21/27] migration: stop all cpus correctly, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 20/27] migration: make qemu_fopen_ops_buffered() return void, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 19/27] buffered_file: Move from using a timer to use a thread, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 24/27] migration: take finer locking, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 23/27] migration: remove unfreeze logic, Juan Quintela, 2012/07/24
- [Qemu-devel] [PATCH 14/27] buffered_file: unfold migrate_fd_put_buffer, Juan Quintela, 2012/07/24