* [Qemu-devel] [PATCH] linux-user: Remove #if 0'd cpu_get_real_ticks() definition
@ 2012-08-20 13:03 Peter Maydell
2012-08-24 10:56 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
0 siblings, 1 reply; 2+ messages in thread
From: Peter Maydell @ 2012-08-20 13:03 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Riku Voipio, patches
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(-)
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. */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH] linux-user: Remove #if 0'd cpu_get_real_ticks() definition
2012-08-20 13:03 [Qemu-devel] [PATCH] linux-user: Remove #if 0'd cpu_get_real_ticks() definition Peter Maydell
@ 2012-08-24 10:56 ` Stefan Hajnoczi
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Hajnoczi @ 2012-08-24 10:56 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-trivial, Riku Voipio, qemu-devel, patches
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-24 10:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-20 13:03 [Qemu-devel] [PATCH] linux-user: Remove #if 0'd cpu_get_real_ticks() definition Peter Maydell
2012-08-24 10:56 ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).