commit cc19d3eeef59cbd354c1c618f7421d6fe5e0a098
author Ot ten Thije <ottenthije@google.com> Mon Jul 19 13:10:18 2010 +0100
committer Ot ten Thije <ottenthije@google.com> Wed Jul 28 09:39:07 2010 +0100
tree 3e5d5b38c9be72c8013b1efbd1897e6792110795
parent 2fa5173bd1ce7341c50adac676a317945f0969c7

Fixed infinite loop in qemu_aio_wait() affecting savevm.

Solved by porting a check on AIO operations from QEMU mainline
(in mainline commit a76bab4952a1539266490295fb50b78802c467c2).

Change-Id: I1d2011776f7cb90d81e36a5cf9381ef956d9a5b9

aio-android.c

diff --git a/aio-android.c b/aio-android.c
index 53f7a6d..2b67579 100644
--- a/aio-android.c
+++ b/aio-android.c
@@ -151,6 +151,11 @@
 
         walking_handlers = 0;
 
+        /* No AIO operations? Get us out of here */
+        if (!iolooper_has_operations(looper)) {
+            break;
+        }
+
         /* wait until next event */
         ret = iolooper_wait(looper, -1);