diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-01-19 10:15:33 -0500 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2017-02-16 15:29:30 +0100 |
| commit | 35f2fd04ce8bd3eaad4b7790abb19fa2a56d7314 (patch) | |
| tree | bad67071af35ba61c05ce9f2a9a38dad0f3fcb45 | |
| parent | 40c80b5e9e44dcf89a672ff02952368c75a3b07b (diff) | |
linux-user: fix tcg/mmap test
tests/tcg/mmap test fails with values other than default target page
size. When creating a map beyond EOF, extra anonymous pages are added up
to the target page boundary. Currently, this operation is performed only
when qemu_real_host_page_size < TARGET_PAGE_SIZE, but it should be
performed if the configured page size (qemu -p) is larger than
qemu_real_host_page_size too.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[pranith: dropped checkpatch changes]
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20170119151533.29328-2-bobby.prani@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | linux-user/mmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 4ed9cad412..4888f53139 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -426,9 +426,9 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, may need to truncate file maps at EOF and add extra anonymous pages up to the targets page boundary. */ - if ((qemu_real_host_page_size < TARGET_PAGE_SIZE) - && !(flags & MAP_ANONYMOUS)) { - struct stat sb; + if ((qemu_real_host_page_size < qemu_host_page_size) && + !(flags & MAP_ANONYMOUS)) { + struct stat sb; if (fstat (fd, &sb) == -1) goto fail; |