From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 22 Oct 2014 09:22:08 +0000 (+0200)
Subject: qemu: restore: Fix restoring of VM when the restore hook returns empty XML
X-Git-Tag: v1.2.9.1~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d52d5e6d53fabba3de666c83d78193dbeca5ae1;p=thirdparty%2Flibvirt.git

qemu: restore: Fix restoring of VM when the restore hook returns empty XML

The documentation for the restore hook states that returning an empty
XML is equivalent with copying the input. There was a bug in the code
checking the returned string by checking the string instead of the
contents. Use the new helper to check if the string is empty.

(cherry picked from commit e38677993734e9af3dbd0589e1cecd0b75f7e757)
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d379c1f431..91eba0aa99 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5720,7 +5720,7 @@ qemuDomainRestoreFlags(virConnectPtr conn,
                                    &xmlout)) < 0)
             goto cleanup;
 
-        if (hookret == 0 && xmlout) {
+        if (hookret == 0 && !virStringIsEmpty(xmlout)) {
             VIR_DEBUG("Using hook-filtered domain XML: %s", xmlout);
             hook_taint = true;
             newxml = xmlout;
@@ -5936,7 +5936,7 @@ qemuDomainObjRestore(virConnectPtr conn,
                                    NULL, xml, &xmlout)) < 0)
             goto cleanup;
 
-        if (hookret == 0 && xmlout) {
+        if (hookret == 0 && !virStringIsEmpty(xmlout)) {
             virDomainDefPtr tmp;
 
             VIR_DEBUG("Using hook-filtered domain XML: %s", xmlout);