From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 15 Apr 2015 16:14:30 +0000 (+0200)
Subject: qemu: bulk stats: Ignore errors from missing/inaccessible disks
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=25aa7035d373ab17eb0ba773ad521e0dbfb7449d;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

qemu: bulk stats: Ignore errors from missing/inaccessible disks

Rather than erroring out make the best attempt to retrieve other data if
disks are inaccessible or missing. The failure will still be logged
though.

Since the bulk stats API is called on multiple domains an error like
this makes the API unusable. This regression was introduced by commit
596a13713420e01b20ce3dc3fdbe06d073682675

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1209394
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 01e01225b..f37b95dda 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19301,8 +19301,13 @@ qemuDomainGetStatsOneBlock(virQEMUDriverPtr driver,
             ret = 0;
             goto cleanup;
         }
-        if (qemuStorageLimitsRefresh(driver, cfg, dom, src) < 0)
+
+        if (qemuStorageLimitsRefresh(driver, cfg, dom, src) < 0) {
+            virResetLastError();
+            ret = 0;
             goto cleanup;
+        }
+
         if (src->allocation)
             QEMU_ADD_BLOCK_PARAM_ULL(record, maxparams, block_idx,
                                      "allocation", src->allocation);