From: Juan Quintela <quintela@redhat.com>
Date: Tue, 11 May 2010 21:38:23 +0000 (+0200)
Subject: migration: Remove migration cancel() callback
X-Git-Tag: TizenStudio_2.0_p2.3~2091^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5f6a690b1d7274e6dcdd3e8e2013a88becc359a;p=sdk%2Femulator%2Fqemu.git

migration: Remove migration cancel() callback

It is used only in one place

Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration.c b/migration.c
index 8dbe8df..31b6741 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;
 }
@@ -488,7 +488,6 @@ static MigrationState *migrate_new(Monitor *mon, int64_t bandwidth_limit,
 {
     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 6be3623..e1299b9 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;