[libvirt] [PATCH] storage: rbd: Fix build

Peter Krempa pkrempa at redhat.com
Tue Mar 29 06:52:42 UTC 2016


After the recent commits the build didn't work for me. Fix it by
using size_t as the callback argument is using and the correct
formatter. The attempted fixup to use %llu as a formatter was wrong.
---

Pushed now.

 src/storage/storage_backend_rbd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index c9b47e2..6e92ff7 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -311,7 +311,7 @@ virStorageBackendRBDRefreshVolInfoCb(uint64_t offset ATTRIBUTE_UNUSED,
                                      int exists,
                                      void *arg)
 {
-    uint64_t *used_size = (uint64_t *)(arg);
+    size_t *used_size = (size_t *)(arg);
     if (exists)
         (*used_size) += len;

@@ -324,7 +324,7 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol,
                                   rbd_image_info_t *info)
 {
     int r, ret = -1;
-    uint64_t allocation = 0;
+    size_t allocation = 0;

     if ((r = rbd_diff_iterate2(image, NULL, 0, info->size, 0, 1,
                                &virStorageBackendRBDRefreshVolInfoCb,
@@ -334,7 +334,7 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol,
         goto cleanup;
     }

-    VIR_DEBUG("Found %llu bytes allocated for RBD image %s",
+    VIR_DEBUG("Found %zu bytes allocated for RBD image %s",
               allocation, vol->name);

     vol->target.allocation = allocation;
-- 
2.7.3




More information about the libvir-list mailing list