From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEYIl-0008KA-Oc for qemu-devel@nongnu.org; Thu, 31 Dec 2015 03:09:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aEYIi-0008Lg-Fo for qemu-devel@nongnu.org; Thu, 31 Dec 2015 03:09:39 -0500 Received: from mail113-249.mail.alibaba.com ([205.204.113.249]:41099 helo=us-alimail-mta1.hst.scl.en.alidc.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEYIh-0008LQ-Pa for qemu-devel@nongnu.org; Thu, 31 Dec 2015 03:09:36 -0500 References: <1451546077-7969-1-git-send-email-chengang@emindsoft.com.cn> From: Chen Gang Message-ID: <5684E2AB.8020100@emindsoft.com.cn> Date: Thu, 31 Dec 2015 16:09:15 +0800 MIME-Version: 1.0 In-Reply-To: <1451546077-7969-1-git-send-email-chengang@emindsoft.com.cn> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] linux-user/mmap.c: Set prot page flags for the correct region in mmap_frag() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: riku.voipio@iki.fi, laurent@vivier.eu Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, rth@twiddle.net Oh, sorry, for the coding style issues. Also the typo in the comments. I shall send patch v2, next. This fix patch can let the old ACDSee.exe, and the latest WinRAR.exe setup programs run successfully under real WinXP system dlls. Thanks. On 2015年12月31日 15:14, chengang@emindsoft.com.cn wrote: > From: Chen Gang > > mmap() size in mmap_frag() is qemu_host_page_size, but the outside calls > page_set_flags() may be not with qemu_host_page_size. So after mmap(), > call page_set_flags() in time. > > Also let addr increasing step be TARGET_PAGE_SIZE, just like another > areas have done. > > Also remote redundant varialbe p. > > Signed-off-by: Chen Gang > --- > linux-user/mmap.c | 10 ++++++---- > 1 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/linux-user/mmap.c b/linux-user/mmap.c > index 445e8c6..7920c5e 100644 > --- a/linux-user/mmap.c > +++ b/linux-user/mmap.c > @@ -151,17 +151,19 @@ static int mmap_frag(abi_ulong real_start, > > /* get the protection of the target pages outside the mapping */ > prot1 = 0; > - for(addr = real_start; addr < real_end; addr++) { > + for(addr = real_start; addr < real_end; addr += TARGET_PAGE_SIZE) { > if (addr < start || addr >= end) > prot1 |= page_get_flags(addr); > } > > 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; > + } > + page_set_flags(real_start, real_start + qemu_host_page_size, > + prot | PAGE_VALID); > prot1 = prot; > } > prot1 &= PAGE_BITS; > -- Chen Gang (陈刚) Open, share, and attitude like air, water, and life which God blessed