From patchwork Wed Dec 30 01:11:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 561665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A36F6140BF7 for ; Wed, 30 Dec 2015 12:13:03 +1100 (AEDT) Received: from localhost ([::1]:50834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aE5K1-0001xh-54 for incoming@patchwork.ozlabs.org; Tue, 29 Dec 2015 20:13:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aE5Jn-0001gc-Vn for qemu-devel@nongnu.org; Tue, 29 Dec 2015 20:12:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aE5Jk-0005Ri-Pg for qemu-devel@nongnu.org; Tue, 29 Dec 2015 20:12:47 -0500 Received: from mail113-251.mail.alibaba.com ([205.204.113.251]:51078 helo=us-alimail-mta2.hst.scl.en.alidc.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aE5Jk-0005Re-AN for qemu-devel@nongnu.org; Tue, 29 Dec 2015 20:12:44 -0500 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.07836469|-1; FP=0|0|0|0|0|-1|-1|-1; HT=e01l04366; MF=chengang@emindsoft.com.cn; NM=1; PH=DS; RN=8; RT=7; SR=0; TI=SMTPD_----4P2Sl69_1451437935; Received: from localhost.localdomain(mailfrom:chengang@emindsoft.com.cn ip:36.110.17.42) by smtp.aliyun-inc.com(10.147.39.228); Wed, 30 Dec 2015 09:12:35 +0800 From: chengang@emindsoft.com.cn To: riku.voipio@iki.fi, laurent@vivier.eu Date: Wed, 30 Dec 2015 09:11:44 +0800 Message-Id: <1451437904-3752-1-git-send-email-chengang@emindsoft.com.cn> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 205.204.113.251 Cc: peter.maydell@linaro.org, Chen Gang , Chen Gang , qemu-devel@nongnu.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH] linux-user/mmap.c: Support shared memory mapping in mmap_frag() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chen Gang It is a temporary fix for i386 target system running Windows. Also remove useless variable 'p'. Signed-off-by: Chen Gang --- linux-user/mmap.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 445e8c6..07758d4 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -156,12 +156,28 @@ static int mmap_frag(abi_ulong real_start, prot1 |= page_get_flags(addr); } + /* + * It is a temporary fix. Normally, target system will let shared memory + * aligned with 64KB, and allocate them near with each other, no any other + * kinds of mapping regions nearby. e.g. Windows on i386. + */ + if ((start == real_start) && (flags & MAP_SHARED)) { + if (prot1) { + munmap(host_start, qemu_host_page_size); + } + if (mmap(host_start, qemu_host_page_size, prot, flags, fd, offset) + == MAP_FAILED) { + return -1; + } + return 0; + } + if (prot1 == 0) { /* no page was there, so we allocate one */ - void *p = mmap(host_start, qemu_host_page_size, prot, - flags | MAP_ANONYMOUS, -1, 0); - if (p == MAP_FAILED) + if (mmap(host_start, qemu_host_page_size, prot, flags | MAP_ANONYMOUS, + -1, 0) == MAP_FAILED) { return -1; + } prot1 = prot; } prot1 &= PAGE_BITS;