From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 11 Mar 2011 17:27:26 +0000 (+0100)
Subject: remove qemu_get_clock
X-Git-Tag: v0.15.0-rc0~691^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d5ad9bf9318b1555d5567cd7e1760a51a55ebf8;p=thirdparty%2Fqemu.git

remove qemu_get_clock

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>
---

diff --git a/qemu-timer.c b/qemu-timer.c
index ec8b4466dab..50f1943afdd 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -506,23 +506,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 0ea77fb7676..75d567578b3 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);