Patchwork [06/12] linux-user: Remove #if 0'd cpu_get_real_ticks() definition

login
register
mail settings
Submitter Stefan Hajnoczi
Date Sept. 14, 2012, 8:42 a.m.
Message ID <1347612146-5407-7-git-send-email-stefanha@gmail.com>
Download mbox | patch
Permalink /patch/183848/
State New
Headers show

Comments

Stefan Hajnoczi - Sept. 14, 2012, 8:42 a.m.
From: Peter Maydell <peter.maydell@linaro.org>

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>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 linux-user/main.c |   13 -------------
 1 file changed, 13 deletions(-)
Riku Voipio - Sept. 14, 2012, 9:31 a.m.
On Fri, Sep 14, 2012 at 09:42:20AM +0100, Stefan Hajnoczi wrote:
> From: Peter Maydell <peter.maydell@linaro.org>
> 
> 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>
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Acked-by: Riku Voipio <riku.voipio@linaro.org>

> ---
>  linux-user/main.c |   13 -------------
>  1 file changed, 13 deletions(-)
> 
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 1a1c661..e84a18c 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.  */
> -- 
> 1.7.10.4
>

Patch

diff --git a/linux-user/main.c b/linux-user/main.c
index 1a1c661..e84a18c 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.  */