]> xenbits.xensource.com Git - libvirt.git/commitdiff
fix tunnelled migration's regression
authorWen Congyang <wency cn fujitsu com>
Wed, 20 Apr 2011 10:20:12 +0000 (18:20 +0800)
committerWen Congyang <wency@cn.fujitsu.com>
Wed, 20 Apr 2011 13:30:00 +0000 (21:30 +0800)
If the migrateFrom is "stdio" not "stdin", qemuBuildCommandLine()
will convert it to exec:cat or fd:n.

src/qemu/qemu_migration.c

index 43741e1d14c696a2860fa1d7fd134db242f16617..bba76d599687ee503da0d7155b5a33f3bbb1f98d 100644 (file)
@@ -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);