Patchwork [14/28] migration: Remove migration cancel() callback

login
register
mail settings
Submitter Juan Quintela
Date Feb. 23, 2011, 9:47 p.m.
Message ID <b434ff675be7ac88f427dd374d07a71a0fa81719.1298492768.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/84272/
State New
Headers show

Comments

Juan Quintela - Feb. 23, 2011, 9:47 p.m.
It is used only in one place

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration.c |    9 ++++-----
 migration.h |    1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

Patch

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;