All of lore.kernel.org
 help / color / mirror / Atom feed
From: Robert Reif <reif@earthlink.net>
To: qemu-devel@nongnu.org
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Subject: Re: [Qemu-devel] [PATCH] Fix building with glibc < 2.4
Date: Wed, 10 Dec 2008 06:57:58 -0500	[thread overview]
Message-ID: <493FAEC6.5090807@earthlink.net> (raw)
In-Reply-To: <1228909551-19264-1-git-send-email-kirill@shutemov.name>

[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]

Kirill A. Shutemov wrote:
> Prior to version 2.4, glibc did not expose the definition of
> MREMAP_FIXED, and the prototype for mremap() did not allow
> for the new_address argument.
>
> Tested only with glibc 2.9.
>
> Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
> ---
>  linux-user/mmap.c |   10 +++++++---
>  1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/linux-user/mmap.c b/linux-user/mmap.c
> index 89254ae..b6dd184 100644
> --- a/linux-user/mmap.c
> +++ b/linux-user/mmap.c
> @@ -24,6 +24,8 @@
>  #include <unistd.h>
>  #include <errno.h>
>  #include <sys/mman.h>
> +#include <linux/mman.h>
> +#include <linux/unistd.h>
>  
>  #include "qemu.h"
>  #include "qemu-common.h"
> @@ -564,9 +566,11 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
>          if (mmap_start == -1) {
>              errno = ENOMEM;
>              host_addr = MAP_FAILED;
> -        } else
> -            host_addr = mremap(g2h(old_addr), old_size, new_size,
> -                               flags | MREMAP_FIXED, g2h(mmap_start));
> +        } else {
> +            host_addr = (void *) syscall(__NR_mremap, g2h(old_addr),
> +                    old_size, new_size, flags | MREMAP_FIXED,
> +                    g2h(mmap_start));
> +        }
>      } else {
>          host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
>          /* Check if address fits target address space */
>   
This version compiles for me.

[-- Attachment #2: mremap.diff.txt --]
[-- Type: text/plain, Size: 1366 bytes --]

Index: linux-user/mmap.c
===================================================================
--- linux-user/mmap.c	(revision 5961)
+++ linux-user/mmap.c	(working copy)
@@ -24,6 +24,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/mman.h>
+#include <linux/mman.h>
+#include <linux/unistd.h>
 
 #include "qemu.h"
 #include "qemu-common.h"
@@ -547,8 +549,8 @@
     mmap_lock();
 
     if (flags & MREMAP_FIXED)
-        host_addr = mremap(g2h(old_addr), old_size, new_size,
-                           flags, new_addr);
+        host_addr = (void *) syscall(__NR_mremap, g2h(old_addr),
+                           old_size, new_size, flags, new_addr);
     else if (flags & MREMAP_MAYMOVE) {
         abi_ulong mmap_start;
 
@@ -557,9 +559,11 @@
         if (mmap_start == -1) {
             errno = ENOMEM;
             host_addr = MAP_FAILED;
-        } else
-            host_addr = mremap(g2h(old_addr), old_size, new_size,
-                               flags | MREMAP_FIXED, g2h(mmap_start));
+        } else {
+            host_addr = (void *) syscall(__NR_mremap, g2h(old_addr),
+                           old_size, new_size, flags | MREMAP_FIXED,
+                           g2h(mmap_start));
+       }
     } else {
         host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
         /* Check if address fits target address space */

  reply	other threads:[~2008-12-10 11:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-10 11:45 [Qemu-devel] [PATCH] Fix building with glibc < 2.4 Kirill A. Shutemov
2008-12-10 11:57 ` Robert Reif [this message]
2008-12-10 12:07   ` Kirill A. Shutemov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=493FAEC6.5090807@earthlink.net \
    --to=reif@earthlink.net \
    --cc=kirill@shutemov.name \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.