[libvirt] [PATCH] Don't raise an error if the migration cookie is NULL

Daniel P. Berrange berrange at redhat.com
Sat Jun 4 10:16:28 UTC 2011


The v2 migration protocol doesn't use cookies, so we should not
be raising an error if the cookie parameters are NULL.

* src/qemu/qemu_migration.c: Don't raise error if cookie is NULL
---
 src/qemu/qemu_migration.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index aa74d86..fa506e2 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -618,11 +618,8 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig,
                         int *cookieoutlen,
                         int flags)
 {
-    if (!cookieout || !cookieoutlen) {
-        qemuReportError(VIR_ERR_INVALID_ARG, "%s",
-                        _("missing migration cookie data"));
-        return -1;
-    }
+    if (!cookieout || !cookieoutlen)
+        return 0;
 
     *cookieoutlen = 0;
 
-- 
1.7.4.4




More information about the libvir-list mailing list