Patchwork [RFC,5/5] remove qemu_get_clock

login
register
mail settings
Submitter Paolo Bonzini
Date March 12, 2011, 5:04 p.m.
Message ID <1299949460-4387-6-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/86546/
State New
Headers show

Comments

Paolo Bonzini - March 12, 2011, 5:04 p.m.
These patches are already not doing a great service to out-of-tree
modifications to QEMU.  However, at least we can warn them by getting
rid of the old confusing functions, or otherwise causing compilation
errors.  This patch removes qemu_get_clock; the previous one changed
qemu_new_timer's signature.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qemu-timer.c |   17 -----------------
 qemu-timer.h |    1 -
 2 files changed, 0 insertions(+), 18 deletions(-)

Patch

diff --git a/qemu-timer.c b/qemu-timer.c
index 1aed535..f6e059f 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -511,23 +511,6 @@  static void qemu_run_timers(QEMUClock *clock)
     }
 }
 
-int64_t qemu_get_clock(QEMUClock *clock)
-{
-    switch(clock->type) {
-    case QEMU_CLOCK_REALTIME:
-        return get_clock() / 1000000;
-    default:
-    case QEMU_CLOCK_VIRTUAL:
-        if (use_icount) {
-            return cpu_get_icount();
-        } else {
-            return cpu_get_clock();
-        }
-    case QEMU_CLOCK_HOST:
-        return get_clock_realtime();
-    }
-}
-
 int64_t qemu_get_clock_ns(QEMUClock *clock)
 {
     switch(clock->type) {
diff --git a/qemu-timer.h b/qemu-timer.h
index 0ea77fb..75d5675 100644
--- a/qemu-timer.h
+++ b/qemu-timer.h
@@ -37,7 +37,6 @@  extern QEMUClock *vm_clock;
    the virtual clock. */
 extern QEMUClock *host_clock;
 
-int64_t qemu_get_clock(QEMUClock *clock);
 int64_t qemu_get_clock_ns(QEMUClock *clock);
 void qemu_clock_enable(QEMUClock *clock, int enabled);