From: Paolo Bonzini <pbonzini@redhat.com>
Date: Sat, 10 Nov 2012 17:58:40 +0000 (+0100)
Subject: migration: remove double call to migrate_fd_close
X-Git-Tag: v1.4.0-rc0~280^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24ea1e4b4b79cef2bac6f8e0f0a212f42ef420a9;p=thirdparty%2Fqemu.git

migration: remove double call to migrate_fd_close

The call in buffered_close is enough, because buffered_close is called
already by migrate_fd_cleanup.

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

diff --git a/migration.c b/migration.c
index 810f25e7ebe..e5609309771 100644
--- a/migration.c
+++ b/migration.c
@@ -272,7 +272,7 @@ static int migrate_fd_cleanup(MigrationState *s)
         s->file = NULL;
     }
 
-    migrate_fd_close(s);
+    assert(s->fd == -1);
     return ret;
 }