qdev-properties-system.c: Allow vlan or netdev for -device, not both

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

diff --git a/block/qed-gencb.c b/block/qed-gencb.c
index 1513dc6f79e1eb1b7c607276930fdad8857f1b8f..7d7ac1ffc8e0a1497c76519c04be383d1d8ad3af 100644 (file)
--- a/block/qed-gencb.c
+++ b/block/qed-gencb.c
@@ -15,7 +15,7 @@
 
 void *gencb_alloc(size_t len, BlockDriverCompletionFunc *cb, void *opaque)
 {
-    GenericCB *gencb = qemu_malloc(len);
+    GenericCB *gencb = g_malloc(len);
     gencb->cb = cb;
     gencb->opaque = opaque;
     return gencb;
@@ -27,6 +27,6 @@ void gencb_complete(void *opaque, int ret)
     BlockDriverCompletionFunc *cb = gencb->cb;
     void *user_opaque = gencb->opaque;
 
-    qemu_free(gencb);
+    g_free(gencb);
     cb(user_opaque, ret);
 }