diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-03-11 16:27:23 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-22 22:20:16 +0100 |
| commit | e07e540aaa08718c9ff8213067a3dcef31b3e313 (patch) | |
| tree | c8bf83d8132061736577456113c3c0b2fb5ad4ef /include | |
| parent | a8139632161d7546218b696cada0a4f64cc78fb7 (diff) | |
Move QEMU_ALIGN_*() from qemu-common.h to qemu/osdep.h
qemu-common.h should only be included by .c files. Its file comment
explains why: "No header file should depend on qemu-common.h, as this
would easily lead to circular header dependencies."
One of the reasons for headers to include it is QEMU_ALIGN_UP() and
QEMU_ALIGN_DOWN(). Move them next to ROUND_UP() in qemu/osdep.h, to
facilitate removing these ill-advised includes later on.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu-common.h | 6 | ||||
| -rw-r--r-- | include/qemu/osdep.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h index fbd999cbcd..f2727523e0 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 64b06e30cd..97a7fa22e8 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 |