block: Clean up includes

[mirror_qemu.git] / block / qed-gencb.c

diff --git a/block/qed-gencb.c b/block/qed-gencb.c
index 1513dc6f79e1eb1b7c607276930fdad8857f1b8f..faf8ecc84068a908c25d83609909ed93dd56b483 100644 (file)
--- a/block/qed-gencb.c
+++ b/block/qed-gencb.c
@@ -11,11 +11,12 @@
  *
  */
 
+#include "qemu/osdep.h"
 #include "qed.h"
 
-void *gencb_alloc(size_t len, BlockDriverCompletionFunc *cb, void *opaque)
+void *gencb_alloc(size_t len, BlockCompletionFunc *cb, void *opaque)
 {
-    GenericCB *gencb = qemu_malloc(len);
+    GenericCB *gencb = g_malloc(len);
     gencb->cb = cb;
     gencb->opaque = opaque;
     return gencb;
@@ -24,9 +25,9 @@ void *gencb_alloc(size_t len, BlockDriverCompletionFunc *cb, void *opaque)
 void gencb_complete(void *opaque, int ret)
 {
     GenericCB *gencb = opaque;
-    BlockDriverCompletionFunc *cb = gencb->cb;
+    BlockCompletionFunc *cb = gencb->cb;
     void *user_opaque = gencb->opaque;
 
-    qemu_free(gencb);
+    g_free(gencb);
     cb(user_opaque, ret);
 }