From: Wen Congyang <wency cn fujitsu com>
Date: Wed, 20 Apr 2011 10:20:12 +0000 (+0800)
Subject: fix tunnelled migration's regression
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2cb1d6f2209bc15d768c0fb8ffa31b381fe56298;p=libvirt.git

fix tunnelled migration's regression

If the migrateFrom is "stdio" not "stdin", qemuBuildCommandLine()
will convert it to exec:cat or fd:n.
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 43741e1d14..bba76d5996 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -316,9 +316,9 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver,
         goto endjob;
     }
     /* Start the QEMU daemon, with the same command-line arguments plus
-     * -incoming stdin (which qemu_command might convert to exec:cat or fd:n)
+     * -incoming stdio (which qemu_command might convert to exec:cat or fd:n)
      */
-    internalret = qemuProcessStart(dconn, driver, vm, "stdin", true, dataFD[1],
+    internalret = qemuProcessStart(dconn, driver, vm, "stdio", true, dataFD[1],
                                    NULL, VIR_VM_OP_MIGRATE_IN_START);
     if (internalret < 0) {
         qemuAuditDomainStart(vm, "migrated", false);