mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: Remove get_status() accessor 

It is only used inside migration.c, and fields on that struct are
accessed all around the place on that file.

Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2010-05-11 23:28:53 +02:00
parent 92920cd782
commit 48a2f4d6c5
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
migration.c
View File

@ -91,7 +91,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
int ret; int ret;
if (current_migration && if (current_migration &&
current_migration->get_status(current_migration) == MIG_STATE_ACTIVE) { current_migration->state == MIG_STATE_ACTIVE) {
monitor_printf(mon, "migration already in progress\n"); monitor_printf(mon, "migration already in progress\n");
return -1; return -1;
} }
@ -136,7 +136,7 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
{ {
MigrationState *s = current_migration; MigrationState *s = current_migration;
if (s && s->get_status(s) == MIG_STATE_ACTIVE) { if (s && s->state == MIG_STATE_ACTIVE) {
s->cancel(s); s->cancel(s);
} }
return 0; return 0;
@ -235,7 +235,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
if (current_migration) { if (current_migration) {
MigrationState *s = current_migration; MigrationState *s = current_migration;
switch (s->get_status(current_migration)) { switch (s->state) {
case MIG_STATE_SETUP: case MIG_STATE_SETUP:
/* no migration has happened ever */ /* no migration has happened ever */
break; break;
@ -386,7 +386,7 @@ static void migrate_fd_put_ready(void *opaque)
} else { } else {
migrate_fd_completed(s); migrate_fd_completed(s);
} }
if (s->get_status(s) != MIG_STATE_COMPLETED) { if (s->state != MIG_STATE_COMPLETED) {
if (old_vm_running) { if (old_vm_running) {
vm_start(); vm_start();
} }
@ -394,11 +394,6 @@ static void migrate_fd_put_ready(void *opaque)
} }
} }
static int migrate_fd_get_status(MigrationState *s)
{
return s->state;
}
static void migrate_fd_cancel(MigrationState *s) static void migrate_fd_cancel(MigrationState *s)
{ {
if (s->state != MIG_STATE_ACTIVE) if (s->state != MIG_STATE_ACTIVE)
@ -460,7 +455,7 @@ void remove_migration_state_change_notifier(Notifier *notify)
int get_migration_state(void) int get_migration_state(void)
{ {
if (current_migration) { if (current_migration) {
return migrate_fd_get_status(current_migration); return current_migration->state;
} else { } else {
return MIG_STATE_ERROR; return MIG_STATE_ERROR;
} }
@ -494,7 +489,6 @@ static MigrationState *migrate_new(Monitor *mon, int64_t bandwidth_limit,
MigrationState *s = g_malloc0(sizeof(*s)); MigrationState *s = g_malloc0(sizeof(*s));
s->cancel = migrate_fd_cancel; s->cancel = migrate_fd_cancel;
s->get_status = migrate_fd_get_status;
s->blk = blk; s->blk = blk;
s->shared = inc; s->shared = inc;
s->mon = NULL; s->mon = NULL;

1
migration.h
View File

@ -39,7 +39,6 @@ struct MigrationState
int (*close)(MigrationState *s); int (*close)(MigrationState *s);
int (*write)(MigrationState *s, const void *buff, size_t size); int (*write)(MigrationState *s, const void *buff, size_t size);
void (*cancel)(MigrationState *s); void (*cancel)(MigrationState *s);
int (*get_status)(MigrationState *s);
void *opaque; void *opaque;
int blk; int blk;
int shared; int shared;