From: Fam Zheng <famz@redhat.com>
Date: Thu, 11 Sep 2014 05:41:11 +0000 (+0800)
Subject: block: Drop bdrv_em_aiocb_info.cancel
X-Git-Tag: qemu-xen-4.6.0-rc1~189^2~51
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f600ac19027e67dd73f1adad50a67a2cdb4f3218;p=qemu-upstream-unstable.git

block: Drop bdrv_em_aiocb_info.cancel

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/block.c b/block.c
index 1ce7b9908..45d3a5ba8 100644
--- a/block.c
+++ b/block.c
@@ -4681,18 +4681,8 @@ typedef struct BlockDriverAIOCBSync {
     int is_write;
 } BlockDriverAIOCBSync;
 
-static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)
-{
-    BlockDriverAIOCBSync *acb =
-        container_of(blockacb, BlockDriverAIOCBSync, common);
-    qemu_bh_delete(acb->bh);
-    acb->bh = NULL;
-    qemu_aio_release(acb);
-}
-
 static const AIOCBInfo bdrv_em_aiocb_info = {
     .aiocb_size         = sizeof(BlockDriverAIOCBSync),
-    .cancel             = bdrv_aio_cancel_em,
 };
 
 static void bdrv_aio_bh_cb(void *opaque)