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

migration: Fold MigrationState into FdMigrationState

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2010-05-11 15:51:36 +02:00
parent dc7acc61b6
commit 3f77fc557e
6 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
migration-exec.c
View File

@ -92,12 +92,12 @@ FdMigrationState *exec_start_outgoing_migration(Monitor *mon,
s->close = exec_close;
s->get_error = file_errno;
s->write = file_write;
s->mig_state.cancel = migrate_fd_cancel;
s->mig_state.get_status = migrate_fd_get_status;
s->mig_state.release = migrate_fd_release;
s->cancel = migrate_fd_cancel;
s->get_status = migrate_fd_get_status;
s->release = migrate_fd_release;
s->mig_state.blk = blk;
s->mig_state.shared = inc;
s->blk = blk;
s->shared = inc;
s->state = MIG_STATE_ACTIVE;
s->mon = NULL;

10
migration-fd.c
View File

@ -75,12 +75,12 @@ FdMigrationState *fd_start_outgoing_migration(Monitor *mon,
s->get_error = fd_errno;
s->write = fd_write;
s->close = fd_close;
s->mig_state.cancel = migrate_fd_cancel;
s->mig_state.get_status = migrate_fd_get_status;
s->mig_state.release = migrate_fd_release;
s->cancel = migrate_fd_cancel;
s->get_status = migrate_fd_get_status;
s->release = migrate_fd_release;
s->mig_state.blk = blk;
s->mig_state.shared = inc;
s->blk = blk;
s->shared = inc;
s->state = MIG_STATE_ACTIVE;
s->mon = NULL;

10
migration-tcp.c
View File

@ -94,12 +94,12 @@ FdMigrationState *tcp_start_outgoing_migration(Monitor *mon,
s->get_error = socket_errno;
s->write = socket_write;
s->close = tcp_close;
s->mig_state.cancel = migrate_fd_cancel;
s->mig_state.get_status = migrate_fd_get_status;
s->mig_state.release = migrate_fd_release;
s->cancel = migrate_fd_cancel;
s->get_status = migrate_fd_get_status;
s->release = migrate_fd_release;
s->mig_state.blk = blk;
s->mig_state.shared = inc;
s->blk = blk;
s->shared = inc;
s->state = MIG_STATE_ACTIVE;
s->mon = NULL;

10
migration-unix.c
View File

@ -93,12 +93,12 @@ FdMigrationState *unix_start_outgoing_migration(Monitor *mon,
s->get_error = unix_errno;
s->write = unix_write;
s->close = unix_close;
s->mig_state.cancel = migrate_fd_cancel;
s->mig_state.get_status = migrate_fd_get_status;
s->mig_state.release = migrate_fd_release;
s->cancel = migrate_fd_cancel;
s->get_status = migrate_fd_get_status;
s->release = migrate_fd_release;
s->mig_state.blk = blk;
s->mig_state.shared = inc;
s->blk = blk;
s->shared = inc;
s->state = MIG_STATE_ACTIVE;
s->mon = NULL;

14
migration.c
View File

@ -87,8 +87,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
const char *uri = qdict_get_str(qdict, "uri");
if (current_migration &&
current_migration->mig_state.get_status(current_migration) ==
MIG_STATE_ACTIVE) {
current_migration->get_status(current_migration) == MIG_STATE_ACTIVE) {
monitor_printf(mon, "migration already in progress\n");
return -1;
}
@ -122,7 +121,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
}
if (current_migration) {
current_migration->mig_state.release(current_migration);
current_migration->release(current_migration);
}
current_migration = s;
@ -134,8 +133,8 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
FdMigrationState *s = current_migration;
if (s && s->mig_state.get_status(s) == MIG_STATE_ACTIVE) {
s->mig_state.cancel(s);
if (s && s->get_status(s) == MIG_STATE_ACTIVE) {
s->cancel(s);
}
return 0;
}
@ -231,7 +230,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
QDict *qdict;
if (current_migration) {
MigrationState *s = &current_migration->mig_state;
FdMigrationState *s = current_migration;
switch (s->get_status(current_migration)) {
case MIG_STATE_ACTIVE:
@ -355,8 +354,7 @@ void migrate_fd_connect(FdMigrationState *s)
migrate_fd_close);
DPRINTF("beginning savevm\n");
ret = qemu_savevm_state_begin(s->mon, s->file, s->mig_state.blk,
s->mig_state.shared);
ret = qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shared);
if (ret < 0) {
DPRINTF("failed, %d\n", ret);
migrate_fd_error(s);

23
migration.h
View File

@ -23,23 +23,10 @@
#define MIG_STATE_CANCELLED 1
#define MIG_STATE_ACTIVE 2
typedef struct MigrationState MigrationState;
typedef struct FdMigrationState FdMigrationState;
struct MigrationState
{
/* FIXME: add more accessors to print migration info */
void (*cancel)(FdMigrationState *s);
int (*get_status)(FdMigrationState *s);
void (*release)(FdMigrationState *s);
int blk;
int shared;
};
struct FdMigrationState
{
MigrationState mig_state;
int64_t bandwidth_limit;
QEMUFile *file;
int fd;
@ -48,7 +35,12 @@ struct FdMigrationState
int (*get_error)(struct FdMigrationState*);
int (*close)(struct FdMigrationState*);
int (*write)(struct FdMigrationState*, const void *, size_t);
void (*cancel)(FdMigrationState *s);
int (*get_status)(FdMigrationState *s);
void (*release)(FdMigrationState *s);
void *opaque;
int blk;
int shared;
};
void process_incoming_migration(QEMUFile *f);
@ -130,11 +122,6 @@ void migrate_fd_wait_for_unfreeze(void *opaque);
int migrate_fd_close(void *opaque);
static inline FdMigrationState *migrate_to_fms(MigrationState *mig_state)
{
return container_of(mig_state, FdMigrationState, mig_state);
}
void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify);
int get_migration_state(void);