[libvirt] [PATCH 3/6] storageVolWipePattern: Don't take shortcut to refreshPool()
In d16f803d780 we've tried to solve an issue that after wiping an
image its format might have changed (e.g. from qcow2 to raw) but
libvirt wasn't probing the image format. We fixed this by calling
virStorageBackendRefreshVolTargetUpdate() which is what
refreshPool() would end up calling. But this shortcut is not good
enough because the function is called only for local types of
volumes (like dir, fs, netfs). But now that more backends support
volume wiping we have to call the function with more caution.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
Truth to be told, I don't like this approach very much. I'd rather
replace this with storagePoolRefreshImpl() call which is introduced
in next patch.
src/storage/storage_driver.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 34634e97d9..72a39b36b1 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -2539,11 +2539,15 @@ storageVolWipePattern(virStorageVolPtr vol,
if (rc < 0)
goto cleanup;
- /* Instead of using the refreshVol, since much changes on the target
- * volume, let's update using the same function as refreshPool would
- * use when it discovers a volume. The only failure to capture is -1,
- * we can ignore -2. */
- if (virStorageBackendRefreshVolTargetUpdate(voldef) == -1)
+ /* For local volumes, Instead of using the refreshVol, since
+ * much changes on the target volume, let's update using the
+ * same function as refreshPool would use when it discovers a
+ * volume. The only failure to capture is -1, we can ignore
+ * -2. */
+ if ((backend->type == VIR_STORAGE_POOL_DIR ||
+ backend->type == VIR_STORAGE_POOL_FS ||
+ backend->type == VIR_STORAGE_POOL_NETFS) &&
+ virStorageBackendRefreshVolTargetUpdate(voldef) == -1)
goto cleanup;
ret = 0;
--
2.19.2