[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/28] migration: Remove migration cancel() callback
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 14/28] migration: Remove migration cancel() callback |
Date: |
Wed, 23 Feb 2011 22:47:23 +0100 |
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 c1732e5..dba9034 100644
--- a/migration.c
+++ b/migration.c
@@ -132,12 +132,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;
}
@@ -478,7 +478,6 @@ static MigrationState *migrate_create_state(Monitor *mon,
{
MigrationState *s = qemu_mallocz(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 7016710..347e7e8 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 *buffer, size_t size);
- void (*cancel)(MigrationState *s);
void *opaque;
int blk;
int shared;
--
1.7.4
- [Qemu-devel] [PATCH v2 00/28] Refactor and cleanup migration code, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 01/28] migration: Make *start_outgoing_migration return FdMigrationState, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 02/28] migration: Use FdMigrationState instead of MigrationState when possible, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 04/28] migration: Rename FdMigrationState MigrationState, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 10/28] migration: Refactor and simplify error checking in migrate_fd_put_ready, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 09/28] migration: Introduce MIG_STATE_NONE, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 12/28] migration: Our release callback was just free, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 13/28] migration: Remove get_status() accessor, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 14/28] migration: Remove migration cancel() callback,
Juan Quintela <=
- [Qemu-devel] [PATCH 08/28] migration: Check that migration is active before cancel it, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 06/28] migration: Make all posible migration functions static, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 03/28] migration: Fold MigrationState into FdMigrationState, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 16/28] migration: use global variable directly, Juan Quintela, 2011/02/23
- Re: [Qemu-devel] [PATCH 16/28] migration: use global variable directly, Anthony Liguori, 2011/02/23
- [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Juan Quintela, 2011/02/23
- [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Anthony Liguori, 2011/02/23
- [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Juan Quintela, 2011/02/23
- Re: [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Markus Armbruster, 2011/02/24
- [Qemu-devel] Re: [PATCH 16/28] migration: use global variable directly, Paolo Bonzini, 2011/02/24