Merge remote-tracking branch 'afaerber/qom-cpu' into staging

[qemu.git] / aio-posix.c

diff --git a/aio-posix.c b/aio-posix.c
index 05cc84e121283edc6c9135ee5fcbacadb471985b..fe4dbb4523e6fcc8272ff5f19c2ef07c9160fd25 100644 (file)
--- a/aio-posix.c
+++ b/aio-posix.c
@@ -14,9 +14,9 @@
  */
 
 #include "qemu-common.h"
-#include "block.h"
-#include "qemu-queue.h"
-#include "qemu_socket.h"
+#include "block/block.h"
+#include "qemu/queue.h"
+#include "qemu/sockets.h"
 
 struct AioHandler
 {
@@ -264,5 +264,6 @@ bool aio_poll(AioContext *ctx, bool blocking)
         }
     }
 
-    return progress;
+    assert(progress || busy);
+    return true;
 }