OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

buffered_file: unfold migrate_fd_wait_for_unfreeze

Browse Source 
We only used it once, just remove the callback indirection.

Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2012-07-20 13:16:28 +02:00
parent 2c9adcb850
commit 749f7909d9
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buffered_file.c
View File

@ -23,7 +23,6 @@
typedef struct QEMUFileBuffered typedef struct QEMUFileBuffered
{ {
BufferedWaitForUnfreezeFunc *wait_for_unfreeze;
BufferedCloseFunc *close; BufferedCloseFunc *close;
MigrationState *migration_state; MigrationState *migration_state;
QEMUFile *file; QEMUFile *file;
@ -145,7 +144,7 @@ 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->migration_state); migrate_fd_wait_for_unfreeze(s->migration_state);
} }
ret = s->close(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, QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t bytes_per_sec, size_t bytes_per_sec,
BufferedWaitForUnfreezeFunc *wait_for_unfreeze,
BufferedCloseFunc *close) BufferedCloseFunc *close)
{ {
QEMUFileBuffered *s; QEMUFileBuffered *s;
@ -235,7 +233,6 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
s->migration_state = migration_state; s->migration_state = migration_state;
s->xfer_limit = bytes_per_sec / 10; s->xfer_limit = bytes_per_sec / 10;
s->wait_for_unfreeze = wait_for_unfreeze;
s->close = close; s->close = close;
s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL,

2
buffered_file.h
View File

@ -17,12 +17,10 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "migration.h" #include "migration.h"
typedef void (BufferedWaitForUnfreezeFunc)(void *opaque);
typedef int (BufferedCloseFunc)(void *opaque); typedef int (BufferedCloseFunc)(void *opaque);
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t xfer_limit, size_t xfer_limit,
BufferedWaitForUnfreezeFunc *wait_for_unfreeze,
BufferedCloseFunc *close); BufferedCloseFunc *close);
#endif #endif

4
migration.c
View File

@ -370,9 +370,8 @@ static void migrate_fd_cancel(MigrationState *s)
migrate_fd_cleanup(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; int ret;
DPRINTF("wait for unfreeze\n"); DPRINTF("wait for unfreeze\n");
@ -434,7 +433,6 @@ void migrate_fd_connect(MigrationState *s)
s->state = MIG_STATE_ACTIVE; s->state = MIG_STATE_ACTIVE;
s->file = qemu_fopen_ops_buffered(s, s->file = qemu_fopen_ops_buffered(s,
s->bandwidth_limit, s->bandwidth_limit,
migrate_fd_wait_for_unfreeze,
migrate_fd_close); migrate_fd_close);
DPRINTF("beginning savevm\n"); DPRINTF("beginning savevm\n");

1
migration.h
View File

@ -81,6 +81,7 @@ void migrate_fd_connect(MigrationState *s);
ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data,
size_t size); size_t size);
void migrate_fd_put_ready(MigrationState *s); void migrate_fd_put_ready(MigrationState *s);
void migrate_fd_wait_for_unfreeze(MigrationState *s);
void add_migration_state_change_notifier(Notifier *notify); void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify);