From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 21 Apr 2011 15:02:40 +0000 (+0100)
Subject: Fix QEMU tunnelled migration FD handling
X-Git-Tag: v0.9.1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29fca78541957fae510db68ae9edd0273fc05a1f;p=thirdparty%2Flibvirt.git

Fix QEMU tunnelled migration FD handling

The two ends of the pipe used for feeding QEMU tunnelled
migration data were interchanged, so QEMU got given the
"write" end instead of the "read" end.

The qemuMigrationPrepareTunnel method was also immediately
closing the "write" end of the pipe, so the stream failed
to actually write anything.

* src/qemu/qemu_migration.c: Swap tunnelled migration
  pipe FDs & don't close pipe given to stream
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index bba76d5996..7f4b111c7d 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -301,7 +301,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver,
     vm->def->id = -1;
 
     if (pipe(dataFD) < 0 ||
-        virSetCloseExec(dataFD[0]) < 0) {
+        virSetCloseExec(dataFD[1]) < 0) {
         virReportSystemError(errno, "%s",
                              _("cannot create pipe for tunnelled migration"));
         goto endjob;
@@ -318,7 +318,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver,
     /* Start the QEMU daemon, with the same command-line arguments plus
      * -incoming stdio (which qemu_command might convert to exec:cat or fd:n)
      */
-    internalret = qemuProcessStart(dconn, driver, vm, "stdio", true, dataFD[1],
+    internalret = qemuProcessStart(dconn, driver, vm, "stdio", true, dataFD[0],
                                    NULL, VIR_VM_OP_MIGRATE_IN_START);
     if (internalret < 0) {
         qemuAuditDomainStart(vm, "migrated", false);
@@ -332,7 +332,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver,
         goto endjob;
     }
 
-    if (virFDStreamOpen(st, dataFD[0]) < 0) {
+    if (virFDStreamOpen(st, dataFD[1]) < 0) {
         qemuAuditDomainStart(vm, "migrated", false);
         qemuProcessStop(driver, vm, 0);
         if (!vm->persistent) {
@@ -344,6 +344,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver,
                              _("cannot pass pipe for tunnelled migration"));
         goto endjob;
     }
+    dataFD[1] = -1; /* 'st' owns the FD now & will close it */
 
     qemuAuditDomainStart(vm, "migrated", true);