qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <anthony@codemonkey.ws>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [5701] Define OS-dependent qemu_getpagesize() (Hollis Blanchard)
Date: Tue, 11 Nov 2008 21:48:59 +0000	[thread overview]
Message-ID: <E1L016Z-00036R-H7@cvs.savannah.gnu.org> (raw)

Revision: 5701
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5701
Author:   aliguori
Date:     2008-11-11 21:48:59 +0000 (Tue, 11 Nov 2008)

Log Message:
-----------
Define OS-dependent qemu_getpagesize() (Hollis Blanchard)

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

Modified Paths:
--------------
    trunk/exec.c
    trunk/osdep.c
    trunk/osdep.h

Modified: trunk/exec.c
===================================================================
--- trunk/exec.c	2008-11-11 21:33:36 UTC (rev 5700)
+++ trunk/exec.c	2008-11-11 21:48:59 UTC (rev 5701)
@@ -231,16 +231,7 @@
 {
     /* NOTE: we can always suppose that qemu_host_page_size >=
        TARGET_PAGE_SIZE */
-#ifdef _WIN32
-    {
-        SYSTEM_INFO system_info;
-
-        GetSystemInfo(&system_info);
-        qemu_real_host_page_size = system_info.dwPageSize;
-    }
-#else
-    qemu_real_host_page_size = getpagesize();
-#endif
+    qemu_real_host_page_size = qemu_getpagesize();
     if (qemu_host_page_size == 0)
         qemu_host_page_size = qemu_real_host_page_size;
     if (qemu_host_page_size < TARGET_PAGE_SIZE)

Modified: trunk/osdep.c
===================================================================
--- trunk/osdep.c	2008-11-11 21:33:36 UTC (rev 5700)
+++ trunk/osdep.c	2008-11-11 21:48:59 UTC (rev 5701)
@@ -66,6 +66,14 @@
     VirtualFree(ptr, 0, MEM_RELEASE);
 }
 
+long qemu_getpagesize(void)
+{
+    SYSTEM_INFO system_info;
+
+    GetSystemInfo(&system_info);
+    return system_info.dwPageSize;
+}
+
 #else
 
 #if defined(USE_KQEMU)
@@ -190,6 +198,11 @@
 #endif
 }
 
+long qemu_getpagesize(void)
+{
+    return sysconf(_SC_PAGESIZE);
+}
+
 /* alloc shared memory pages */
 void *qemu_vmalloc(size_t size)
 {

Modified: trunk/osdep.h
===================================================================
--- trunk/osdep.h	2008-11-11 21:33:36 UTC (rev 5700)
+++ trunk/osdep.h	2008-11-11 21:48:59 UTC (rev 5701)
@@ -72,6 +72,7 @@
 void *qemu_memalign(size_t alignment, size_t size);
 void *qemu_vmalloc(size_t size);
 void qemu_vfree(void *ptr);
+long qemu_getpagesize(void);
 
 int qemu_create_pidfile(const char *filename);
 

                 reply	other threads:[~2008-11-11 21:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=E1L016Z-00036R-H7@cvs.savannah.gnu.org \
    --to=anthony@codemonkey.ws \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).