From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 15 Mar 2016 19:24:10 +0000 (-0400)
Subject: qemu: Don't overwrite DomainSave errors
X-Git-Tag: v1.3.3-rc1~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f3d9c26ccc8e380ef9e1e9a8df51aa7c2387d2;p=thirdparty%2Flibvirt.git

qemu: Don't overwrite DomainSave errors

These functions already report fine grained errors, there's no
benefit to overwriting the error here.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index edf39d93ea..29c3bc8f8a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17631,11 +17631,8 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
         vm->def->disks[idx]->blkdeviotune = info;
 
         ret = virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps);
-        if (ret < 0) {
-            virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                           _("Saving live XML config failed"));
+        if (ret < 0)
             goto endjob;
-        }
 
         if (eventNparams) {
             event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams);
@@ -17658,11 +17655,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
         }
         conf_disk->blkdeviotune = info;
         ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef);
-        if (ret < 0) {
-            virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-                           _("Write to config file failed"));
+        if (ret < 0)
             goto endjob;
-        }
+
     }
 
  endjob: