mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buffered_file: unfold migrate_fd_close

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:19:36 +02:00
parent 749f7909d9
commit 11c7674129
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buffered_file.c
View File

@ -23,7 +23,6 @@
typedef struct QEMUFileBuffered typedef struct QEMUFileBuffered
{ {
BufferedCloseFunc *close;
MigrationState *migration_state; MigrationState *migration_state;
QEMUFile *file; QEMUFile *file;
int freeze_output; int freeze_output;
@ -147,7 +146,7 @@ static int buffered_close(void *opaque)
migrate_fd_wait_for_unfreeze(s->migration_state); 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_del_timer(s->timer);
qemu_free_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, QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state,
size_t bytes_per_sec, size_t bytes_per_sec)
BufferedCloseFunc *close)
{ {
QEMUFileBuffered *s; QEMUFileBuffered *s;
@ -233,7 +231,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->close = close;
s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL,
buffered_close, buffered_rate_limit, buffered_close, buffered_rate_limit,

5
buffered_file.h
View File

@ -17,10 +17,7 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "migration.h" #include "migration.h"
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);
BufferedCloseFunc *close);
#endif #endif

8
migration.c
View File

@ -392,10 +392,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); qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
return s->close(s); return s->close(s);
} }
@ -431,9 +429,7 @@ void migrate_fd_connect(MigrationState *s)
int ret; int ret;
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_close);
DPRINTF("beginning savevm\n"); DPRINTF("beginning savevm\n");
ret = qemu_savevm_state_begin(s->file, &s->params); ret = qemu_savevm_state_begin(s->file, &s->params);

1
migration.h
View File

@ -82,6 +82,7 @@ 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 migrate_fd_wait_for_unfreeze(MigrationState *s);
int migrate_fd_close(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);