|
 |
c401cc |
From dc43716225690dc88915e97679e3035e6df3ce3f Mon Sep 17 00:00:00 2001
|
|
|
c401cc |
Message-Id: <dc43716225690dc88915e97679e3035e6df3ce3f.1389183249.git.jdenemar@redhat.com>
|
|
|
c401cc |
From: Minoru Usui <usui@mxm.nes.nec.co.jp>
|
|
|
c401cc |
Date: Tue, 7 Jan 2014 14:08:01 +0100
|
|
|
c401cc |
Subject: [PATCH] Fix argument order of qemuMigrationPerformJob().
|
|
|
c401cc |
MIME-Version: 1.0
|
|
|
c401cc |
Content-Type: text/plain; charset=UTF-8
|
|
|
c401cc |
Content-Transfer-Encoding: 8bit
|
|
|
c401cc |
|
|
|
c401cc |
@listenAddress and @cookiein arguments, should be exchanged,
|
|
|
c401cc |
because the order of the caller and the callee does not match.
|
|
|
c401cc |
|
|
|
c401cc |
This results in the listen address being ignored for peer-to-peer
|
|
|
c401cc |
migration and the cookie being ignored for v2 migration.
|
|
|
c401cc |
|
|
|
c401cc |
Introduced by c4ac7ef (v1.1.4-rc1~141).
|
|
|
c401cc |
|
|
|
c401cc |
https://bugzilla.redhat.com/show_bug.cgi?id=1049338
|
|
|
c401cc |
|
|
|
c401cc |
Signed-off-by: Minoru Usui <usui@mxm.nes.nec.co.jp>
|
|
|
c401cc |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c401cc |
(cherry picked from commit bcd0ac47d8d7ec6230fe23f4b99891339e9d137d)
|
|
|
c401cc |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c401cc |
---
|
|
|
c401cc |
src/qemu/qemu_migration.c | 2 +-
|
|
|
c401cc |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
c401cc |
|
|
|
c401cc |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
c401cc |
index 18f74c3..a598d5e 100644
|
|
|
c401cc |
--- a/src/qemu/qemu_migration.c
|
|
|
c401cc |
+++ b/src/qemu/qemu_migration.c
|
|
|
c401cc |
@@ -4047,8 +4047,8 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver,
|
|
|
c401cc |
const char *dconnuri,
|
|
|
c401cc |
const char *uri,
|
|
|
c401cc |
const char *graphicsuri,
|
|
|
c401cc |
- const char *cookiein,
|
|
|
c401cc |
const char *listenAddress,
|
|
|
c401cc |
+ const char *cookiein,
|
|
|
c401cc |
int cookieinlen,
|
|
|
c401cc |
char **cookieout,
|
|
|
c401cc |
int *cookieoutlen,
|
|
|
c401cc |
--
|
|
|
c401cc |
1.8.5.2
|
|
|
c401cc |
|