Re: [Qemu-devel] [5979] Fix compiling without MREMAP_FIXED

[Blue Swirl]

On 12/14/08, Kirill A. Shutemov <address@hidden> 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 <address@hidden> 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.