[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/23] migration: Remove migration cancel() callback
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 13/23] migration: Remove migration cancel() callback |
Date: |
Fri, 23 Sep 2011 14:57:02 +0200 |
It is used only in one place
Signed-off-by: Juan Quintela <address@hidden>
---
migration.c | 9 ++++-----
migration.h | 1 -
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/migration.c b/migration.c
index 7cb0404..9bc7ffa 100644
--- a/migration.c
+++ b/migration.c
@@ -133,12 +133,12 @@ free_migrate_state:
return -1;
}
+static void migrate_fd_cancel(MigrationState *s);
+
int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
- MigrationState *s = current_migration;
-
- if (s && s->state == MIG_STATE_ACTIVE) {
- s->cancel(s);
+ if (current_migration) {
+ migrate_fd_cancel(current_migration);
}
return 0;
}
@@ -490,7 +490,6 @@ static MigrationState *migrate_create_state(Monitor *mon,
{
MigrationState *s = g_malloc0(sizeof(*s));
- s->cancel = migrate_fd_cancel;
s->blk = blk;
s->shared = inc;
s->mon = NULL;
diff --git a/migration.h b/migration.h
index 6d8d1ad..f1a7452 100644
--- a/migration.h
+++ b/migration.h
@@ -38,7 +38,6 @@ struct MigrationState
int (*get_error)(MigrationState *s);
int (*close)(MigrationState *s);
int (*write)(MigrationState *s, const void *buff, size_t size);
- void (*cancel)(MigrationState *s);
void *opaque;
int blk;
int shared;
--
1.7.6.2
- [Qemu-devel] [PATCH 04/23] migration: Rename FdMigrationState MigrationState, (continued)
- [Qemu-devel] [PATCH 04/23] migration: Rename FdMigrationState MigrationState, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 08/23] migration: Introduce MIG_STATE_NONE, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 07/23] migration: move migrate_create_state to do_migrate, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 09/23] migration: Refactor and simplify error checking in migrate_fd_put_ready, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 06/23] migration: Make all posible migration functions static, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 05/23] migration: Refactor MigrationState creation, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 10/23] migration: Introduce migrate_fd_completed() for consistency, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 12/23] migration: Remove get_status() accessor, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 15/23] migration: use global variable directly, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 17/23] migration: make sure we always have a migration state, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 13/23] migration: Remove migration cancel() callback,
Juan Quintela <=
- [Qemu-devel] [PATCH 19/23] migration: Export a function that tells if the migration has finished correctly, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 18/23] migration: Use bandwidth_limit directly, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 14/23] migration: Move exported functions to the end of the file, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 11/23] migration: Our release callback was just free, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 16/23] migration: another case of global variable assigned to local one, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 22/23] migration: propagate error correctly, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 21/23] migration: Don't use callback on file defining it, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 23/23] migration: make migration-{tcp, unix} consistent, Juan Quintela, 2011/09/23
- [Qemu-devel] [PATCH 20/23] migration: Make state definitions local, Juan Quintela, 2011/09/23