[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/14] linux-user: fix tcg/mmap test
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 11/14] linux-user: fix tcg/mmap test |
Date: |
Thu, 16 Feb 2017 15:22:24 +0100 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
[pranith: dropped checkpatch changes]
Signed-off-by: Pranith Kumar <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/mmap.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 4ed9cad..4888f53 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;
--
2.9.3
- [Qemu-devel] [PULL 00/14] Linux user for upstream patches, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 13/14] linux-user: Use correct types in load_symbols(), Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 01/14] linux-user: remove ifdef __USER_MISC, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 07/14] linux-user: manage two new IFLA host message types, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 09/14] linux-user: Update m68k syscall definitions to match Linux 4.6, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 12/14] linux-user: fill target sigcontext struct accordingly, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 10/14] linux-user: fix settime old value location, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 08/14] linux-user: Update sh4 syscall definitions to match Linux 4.8, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 11/14] linux-user: fix tcg/mmap test,
Laurent Vivier <=
- [Qemu-devel] [PULL 04/14] linux-user: Fix inotify_init1 support, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 02/14] linux-user: drop __cygwin__ ifdef, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 14/14] linux-user: Add FICLONE and FICLONERANGE ioctls, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 03/14] linux-user: Fix s390x safe-syscall for z900, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 06/14] linux-user: Fix mq_open, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 05/14] linux-user: Fix readahead, Laurent Vivier, 2017/02/16