aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2011-03-10 17:03:41 +0300
committerAurelien Jarno <aurelien@aurel32.net>2011-04-01 22:23:06 +0200
commit8cffde7329734c17ee2eeec84944abbf4a0f23f3 (patch)
tree4a9b6725f77e9d77ab4516f53ac49cada921e167 /block
parent508240c0daecdd62ab46727f37145f2dbb029ff7 (diff)
downloadqemu-8cffde7329734c17ee2eeec84944abbf4a0f23f3.zip
qemu-8cffde7329734c17ee2eeec84944abbf4a0f23f3.tar.gz
qemu-8cffde7329734c17ee2eeec84944abbf4a0f23f3.tar.bz2
get rid of private bitmap functions in block/sheepdog.c, use generic ones
qemu now has generic bitmap functions, so don't redefine them in sheepdog.c, use common header instead. A small cleanup. Here's only one function which is actually used in sheepdog and gets replaced with a generic one (simplified): - static inline int test_bit(int nr, const volatile unsigned long *addr) + static inline int test_bit(int nr, const unsigned long *addr) { - return ((1UL << (nr % BITS_PER_LONG)) & ((unsigned long*)addr)[nr / BITS_PER_LONG])) != 0; + return 1UL & (addr[nr / BITS_PER_LONG] >> (nr & (BITS_PER_LONG-1))); } The body is equivalent, but the argument is not: there's "volatile" in there. Why it is used for - I'm not sure. Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> Acked-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'block')
-rw-r--r--block/sheepdog.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/block/sheepdog.c b/block/sheepdog.c
index a54e0de..98946d7 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -13,6 +13,7 @@
#include "qemu-error.h"
#include "qemu_socket.h"
#include "block_int.h"
+#include "bitops.h"
#define SD_PROTO_VER 0x01
@@ -1829,20 +1830,6 @@ static int sd_snapshot_delete(BlockDriverState *bs, const char *snapshot_id)
return 0;
}
-#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
-#define BITS_PER_BYTE 8
-#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
-#define DECLARE_BITMAP(name,bits) \
- unsigned long name[BITS_TO_LONGS(bits)]
-
-#define BITS_PER_LONG (BITS_PER_BYTE * sizeof(long))
-
-static inline int test_bit(unsigned int nr, const unsigned long *addr)
-{
- return ((1UL << (nr % BITS_PER_LONG)) &
- (((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0;
-}
-
static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
{
BDRVSheepdogState *s = bs->opaque;