Commit 21deeaf02fdf216b08210fc899579736973ca81d added a stub
for volStorageBackendRBDGetFlags without marking the arguments
as unused, thus breaking the build.

Now that we require diff_iterate2 to be present, remove all the
conditionally compiled code, including the stub function.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 src/storage/storage_backend_rbd.c | 39 -------------------------------
 1 file changed, 39 deletions(-)

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 61ebb9b541..6fea8fe8c7 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -436,7 +436,6 @@ volStorageBackendRBDGetFeatures(rbd_image_t image,
     return ret;
 }
 
-#if LIBRBD_VERSION_CODE > 265
 static int
 volStorageBackendRBDGetFlags(rbd_image_t image,
                              const char *volname,
@@ -500,31 +499,6 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol,
     return ret;
 }
 
-#else
-static int
-volStorageBackendRBDGetFlags(rbd_image_t image,
-                             const char *volname,
-                             uint64_t *flags)
-{
-    *flags = 0;
-    return 0;
-}
-
-static int
-volStorageBackendRBDUseFastDiff(uint64_t features ATTRIBUTE_UNUSED,
-                                uint64_t feature_flags ATTRIBUTE_UNUSED)
-{
-    return false;
-}
-
-static int
-virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol ATTRIBUTE_UNUSED,
-                                  rbd_image_t *image ATTRIBUTE_UNUSED,
-                                  rbd_image_info_t *info ATTRIBUTE_UNUSED)
-{
-    return false;
-}
-#endif
 
 static int
 volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol,
@@ -1087,21 +1061,8 @@ virStorageBackendRBDSnapshotFindNoDiff(rbd_image_t image,
         /* The callback will set diff to non-zero if there is a diff */
         diff = 0;
 
-/*
- * rbd_diff_iterate2() is available in versions above Ceph 0.94 (Hammer)
- * It uses a object map inside Ceph which is faster than rbd_diff_iterate()
- * which iterates all objects.
- * LIBRBD_VERSION_CODE for Ceph 0.94 is 265. In 266 and upwards diff_iterate2
- * is available
- */
-#if LIBRBD_VERSION_CODE > 265
         r = rbd_diff_iterate2(image, snaps[i].name, 0, info.size, 0, 1,
                               virStorageBackendRBDIterateCb, (void *)&diff);
-#else
-        r = rbd_diff_iterate(image, snaps[i].name, 0, info.size,
-                             virStorageBackendRBDIterateCb, (void *)&diff);
-#endif
-
         if (r < 0) {
             virReportSystemError(-r, _("failed to iterate RBD snapshot %s@%s"),
                                  imgname, snaps[i].name);
-- 
2.19.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Wed, Apr 03, 2019 at 07:40:17AM +0200, Ján Tomko wrote:
> Commit 21deeaf02fdf216b08210fc899579736973ca81d added a stub
> for volStorageBackendRBDGetFlags without marking the arguments
> as unused, thus breaking the build.

IMHO we should just add the attribute annotation for fix the warning


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list