From: Daniel P. Berrange <berrange@redhat.com>
Date: Sat, 4 Jun 2011 10:14:05 +0000 (-0400)
Subject: Don't raise an error if the migration cookie is NULL
X-Git-Tag: v0.9.2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a50f5f6faad91c32ca56eb68af37b74b4700763e;p=thirdparty%2Flibvirt.git

Don't raise an error if the migration cookie is NULL

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
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index aa74d86e85..fa506e23d9 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;