diff --git a/include/qemu-common.h b/include/qemu-common.h index fbd999cbcd5f45f83b7864f38928569b2aba6ac6..f2727523e0018a2ea9e8a6e95d5624757bac6942 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -369,12 +369,6 @@ static inline uint8_t from_bcd(uint8_t val) return ((val >> 4) * 10) + (val & 0x0f); } -/* Round number down to multiple */ -#define QEMU_ALIGN_DOWN(n, m) ((n) / (m) * (m)) - -/* Round number up to multiple */ -#define QEMU_ALIGN_UP(n, m) QEMU_ALIGN_DOWN((n) + (m) - 1, (m)) - #include "qemu/module.h" /* diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 64b06e30cdd2ecc230a46654646860806eb2e034..97a7fa22e8c7d208e89bfd8b6af62b1e007ecff1 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -149,6 +149,12 @@ extern int daemon(int, int); #define MIN_NON_ZERO(a, b) (((a) != 0 && (a) < (b)) ? (a) : (b)) #endif +/* Round number down to multiple */ +#define QEMU_ALIGN_DOWN(n, m) ((n) / (m) * (m)) + +/* Round number up to multiple */ +#define QEMU_ALIGN_UP(n, m) QEMU_ALIGN_DOWN((n) + (m) - 1, (m)) + #ifndef ROUND_UP #define ROUND_UP(n,d) (((n) + (d) - 1) & -(d)) #endif