From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L01Nl-000879-F6 for qemu-devel@nongnu.org; Tue, 11 Nov 2008 17:06:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L01Nk-00086e-2X for qemu-devel@nongnu.org; Tue, 11 Nov 2008 17:06:44 -0500 Received: from [199.232.76.173] (port=36354 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L01Nj-00086b-Sw for qemu-devel@nongnu.org; Tue, 11 Nov 2008 17:06:43 -0500 Received: from savannah.gnu.org ([199.232.41.3]:46458 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 1L01Nj-000555-Ht for qemu-devel@nongnu.org; Tue, 11 Nov 2008 17:06:43 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L01Nj-0003oq-7c for qemu-devel@nongnu.org; Tue, 11 Nov 2008 22:06:43 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L01Nj-0003om-0f for qemu-devel@nongnu.org; Tue, 11 Nov 2008 22:06:43 +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 22:06:43 +0000 Subject: [Qemu-devel] [5703] Fix -linux-user build by reverting r5701 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: 5703 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5703 Author: aliguori Date: 2008-11-11 22:06:42 +0000 (Tue, 11 Nov 2008) Log Message: ----------- Fix -linux-user build by reverting r5701 Unfortunately, -linux-user doesn't use osdep as it replaces some of those functions with specific ones. The code #ifdef code in exec.c needs to remain in place so instead of introducing a qemu_getpagesize() let's just use getpagesize() in the non-Windows implementation of qemu_vmalloc. Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/exec.c trunk/osdep.c trunk/osdep.h Modified: trunk/exec.c =================================================================== --- trunk/exec.c 2008-11-11 21:50:17 UTC (rev 5702) +++ trunk/exec.c 2008-11-11 22:06:42 UTC (rev 5703) @@ -231,7 +231,16 @@ { /* NOTE: we can always suppose that qemu_host_page_size >= TARGET_PAGE_SIZE */ - qemu_real_host_page_size = qemu_getpagesize(); +#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 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:50:17 UTC (rev 5702) +++ trunk/osdep.c 2008-11-11 22:06:42 UTC (rev 5703) @@ -66,14 +66,6 @@ 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) @@ -198,11 +190,6 @@ #endif } -long qemu_getpagesize(void) -{ - return sysconf(_SC_PAGESIZE); -} - /* alloc shared memory pages */ void *qemu_vmalloc(size_t size) { @@ -213,7 +200,7 @@ #ifdef _BSD return valloc(size); #else - return memalign(qemu_getpagesize(), size); + return memalign(getpagesize(), size); #endif } Modified: trunk/osdep.h =================================================================== --- trunk/osdep.h 2008-11-11 21:50:17 UTC (rev 5702) +++ trunk/osdep.h 2008-11-11 22:06:42 UTC (rev 5703) @@ -72,7 +72,6 @@ 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);