[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 26/36] migration: Remove get_status() accessor
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 26/36] migration: Remove get_status() accessor |
Date: |
Tue, 11 Oct 2011 12:00:46 +0200 |
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 <address@hidden>
---
migration.c | 16 +++++-----------
migration.h | 1 -
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/migration.c b/migration.c
index 689464d..0b7ffa7 100644
--- a/migration.c
+++ b/migration.c
@@ -91,7 +91,7 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject
**ret_data)
int ret;
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");
return -1;
}
@@ -136,7 +136,7 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict,
QObject **ret_data)
{
MigrationState *s = current_migration;
- if (s && s->get_status(s) == MIG_STATE_ACTIVE) {
+ if (s && s->state == MIG_STATE_ACTIVE) {
s->cancel(s);
}
return 0;
@@ -235,7 +235,7 @@ void do_info_migrate(Monitor *mon, QObject **ret_data)
if (current_migration) {
MigrationState *s = current_migration;
- switch (s->get_status(current_migration)) {
+ switch (s->state) {
case MIG_STATE_SETUP:
/* no migration has happened ever */
break;
@@ -386,7 +386,7 @@ static void migrate_fd_put_ready(void *opaque)
} else {
migrate_fd_completed(s);
}
- if (s->get_status(s) != MIG_STATE_COMPLETED) {
+ if (s->state != MIG_STATE_COMPLETED) {
if (old_vm_running) {
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)
{
if (s->state != MIG_STATE_ACTIVE)
@@ -460,7 +455,7 @@ void remove_migration_state_change_notifier(Notifier
*notify)
int get_migration_state(void)
{
if (current_migration) {
- return migrate_fd_get_status(current_migration);
+ return current_migration->state;
} else {
return MIG_STATE_ERROR;
}
@@ -494,7 +489,6 @@ static MigrationState *migrate_new(Monitor *mon, int64_t
bandwidth_limit,
MigrationState *s = g_malloc0(sizeof(*s));
s->cancel = migrate_fd_cancel;
- s->get_status = migrate_fd_get_status;
s->blk = blk;
s->shared = inc;
s->mon = NULL;
diff --git a/migration.h b/migration.h
index 1cdb539..b634994 100644
--- a/migration.h
+++ b/migration.h
@@ -39,7 +39,6 @@ struct MigrationState
int (*close)(MigrationState *s);
int (*write)(MigrationState *s, const void *buff, size_t size);
void (*cancel)(MigrationState *s);
- int (*get_status)(MigrationState *s);
void *opaque;
int blk;
int shared;
--
1.7.6.4
- [Qemu-devel] [PATCH 30/36] migration: Use bandwidth_limit directly, (continued)
- [Qemu-devel] [PATCH 30/36] migration: Use bandwidth_limit directly, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 29/36] migration: create accessor for current_migration, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 31/36] migration: Pass MigrationState in migration notifiers, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 34/36] migration: Don't use callback on file defining it, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 35/36] migration: propagate error correctly, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 36/36] migration: make migration-{tcp, unix} consistent, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 17/36] migration: Fold MigrationState into FdMigrationState, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 18/36] migration: Rename FdMigrationState MigrationState, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 10/36] migration: set error if select return one error, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 26/36] migration: Remove get_status() accessor,
Juan Quintela <=
- [Qemu-devel] [PATCH 27/36] migration: Remove migration cancel() callback, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 16/36] migration: Use FdMigrationState instead of MigrationState when possible, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 09/36] migration: don't "write" when migration is not active, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 33/36] migration: Make state definitions local, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 32/36] migration: Export a function that tells if the migration has finished correctly, Juan Quintela, 2011/10/11
- [Qemu-devel] [PATCH 25/36] migration: Our release callback was just free, Juan Quintela, 2011/10/11