From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L016c-0003PV-2r for qemu-devel@nongnu.org; Tue, 11 Nov 2008 16:49:02 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L016b-0003Nk-76 for qemu-devel@nongnu.org; Tue, 11 Nov 2008 16:49:01 -0500 Received: from [199.232.76.173] (port=51360 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L016a-0003NO-Uz for qemu-devel@nongnu.org; Tue, 11 Nov 2008 16:49:01 -0500 Received: from savannah.gnu.org ([199.232.41.3]:47364 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L016a-0003UF-HJ for qemu-devel@nongnu.org; Tue, 11 Nov 2008 16:49:00 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L016Z-00036W-P7 for qemu-devel@nongnu.org; Tue, 11 Nov 2008 21:48:59 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L016Z-00036R-H7 for qemu-devel@nongnu.org; Tue, 11 Nov 2008 21:48:59 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Tue, 11 Nov 2008 21:48:59 +0000 Subject: [Qemu-devel] [5701] Define OS-dependent qemu_getpagesize() (Hollis Blanchard) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 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);