From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LCHqP-0008SY-Ts
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 13:07:01 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LCHqP-0008S2-3F
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 13:07:01 -0500
Received: from [199.232.76.173] (port=38089 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LCHqO-0008Ro-QB
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 13:07:00 -0500
Received: from yw-out-1718.google.com ([74.125.46.153]:22697)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <blauwirbel@gmail.com>) id 1LCHqO-0007Ug-B2
	for qemu-devel@nongnu.org; Mon, 15 Dec 2008 13:07:00 -0500
Received: by yw-out-1718.google.com with SMTP id 6so1292664ywa.82
	for <qemu-devel@nongnu.org>; Mon, 15 Dec 2008 10:06:58 -0800 (PST)
Message-ID: <f43fc5580812151006u19902cc0x45522a2cc0c5890a@mail.gmail.com>
Date: Mon, 15 Dec 2008 20:06:58 +0200
From: "Blue Swirl" <blauwirbel@gmail.com>
Subject: Re: [Qemu-devel] [5979] Fix compiling without MREMAP_FIXED
In-Reply-To: <20081214174335.GB7343@epbyminw8406h.minsk.epam.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1LAqxW-000192-AB@cvs.savannah.gnu.org>
	<20081211193349.GA9054@epbyminw8406h.minsk.epam.com>
	<f43fc5580812120827o44d63c90u70ab6a789657312d@mail.gmail.com>
	<20081212191119.GA7285@epbyminw8406h.minsk.epam.com>
	<20081214174335.GB7343@epbyminw8406h.minsk.epam.com>
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

On 12/14/08, Kirill A. Shutemov <kirill@shutemov.name> wrote:
> On Fri, Dec 12, 2008 at 09:11:19PM +0200, Kirill A. Shutemov wrote:
>  > On Fri, Dec 12, 2008 at 06:27:23PM +0200, Blue Swirl wrote:
>  > > On 12/11/08, Kirill A. Shutemov <kirill@shutemov.name> wrote:
>  > > > On Thu, Dec 11, 2008 at 07:12:26PM +0000, Blue Swirl wrote:
>  > > >  > Revision: 5979
>  > > >  >           http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5979
>  > > >  > Author:   blueswir1
>  > > >  > Date:     2008-12-11 19:12:25 +0000 (Thu, 11 Dec 2008)
>  > > >  >
>  > > >  > Log Message:
>  > > >  > -----------
>  > > >  > Fix compiling without MREMAP_FIXED
>  > > >  >
>  > > >  > Modified Paths:
>  > > >  > --------------
>  > > >  >     trunk/linux-user/mmap.c
>  > > >  >
>  > > >  > Modified: trunk/linux-user/mmap.c
>  > > >  > ===================================================================
>  > > >  > --- trunk/linux-user/mmap.c   2008-12-11 17:30:50 UTC (rev 5978)
>  > > >  > +++ trunk/linux-user/mmap.c   2008-12-11 19:12:25 UTC (rev 5979)
>  > > >  > @@ -546,6 +546,7 @@
>  > > >  >
>  > > >  >      mmap_lock();
>  > > >  >
>  > > >  > +#if defined(MREMAP_FIXED)
>  > > >  >      if (flags & MREMAP_FIXED)
>  > > >  >          host_addr = mremap(g2h(old_addr), old_size, new_size,
>  > > >  >                             flags, new_addr);
>  > > >  > @@ -560,7 +561,9 @@
>  > > >  >          } else
>  > > >  >              host_addr = mremap(g2h(old_addr), old_size, new_size,
>  > > >  >                                 flags | MREMAP_FIXED, g2h(mmap_start));
>  > > >  > -    } else {
>  > > >  > +    } else
>  > > >  > +#endif
>  > > >  > +    {
>  > > >  >          host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
>  > > >  >          /* Check if address fits target address space */
>  > > >  >          if ((unsigned long)host_addr + new_size > (abi_ulong)-1) {
>  > > >
>  > > >
>  > > > I've posted patch that fix building for glibc < 2.4. Please apply my
>  > > >  patch instead of it.
>  > >
>  > > Your fix depends on linux headers, is that safe?
>  >
>  > Why not? glibc also depends on it.
>
>
> Blue, please commit my patch.

I committed a fix, but I had to use syscall also for mremap a few
lines above. Let's hope no distros remove linux/mmap.h or
linux/unistd.h.