Commit e07e540a authored by Markus Armbruster's avatar Markus Armbruster Committed by Paolo Bonzini
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a8139632

include/qemu-common.h

+0 −6
Original line number Diff line number Diff line
@@ -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"



/*

include/qemu/osdep.h

+6 −0
Original line number Diff line number Diff line
@@ -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