ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: make qemu_fopen_ops_buffered() return void 

We want the file assignment to happen before the thread is created to
avoid locking, so we just do it before creating the thread.

Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
This commit is contained in:
Juan Quintela 2012-07-23 02:13:23 +02:00
parent c09f4cb2b3
commit edfa1af52f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
buffered_file.c
View File

@ -32,7 +32,6 @@ typedef struct QEMUFileBuffered
size_t buffer_size; size_t buffer_size;
size_t buffer_capacity; size_t buffer_capacity;
QemuThread thread; QemuThread thread;
bool complete;
} QEMUFileBuffered; } QEMUFileBuffered;
#ifdef DEBUG_BUFFERED_FILE #ifdef DEBUG_BUFFERED_FILE
@ -162,7 +161,7 @@ static int buffered_close(void *opaque)
ret = ret2; ret = ret2;
} }
ret = migrate_fd_close(s->migration_state); ret = migrate_fd_close(s->migration_state);
s->complete = true; s->migration_state->complete = true;
return ret; return ret;
} }
@ -231,7 +230,7 @@ static void *buffered_file_thread(void *opaque)
while (true) { while (true) {
int64_t current_time = qemu_get_clock_ms(rt_clock); int64_t current_time = qemu_get_clock_ms(rt_clock);
if (s->complete) { if (s->migration_state->complete) {
break; break;
} }
if (s->freeze_output) { if (s->freeze_output) {
@ -263,7 +262,7 @@ static const QEMUFileOps buffered_file_ops = {
.set_rate_limit = buffered_set_rate_limit, .set_rate_limit = buffered_set_rate_limit,
}; };
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state) void qemu_fopen_ops_buffered(MigrationState *migration_state)
{ {
QEMUFileBuffered *s; QEMUFileBuffered *s;
@ -271,12 +270,12 @@ QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state)
s->migration_state = migration_state; s->migration_state = migration_state;
s->xfer_limit = migration_state->bandwidth_limit / 10; s->xfer_limit = migration_state->bandwidth_limit / 10;
s->complete = false; s->migration_state->complete = false;
s->file = qemu_fopen_ops(s, &buffered_file_ops); s->file = qemu_fopen_ops(s, &buffered_file_ops);
migration_state->file = s->file;
qemu_thread_create(&s->thread, buffered_file_thread, s, qemu_thread_create(&s->thread, buffered_file_thread, s,
QEMU_THREAD_DETACHED); QEMU_THREAD_DETACHED);
return s->file;
} }

2
buffered_file.h
View File

@ -17,6 +17,6 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "migration/migration.h" #include "migration/migration.h"
QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state); void qemu_fopen_ops_buffered(MigrationState *migration_state);
#endif #endif

1
include/migration/migration.h
View File

@ -45,6 +45,7 @@ struct MigrationState
int64_t dirty_pages_rate; int64_t dirty_pages_rate;
bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX];
int64_t xbzrle_cache_size; int64_t xbzrle_cache_size;
bool complete;
}; };
void process_incoming_migration(QEMUFile *f); void process_incoming_migration(QEMUFile *f);

2
migration.c
View File

@ -448,7 +448,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); qemu_fopen_ops_buffered(s);
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);