aboutsummaryrefslogtreecommitdiff
path: root/include/qemu-common.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-07-24 13:33:12 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-09-07 14:19:01 +0100
commit8f1ed5f5081416d5d1cc9569aa826114c5b21213 (patch)
tree5572cb1ed9a1142cdbc77fe1fdb43de20b0e677b /include/qemu-common.h
parent10944a19209bb520054569e0f156f50338901264 (diff)
downloadqemu-arm-8f1ed5f5081416d5d1cc9569aa826114c5b21213.tar.gz
Make pow2ceil() and pow2floor() inline
Since the pow2floor() function is now used in a hot code path, make it inline; for consistency, provide pow2ceil() as an inline function too. Because these functions use ctz64() we have to put the inline versions into host-utils.h, so they have access to ctz64(), and move the inline is_power_of_2() along with them. We then need to include host-utils.h from qemu-common.h so that the files which use these functions via qemu-common.h still have access to them. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1437741192-20955-7-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'include/qemu-common.h')
-rw-r--r--include/qemu-common.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h
index f328821650..efaf919884 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,6 +24,7 @@
#include "glib-compat.h"
#include "qemu/option.h"
+#include "qemu/host-utils.h"
/* HOST_LONG_BITS is the size of a native pointer in bits. */
#if UINTPTR_MAX == UINT32_MAX
@@ -416,21 +417,6 @@ static inline uint8_t from_bcd(uint8_t val)
/* Round number up to multiple */
#define QEMU_ALIGN_UP(n, m) QEMU_ALIGN_DOWN((n) + (m) - 1, (m))
-static inline bool is_power_of_2(uint64_t value)
-{
- if (!value) {
- return 0;
- }
-
- return !(value & (value - 1));
-}
-
-/* round down to the nearest power of 2*/
-int64_t pow2floor(int64_t value);
-
-/* round up to the nearest power of 2 (0 if overflow) */
-uint64_t pow2ceil(uint64_t value);
-
#include "qemu/module.h"
/*