Patchwork linux-user: Remove #if 0'd cpu_get_real_ticks() definition

login
register
mail settings
Submitter Peter Maydell
Date Aug. 20, 2012, 1:03 p.m.
Message ID <1345467816-10893-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/178770/
State New
Headers show

Comments

Peter Maydell - Aug. 20, 2012, 1:03 p.m.
Remove the cpu_get_real_ticks() definition from linux-user/main.c.
This has been disabled via #if 0 and unused since commit 1dce7c3c22
in 2006; the definitions we actually use are in qemu-timer.h.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 linux-user/main.c |   13 -------------
 1 file changed, 13 deletions(-)
Stefan Hajnoczi - Aug. 24, 2012, 10:56 a.m.
On Mon, Aug 20, 2012 at 02:03:36PM +0100, Peter Maydell wrote:
> Remove the cpu_get_real_ticks() definition from linux-user/main.c.
> This has been disabled via #if 0 and unused since commit 1dce7c3c22
> in 2006; the definitions we actually use are in qemu-timer.h.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  linux-user/main.c |   13 -------------
>  1 file changed, 13 deletions(-)

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan

Patch

diff --git a/linux-user/main.c b/linux-user/main.c
index 7dea084..0659ae8 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -89,19 +89,6 @@  int cpu_get_pic_interrupt(CPUX86State *env)
 }
 #endif
 
-/* timers for rdtsc */
-
-#if 0
-
-static uint64_t emu_time;
-
-int64_t cpu_get_real_ticks(void)
-{
-    return emu_time++;
-}
-
-#endif
-
 #if defined(CONFIG_USE_NPTL)
 /***********************************************************/
 /* Helper routines for implementing atomic operations.  */