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

[qemu.git] / async.c

diff --git a/async.c b/async.c
index 3f0e8f367c277c760efbb2c53498c958355bc1e3..72d268ae352510c0c0ca49a43e05d197e23c0d98 100644 (file)
--- a/async.c
+++ b/async.c
@@ -23,8 +23,8 @@
  */
 
 #include "qemu-common.h"
-#include "qemu-aio.h"
-#include "main-loop.h"
+#include "block/aio.h"
+#include "qemu/main-loop.h"
 
 /***********************************************************/
 /* bottom halves (can be seen as timers which expire ASAP) */
@@ -215,8 +215,3 @@ void aio_context_unref(AioContext *ctx)
 {
     g_source_unref(&ctx->source);
 }
-
-void aio_flush(AioContext *ctx)
-{
-    while (aio_poll(ctx, true));
-}