From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 28 May 2014 14:46:48 +0000 (+0200)
Subject: qemu: managedsave: Don't spam logs with warnings about corrupted image
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0b317d61fc3f7c1163e20166bb5a065caba0bc9e;p=libvirt.git

qemu: managedsave: Don't spam logs with warnings about corrupted image

Even successful start of a VM from a managed save image would spam the
logs with the following message:

Unable to restore from managed state [path]. Maybe the file is
corrupted?

Re-arrange the logic to output the warning only when the image is
corrupted.

The flaw was introduced in commit cfc28c66.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a76309990d..9becc0a1b4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6080,14 +6080,14 @@ qemuDomainObjStart(virConnectPtr conn,
                     VIR_WARN("Failed to remove the managed state %s", managed_save);
                 else
                     vm->hasManagedSave = false;
-            }
 
-            if (ret > 0) {
-                VIR_WARN("Ignoring incomplete managed state %s", managed_save);
-            } else {
+                goto cleanup;
+            } else if (ret < 0) {
                 VIR_WARN("Unable to restore from managed state %s. "
                          "Maybe the file is corrupted?", managed_save);
                 goto cleanup;
+            } else {
+                VIR_WARN("Ignoring incomplete managed state %s", managed_save);
             }
         }
     }