From dc43716225690dc88915e97679e3035e6df3ce3f Mon Sep 17 00:00:00 2001
Message-Id: <dc43716225690dc88915e97679e3035e6df3ce3f.1389183249.git.jdenemar@redhat.com>
From: Minoru Usui <usui@mxm.nes.nec.co.jp>
Date: Tue, 7 Jan 2014 14:08:01 +0100
Subject: [PATCH] Fix argument order of qemuMigrationPerformJob().
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

@listenAddress and @cookiein arguments, should be exchanged,
because the order of the caller and the callee does not match.

This results in the listen address being ignored for peer-to-peer
migration and the cookie being ignored for v2 migration.

Introduced by c4ac7ef (v1.1.4-rc1~141).

https://bugzilla.redhat.com/show_bug.cgi?id=1049338

Signed-off-by: Minoru Usui <usui@mxm.nes.nec.co.jp>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
(cherry picked from commit bcd0ac47d8d7ec6230fe23f4b99891339e9d137d)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_migration.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 18f74c3..a598d5e 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -4047,8 +4047,8 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver,
                         const char *dconnuri,
                         const char *uri,
                         const char *graphicsuri,
-                        const char *cookiein,
                         const char *listenAddress,
+                        const char *cookiein,
                         int cookieinlen,
                         char **cookieout,
                         int *cookieoutlen,
-- 
1.8.5.2