summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2011-03-11 18:27:26 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2011-03-21 09:23:23 +0100
commit6d5ad9bf9318b1555d5567cd7e1760a51a55ebf8 (patch)
tree9f9647e8c57da7f5840942370b6ed8a9e0749c98
parent4a998740b22aa673ea475060c787da7c545588cf (diff)
downloadfocaccia-qemu-6d5ad9bf9318b1555d5567cd7e1760a51a55ebf8.tar.gz
focaccia-qemu-6d5ad9bf9318b1555d5567cd7e1760a51a55ebf8.zip
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>
-rw-r--r--qemu-timer.c17
-rw-r--r--qemu-timer.h1
2 files changed, 0 insertions, 18 deletions
diff --git a/qemu-timer.c b/qemu-timer.c
index ec8b4466da..50f1943afd 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 0ea77fb767..75d567578b 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);