Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20160704-1' into staging

[qemu.git] / include / qemu / ratelimit.h

diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h
index c6ac281141866ce55e69c5d97abe95fe3dc643d0..d413a4a696b78f79628e459395bb87dd35d681c1 100644 (file)
--- a/include/qemu/ratelimit.h
+++ b/include/qemu/ratelimit.h
@@ -23,7 +23,7 @@ typedef struct {
 
 static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n)
 {
-    int64_t now = qemu_get_clock_ns(rt_clock);
+    int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
 
     if (limit->next_slice_time < now) {
         limit->next_slice_time = now + limit->slice_ns;
@@ -42,7 +42,7 @@ static inline void ratelimit_set_speed(RateLimit *limit, uint64_t speed,
                                        uint64_t slice_ns)
 {
     limit->slice_ns = slice_ns;
-    limit->slice_quota = ((double)speed * 1000000000ULL) / slice_ns;
+    limit->slice_quota = ((double)speed * slice_ns)/1000000000ULL;
 }
 
 #endif