On 1/18/21 7:38 AM, Jiaxun Yang wrote: > As per POSIX specification of limits.h [1], OS libc may define > PAGE_SIZE in limits.h. > > Self defined PAGE_SIZE is frequently used in tests, to prevent > collosion of definition, we give PAGE_SIZE definitons reasonable > prefixs. > > [1]: https://pubs.opengroup.org/onlinepubs/7908799/xsh/limits.h.html > > Signed-off-by: Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx> > Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx> > --- > tests/migration/stress.c | 10 ++--- > tests/qtest/libqos/malloc-pc.c | 4 +- > tests/qtest/libqos/malloc-spapr.c | 4 +- > tests/qtest/m25p80-test.c | 54 +++++++++++----------- > tests/tcg/multiarch/system/memory.c | 6 +-- > tests/test-xbzrle.c | 70 ++++++++++++++--------------- > 6 files changed, 74 insertions(+), 74 deletions(-) ... > diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/system/memory.c > index d124502d73..eb0ec6f8eb 100644 > --- a/tests/tcg/multiarch/system/memory.c > +++ b/tests/tcg/multiarch/system/memory.c > @@ -20,12 +20,12 @@ > # error "Target does not specify CHECK_UNALIGNED" > #endif > > -#define PAGE_SIZE 4096 /* nominal 4k "pages" */ > -#define TEST_SIZE (PAGE_SIZE * 4) /* 4 pages */ > +#define MEM_PAGE_SIZE 4096 /* nominal 4k "pages" */ > +#define TEST_SIZE (MEM_PAGE_SIZE * 4) /* 4 pages */ Clearer renaming TEST_PAGE_SIZE and TEST_MEM_SIZE. If possible using TEST_PAGE_SIZE / TEST_MEM_SIZE: Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> > > #define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0]))) > > -__attribute__((aligned(PAGE_SIZE))) > +__attribute__((aligned(MEM_PAGE_SIZE))) > static uint8_t test_data[TEST_SIZE];
