From: Osier Yang <jyang@redhat.com>
Date: Tue, 1 Feb 2011 08:33:34 +0000 (+0800)
Subject: qemu: Build command line for incoming tunneled	migration
X-Git-Tag: v0.8.8~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16be54e8989aa5a4cbc1ba74375f6d0c8255a1e9;p=thirdparty%2Flibvirt.git

qemu: Build command line for incoming tunneled	migration

Command line building for incoming tunneled migration is missed,
as a result, all the tunneled migration will fail with "unknown
migration protocol".

* src/qemu/qemu_command.c
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a0f86a3c9a..8f681fddaa 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4067,6 +4067,14 @@ qemuBuildCommandLine(virConnectPtr conn,
             }
             virCommandAddArg(cmd, migrateFrom);
             virCommandPreserveFD(cmd, migrateFd);
+        } else if (STRPREFIX(migrateFrom, "unix")) {
+            if (!(qemuCmdFlags & QEMUD_CMD_FLAG_MIGRATE_QEMU_UNIX)) {
+                qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                                "%s", _("UNIX migration is not supported "
+                                        "with this QEMU binary"));
+                goto error;
+            }
+            virCommandAddArg(cmd, migrateFrom);
         } else {
             qemuReportError(VIR_ERR_INTERNAL_ERROR,
                             "%s", _("unknown migration protocol"));