From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52192 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OuOdI-0002GV-Rl for qemu-devel@nongnu.org; Sat, 11 Sep 2010 07:52:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OuOdH-0007Vl-F4 for qemu-devel@nongnu.org; Sat, 11 Sep 2010 07:52:36 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:35215) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OuOdH-0007Vc-3T for qemu-devel@nongnu.org; Sat, 11 Sep 2010 07:52:35 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 11 Sep 2010 13:51:57 +0200 Message-Id: <1284205917-8124-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] Prefer posix_madvise() over madvise() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Andreas F=C3=A4rber vl.c has a Sun-specific hack to supply a prototype for madvise(), but the call site has apparently moved to arch_init.c. The underlying issue is that madvise() is not a POSIX function, therefore Solaris' _POSIX_C_SOURCE suppresses the prototype. Haiku doesn't implement madvise() at all. Where functionality equivalent to that of madvise() is provided, use the POSIX function posix_madvise(). http://www.opengroup.org/onlinepubs/9699919799/functions/posix_madvise.ht= ml Remaining madvise() users: exec.c: limited to __linux__ and/or MADV_MERGEABLE (no POSIX equivalent) kvm-all.c: limited to MADV_DONTFORK (no POSIX equivalent), otherwise runtime error if !kvm_has_sync_mmu() hw/virtio-balloon.c: limited to __linux__ Signed-off-by: Andreas F=C3=A4rber Cc: Blue Swirl --- arch_init.c | 2 +- vl.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch_init.c b/arch_init.c index e468c0c..fa39557 100644 --- a/arch_init.c +++ b/arch_init.c @@ -396,7 +396,7 @@ int ram_load(QEMUFile *f, void *opaque, int version_i= d) #ifndef _WIN32 if (ch =3D=3D 0 && (!kvm_enabled() || kvm_has_sync_mmu())) { - madvise(host, TARGET_PAGE_SIZE, MADV_DONTNEED); + posix_madvise(host, TARGET_PAGE_SIZE, POSIX_MADV_DONTNEE= D); } #endif } else if (flags & RAM_SAVE_FLAG_PAGE) { diff --git a/vl.c b/vl.c index 3f45aa9..d352d18 100644 --- a/vl.c +++ b/vl.c @@ -80,9 +80,6 @@ #include #include #include -/* See MySQL bug #7156 (http://bugs.mysql.com/bug.php?id=3D7156) for - discussion about Solaris header problems */ -extern int madvise(caddr_t, size_t, int); #endif #endif #endif --=20 1.7.2.2