From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxcVb-0003zQ-AL for qemu-devel@nongnu.org; Thu, 19 Jun 2014 09:36:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxcVR-0003st-QF for qemu-devel@nongnu.org; Thu, 19 Jun 2014 09:36:07 -0400 Received: from mail-qa0-x234.google.com ([2607:f8b0:400d:c00::234]:54501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxcVR-0003sn-M8 for qemu-devel@nongnu.org; Thu, 19 Jun 2014 09:35:57 -0400 Received: by mail-qa0-f52.google.com with SMTP id w8so1978193qac.11 for ; Thu, 19 Jun 2014 06:35:57 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 19 Jun 2014 15:35:43 +0200 Message-Id: <1403184944-17390-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403184944-17390-1-git-send-email-pbonzini@redhat.com> References: <1403184944-17390-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] fixup! memory: move preallocation code out of exec.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Since we need the page size for efficiency, move code to compute it out of translate-all.c and into util/oslib-win32.c. Signed-off-by: Paolo Bonzini --- include/sysemu/os-win32.h | 2 ++ translate-all.c | 7 ------- util/oslib-win32.c | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index bf8523a..af3fbc4 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -89,6 +89,8 @@ static inline void os_setup_post(void) {} void os_set_line_buffering(void); static inline void os_set_proc_name(const char *dummy) {} +size_t getpagesize(void); + #if !defined(EPROTONOSUPPORT) # define EPROTONOSUPPORT EINVAL #endif diff --git a/translate-all.c b/translate-all.c index 6b7b46e..5425d03 100644 --- a/translate-all.c +++ b/translate-all.c @@ -295,14 +295,7 @@ void page_size_init(void) { /* 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 if (qemu_host_page_size == 0) { qemu_host_page_size = qemu_real_host_page_size; } diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 69552f7..ee6bcf1 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -350,3 +350,22 @@ gint g_poll_fixed(GPollFD *fds, guint nfds, gint timeout) return num_completed; } + +size_t getpagesize(void) +{ + SYSTEM_INFO system_info; + + GetSystemInfo(&system_info); + return system_info.dwPageSize; +} + +void os_mem_prealloc(int fd, char *area, size_t memory) +{ + int i; + size_t pagesize = getpagesize(); + + memory = (memory + pagesize - 1) & -pagesize; + for (i = 0; i < memory / pagesize; i++) { + memset(area + pagesize * i, 0, 1); + } +} -- 1.9.3