diff options
| author | Fam Zheng | 2016-06-01 03:52:23 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2016-06-07 15:40:51 +0200 |
| commit | c8a9fd80719e63615dac12e3625223fb54aa8430 (patch) | |
| tree | 98ed133c8e23c47d3992a56ab934e1a870fc7ab5 | |
| parent | block: Move BlockRequest type to io.c (diff) | |
| download | qemu-c8a9fd80719e63615dac12e3625223fb54aa8430.tar.gz qemu-c8a9fd80719e63615dac12e3625223fb54aa8430.tar.xz qemu-c8a9fd80719e63615dac12e3625223fb54aa8430.zip | |
block: Drop bdrv_ioctl_bh_cb
Similar to the "!drv || !drv->bdrv_aio_ioctl" case above, here it is
okay to set co.ret and return. As pointed out by Paolo, a BH will be
created as necessary by the caller (bdrv_co_maybe_schedule_bh).
Besides, as pointed out by Kevin, "data" was leaked before.
Reported-by: Kevin Wolf <kwolf@redhat.com>
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20160601015223.19277-1-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | block/io.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/block/io.c b/block/io.c index a2fba6738a..6070e773b7 100644 --- a/block/io.c +++ b/block/io.c @@ -2327,19 +2327,6 @@ int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) return rwco.ret; } -typedef struct { - CoroutineIOCompletion *co; - QEMUBH *bh; -} BdrvIoctlCompletionData; - -static void bdrv_ioctl_bh_cb(void *opaque) -{ - BdrvIoctlCompletionData *data = opaque; - - bdrv_co_io_em_complete(data->co, -ENOTSUP); - qemu_bh_delete(data->bh); -} - static int bdrv_co_do_ioctl(BlockDriverState *bs, int req, void *buf) { BlockDriver *drv = bs->drv; @@ -2357,11 +2344,8 @@ static int bdrv_co_do_ioctl(BlockDriverState *bs, int req, void *buf) acb = drv->bdrv_aio_ioctl(bs, req, buf, bdrv_co_io_em_complete, &co); if (!acb) { - BdrvIoctlCompletionData *data = g_new(BdrvIoctlCompletionData, 1); - data->bh = aio_bh_new(bdrv_get_aio_context(bs), - bdrv_ioctl_bh_cb, data); - data->co = &co; - qemu_bh_schedule(data->bh); + co.ret = -ENOTSUP; + goto out; } qemu_coroutine_yield(); out: |