From: Wen Congyang <wency@cn.fujitsu.com>
Date: Wed, 30 May 2012 09:20:44 +0000 (+0800)
Subject: qemu: avoid closing fd more than once
X-Git-Tag: v0.9.6.1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa041fcef007e53e985c5f15b09c796c54fadaa4;p=thirdparty%2Flibvirt.git

qemu: avoid closing fd more than once

If we migrate to fd, spec->fwdType is not MIGRATION_FWD_DIRECT,
we will close spec->dest.fd.local in qemuMigrationRun(). So we
should set spec->dest.fd.local to -1 in qemuMigrationRun().

Bug present since 0.9.5 (commit 326176179).
(cherry picked from commit b19c236d69278c967d2d8b4aae97ac76213f1c10)
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 8fbf7b4a1f..56d4ecfb98 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1505,8 +1505,10 @@ qemuMigrationRun(struct qemud_driver *driver,
         break;
 
     case MIGRATION_DEST_FD:
-        if (spec->fwdType != MIGRATION_FWD_DIRECT)
+        if (spec->fwdType != MIGRATION_FWD_DIRECT) {
             fd = spec->dest.fd.local;
+            spec->dest.fd.local = -1;
+        }
         ret = qemuMonitorMigrateToFd(priv->mon, migrate_flags,
                                      spec->dest.fd.qemu);
         VIR_FORCE_CLOSE(spec->dest.fd.qemu);