xenserver: use ovs-vsctl for VIF VLANs instead of separate state files

[openvswitch] / lib / bitmap.h

diff --git a/lib/bitmap.h b/lib/bitmap.h
index 9c420eb64d23719ea8260ed7b6a737ff6108bec9..204281030e2b8e7a04a275084d047692789188fc 100644 (file)
--- a/lib/bitmap.h
+++ b/lib/bitmap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008, 2009 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,8 @@ bitmap_bit__(size_t offset)
 static inline unsigned long *
 bitmap_allocate(size_t n_bits)
 {
-    return xcalloc(1, ROUND_UP(n_bits, BITMAP_ULONG_BITS));
+    size_t n_longs = DIV_ROUND_UP(n_bits, BITMAP_ULONG_BITS);
+    return xcalloc(sizeof(unsigned long int), n_longs);
 }
 
 static inline void