commit 533a8cf3506172fe1966abc6875c65494378321e
author Alex Bligh <alex@alex.org.uk> Wed Aug 21 16:02:51 2013 +0100
committer Stefan Hajnoczi <stefanha@redhat.com> Thu Aug 22 19:10:28 2013 +0200
tree 3033ba3d8b28536078c07900b342d862ba7c21ba
parent d5541d86806acc2e1a3cf9e1402370ba884e9fe1

aio / timers: aio_ctx_prepare sets timeout from AioContext timers

Calculate the timeout in aio_ctx_prepare taking into account
the timers attached to the AioContext.

Alter aio_ctx_check similarly.

Signed-off-by: Alex Bligh <alex@alex.org.uk>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

async.c

diff --git a/async.c b/async.c
index cff0ab9..5fb3fa6 100644
--- a/async.c
+++ b/async.c
@@ -150,7 +150,10 @@
 {
     AioContext *ctx = (AioContext *) source;
     QEMUBH *bh;
+    int deadline;
 
+    /* We assume there is no timeout already supplied */
+    *timeout = -1;
     for (bh = ctx->first_bh; bh; bh = bh->next) {
         if (!bh->deleted && bh->scheduled) {
             if (bh->idle) {
@@ -166,6 +169,14 @@
         }
     }
 
+    deadline = qemu_timeout_ns_to_ms(timerlistgroup_deadline_ns(&ctx->tlg));
+    if (deadline == 0) {
+        *timeout = 0;
+        return true;
+    } else {
+        *timeout = qemu_soonest_timeout(*timeout, deadline);
+    }
+
     return false;
 }
 
@@ -180,7 +191,7 @@
             return true;
 	}
     }
-    return aio_pending(ctx);
+    return aio_pending(ctx) || (timerlistgroup_deadline_ns(&ctx->tlg) == 0);
 }
 
 static gboolean