From: Wido den Hollander Date: Thu, 11 Feb 2016 16:04:16 +0000 (+0100) Subject: rbd: rbd_diff_iterate2() is available in librbd since 266 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ab342e99f6cb853cab6586ba5c4272f2fa543353;p=libvirt.git rbd: rbd_diff_iterate2() is available in librbd since 266 In commit 0b15f920 there is a #ifdef which requires LIBRBD_VERSION_CODE 266 or newer for rbd_diff_iterate2() rbd_diff_iterate2() is available since 266, so this if-statement should require anything newer than 265. Signed-off-by: Wido den Hollander --- diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 5f2469f4f9..887db0bfdd 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -792,8 +792,10 @@ virStorageBackendRBDSnapshotFindNoDiff(rbd_image_t image, * 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 > 266 +#if LIBRBD_VERSION_CODE > 265 r = rbd_diff_iterate2(image, snaps[i].name, 0, info.size, 0, 1, virStorageBackendRBDIterateCb, (void *)&diff); #else