From patchwork Fri Oct 15 14:05:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 67961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B7092B70E3 for ; Sat, 16 Oct 2010 01:32:14 +1100 (EST) Received: from localhost ([127.0.0.1]:36345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6lKN-0004Wi-7e for incoming@patchwork.ozlabs.org; Fri, 15 Oct 2010 10:32:11 -0400 Received: from [140.186.70.92] (port=38473 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6l9u-00046b-S5 for qemu-devel@nongnu.org; Fri, 15 Oct 2010 10:21:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P6kv5-0007k5-BK for qemu-devel@nongnu.org; Fri, 15 Oct 2010 10:06:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P6kv5-0007jz-3s for qemu-devel@nongnu.org; Fri, 15 Oct 2010 10:06:03 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9FE62Oa031141 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 15 Oct 2010 10:06:02 -0400 Received: from localhost6.localdomain6 (ovpn-113-85.phx2.redhat.com [10.3.113.85]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id o9FE5tSo014808 for ; Fri, 15 Oct 2010 10:06:01 -0400 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Fri, 15 Oct 2010 16:05:49 +0200 Message-Id: <1287151553-16894-6-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1287151553-16894-1-git-send-email-Jes.Sorensen@redhat.com> References: <1287151553-16894-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 5/9] Move qemu_gettimeofday() to OS specific files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen In addition add sysemu.h includes to file requiring a prototype for ffs() Signed-off-by: Jes Sorensen --- hw/bt-sdp.c | 1 + os-win32-lib.c | 27 +++++++++++++++++++++++++++ osdep.c | 31 ------------------------------- osdep.h | 15 --------------- posix-aio-compat.c | 1 + qemu-img.c | 1 + qemu-os-posix.h | 3 +++ qemu-os-win32.h | 9 +++++++++ qemu-tool.c | 1 + 9 files changed, 43 insertions(+), 46 deletions(-) diff --git a/hw/bt-sdp.c b/hw/bt-sdp.c index cc0bf2f..6344da2 100644 --- a/hw/bt-sdp.c +++ b/hw/bt-sdp.c @@ -19,6 +19,7 @@ #include "qemu-common.h" #include "bt.h" +#include "sysemu.h" struct bt_l2cap_sdp_state_s { struct bt_l2cap_conn_params_s *channel; diff --git a/os-win32-lib.c b/os-win32-lib.c index e7419e5..b5b6def 100644 --- a/os-win32-lib.c +++ b/os-win32-lib.c @@ -90,3 +90,30 @@ int inet_aton(const char *cp, struct in_addr *ia) void qemu_set_cloexec(int fd) { } + +/* mingw32 needs ffs for compilations without optimization. */ +int ffs(int i) +{ + /* Use gcc's builtin ffs. */ + return __builtin_ffs(i); +} + +/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */ +#define _W32_FT_OFFSET (116444736000000000ULL) + +int qemu_gettimeofday(qemu_timeval *tp) +{ + union { + unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */ + FILETIME ft; + } _now; + + if(tp) { + GetSystemTimeAsFileTime (&_now.ft); + tp->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL ); + tp->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL); + } + /* Always return 0 as per Open Group Base Specifications Issue 6. + Do not set errno on error. */ + return 0; +} diff --git a/osdep.c b/osdep.c index 695c460..4b6b246 100644 --- a/osdep.c +++ b/osdep.c @@ -126,37 +126,6 @@ int qemu_create_pidfile(const char *filename) return 0; } -#ifdef _WIN32 - -/* mingw32 needs ffs for compilations without optimization. */ -int ffs(int i) -{ - /* Use gcc's builtin ffs. */ - return __builtin_ffs(i); -} - -/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */ -#define _W32_FT_OFFSET (116444736000000000ULL) - -int qemu_gettimeofday(qemu_timeval *tp) -{ - union { - unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */ - FILETIME ft; - } _now; - - if(tp) - { - GetSystemTimeAsFileTime (&_now.ft); - tp->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL ); - tp->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL); - } - /* Always return 0 as per Open Group Base Specifications Issue 6. - Do not set errno on error. */ - return 0; -} -#endif /* _WIN32 */ - /* * Opens a file with FD_CLOEXEC set diff --git a/osdep.h b/osdep.h index 6716281..8bd30d7 100644 --- a/osdep.h +++ b/osdep.h @@ -127,19 +127,4 @@ int qemu_madvise(void *addr, size_t len, int advice); int qemu_create_pidfile(const char *filename); -#ifdef _WIN32 -int ffs(int i); - -int setenv(const char *name, const char *value, int overwrite); - -typedef struct { - long tv_sec; - long tv_usec; -} qemu_timeval; -int qemu_gettimeofday(qemu_timeval *tp); -#else -typedef struct timeval qemu_timeval; -#define qemu_gettimeofday(tp) gettimeofday(tp, NULL); -#endif /* !_WIN32 */ - #endif diff --git a/posix-aio-compat.c b/posix-aio-compat.c index 7b862b5..fa5494d 100644 --- a/posix-aio-compat.c +++ b/posix-aio-compat.c @@ -24,6 +24,7 @@ #include "qemu-queue.h" #include "osdep.h" +#include "sysemu.h" #include "qemu-common.h" #include "trace.h" #include "block_int.h" diff --git a/qemu-img.c b/qemu-img.c index 578b8eb..5b2bed3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -24,6 +24,7 @@ #include "qemu-common.h" #include "qemu-option.h" #include "osdep.h" +#include "sysemu.h" #include "block_int.h" #include diff --git a/qemu-os-posix.h b/qemu-os-posix.h index ed5c058..609494e 100644 --- a/qemu-os-posix.h +++ b/qemu-os-posix.h @@ -36,4 +36,7 @@ void os_setup_signal_handling(void); void os_daemonize(void); void os_setup_post(void); +typedef struct timeval qemu_timeval; +#define qemu_gettimeofday(tp) gettimeofday(tp, NULL); + #endif diff --git a/qemu-os-win32.h b/qemu-os-win32.h index c63778d..c2c2c20 100644 --- a/qemu-os-win32.h +++ b/qemu-os-win32.h @@ -52,4 +52,13 @@ static inline void os_set_proc_name(const char *dummy) {} # define EPROTONOSUPPORT EINVAL #endif +int ffs(int i); +int setenv(const char *name, const char *value, int overwrite); + +typedef struct { + long tv_sec; + long tv_usec; +} qemu_timeval; +int qemu_gettimeofday(qemu_timeval *tp); + #endif diff --git a/qemu-tool.c b/qemu-tool.c index b39af86..2f3db30 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -15,6 +15,7 @@ #include "monitor.h" #include "qemu-timer.h" #include "qemu-log.h" +#include "sysemu.h" #include