From: Stefan Hajnoczi <stefanha@gmail.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org,
Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 06/12] linux-user: Remove #if 0'd cpu_get_real_ticks() definition
Date: Fri, 14 Sep 2012 09:42:20 +0100 [thread overview]
Message-ID: <1347612146-5407-7-git-send-email-stefanha@gmail.com> (raw)
In-Reply-To: <1347612146-5407-1-git-send-email-stefanha@gmail.com>
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(-)
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
next prev parent reply other threads:[~2012-09-14 8:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 8:42 [Qemu-devel] [PULL 00/12] Trivial patches for 16 August to 14 September 2012 Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 01/12] srp: Don't use QEMU_PACKED for single elements of a structured type Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 02/12] Spelling fixes in comments and documentation Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 03/12] Fix spelling (licenced -> licensed) in GPL Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 04/12] Spelling fixes in comments and macro names (ressource -> resource) Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 05/12] ui: Fix spelling in comment " Stefan Hajnoczi
2012-09-14 8:42 ` Stefan Hajnoczi [this message]
2012-09-14 9:31 ` [Qemu-devel] [PATCH 06/12] linux-user: Remove #if 0'd cpu_get_real_ticks() definition Riku Voipio
2012-09-14 8:42 ` [Qemu-devel] [PATCH 07/12] Fix copy&paste typos in documentation comments Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 08/12] console: Clean up bytes per pixel calculation Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 09/12] qapi: Fix enumeration typo error Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 10/12] kvm: Fix warning from static code analysis Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 11/12] arch_init.c: add missing '%' symbols before PRIu64 in debug printfs Stefan Hajnoczi
2012-09-14 8:42 ` [Qemu-devel] [PATCH 12/12] configure: fix seccomp check Stefan Hajnoczi
2012-09-17 18:20 ` [Qemu-devel] [PULL 00/12] Trivial patches for 16 August to 14 September 2012 Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1347612146-5407-7-git-send-email-stefanha@gmail.com \
--to=stefanha@gmail.com \
--cc=aliguori@us.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).