]> xenbits.xensource.com Git - libvirt.git/commitdiff
storage: rbd: Fix build
authorPeter Krempa <pkrempa@redhat.com>
Tue, 29 Mar 2016 06:50:30 +0000 (08:50 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 29 Mar 2016 06:51:33 +0000 (08:51 +0200)
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.

src/storage/storage_backend_rbd.c

index c9b47e215a2aff3cf4f445565be7d4edaf6fafa5..6e92ff7e859998cd8d04b9d45cb91319f29649c5 100644 (file)
@@ -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;