qemu-log: cleanup

[qemu.git] / qemu-timer.h

diff --git a/qemu-timer.h b/qemu-timer.h
index 661bbe76b2ea3a90c21da44d07154022e3b06b6c..f8af595f133cbee235dd3ff97fc6127fb7cba3f7 100644 (file)
--- a/qemu-timer.h
+++ b/qemu-timer.h
@@ -4,11 +4,9 @@
 #include "qemu-common.h"
 #include "main-loop.h"
 #include "notify.h"
 #include "qemu-common.h"
 #include "main-loop.h"
 #include "notify.h"

-#include <time.h>
-#include <sys/time.h>

 
 

-#ifdef _WIN32
-#include <windows.h>
+#ifdef __FreeBSD__
+#include <sys/param.h>

 #endif
 
 /* timers */
 #endif
 
 /* timers */


@@ -42,7 +40,7 @@ int64_t qemu_get_clock_ns(QEMUClock *clock);
 int64_t qemu_clock_has_timers(QEMUClock *clock);
 int64_t qemu_clock_expired(QEMUClock *clock);
 int64_t qemu_clock_deadline(QEMUClock *clock);
 int64_t qemu_clock_has_timers(QEMUClock *clock);
 int64_t qemu_clock_expired(QEMUClock *clock);
 int64_t qemu_clock_deadline(QEMUClock *clock);

-void qemu_clock_enable(QEMUClock *clock, int enabled);
+void qemu_clock_enable(QEMUClock *clock, bool enabled);

 void qemu_clock_warp(QEMUClock *clock);
 
 void qemu_register_clock_reset_notifier(QEMUClock *clock, Notifier *notifier);
 void qemu_clock_warp(QEMUClock *clock);
 
 void qemu_register_clock_reset_notifier(QEMUClock *clock, Notifier *notifier);


@@ -55,15 +53,13 @@ void qemu_free_timer(QEMUTimer *ts);
 void qemu_del_timer(QEMUTimer *ts);
 void qemu_mod_timer_ns(QEMUTimer *ts, int64_t expire_time);
 void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time);
 void qemu_del_timer(QEMUTimer *ts);
 void qemu_mod_timer_ns(QEMUTimer *ts, int64_t expire_time);
 void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time);

-int qemu_timer_pending(QEMUTimer *ts);
-int qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time);
+bool qemu_timer_pending(QEMUTimer *ts);
+bool qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time);

 uint64_t qemu_timer_expire_time_ns(QEMUTimer *ts);
 
 void qemu_run_timers(QEMUClock *clock);
 void qemu_run_all_timers(void);
 uint64_t qemu_timer_expire_time_ns(QEMUTimer *ts);
 
 void qemu_run_timers(QEMUClock *clock);
 void qemu_run_all_timers(void);

-int qemu_alarm_pending(void);

 void configure_alarms(char const *opt);
 void configure_alarms(char const *opt);

-int qemu_calculate_timeout(void);

 void init_clocks(void);
 int init_timer_alarm(void);
 
 void init_clocks(void);
 int init_timer_alarm(void);