From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYJxR-0000kO-Ao for qemu-devel@nongnu.org; Thu, 10 Apr 2014 14:44:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYJxM-0004sM-4t for qemu-devel@nongnu.org; Thu, 10 Apr 2014 14:44:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYJxL-0004rx-Rj for qemu-devel@nongnu.org; Thu, 10 Apr 2014 14:44:12 -0400 From: Max Reitz Date: Thu, 10 Apr 2014 20:43:39 +0200 Message-Id: <1397155423-29713-9-git-send-email-mreitz@redhat.com> In-Reply-To: <1397155423-29713-1-git-send-email-mreitz@redhat.com> References: <1397155423-29713-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 08/12] block/json: Add ioctl etc. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , Max Reitz Add passthrough functions for bdrv_aio_ioctl(), bdrv_is_inserted(), bdrv_media_changed(), bdrv_eject(), bdrv_lock_medium() and bdrv_ioctl(). Signed-off-by: Max Reitz Reviewed-by: Benoit Canet --- block/json.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/block/json.c b/block/json.c index dfeec81..0c7d90d 100644 --- a/block/json.c +++ b/block/json.c @@ -103,6 +103,14 @@ static BlockDriverAIOCB *json_aio_discard(BlockDriverState *bs, return bdrv_aio_discard(bs->file, sector_num, nb_sectors, cb, opaque); } +static BlockDriverAIOCB *json_aio_ioctl(BlockDriverState *bs, + unsigned long int req, void *buf, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + return bdrv_aio_ioctl(bs->file, req, buf, cb, opaque); +} + static coroutine_fn int json_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, int nb_sectors, BdrvRequestFlags flags) @@ -117,6 +125,31 @@ static coroutine_fn int64_t json_co_get_block_status(BlockDriverState *bs, return bdrv_get_block_status(bs->file, sector_num, nb_sectors, pnum); } +static int json_is_inserted(BlockDriverState *bs) +{ + return bdrv_is_inserted(bs->file); +} + +static int json_media_changed(BlockDriverState *bs) +{ + return bdrv_media_changed(bs->file); +} + +static void json_eject(BlockDriverState *bs, bool eject_flag) +{ + bdrv_eject(bs->file, eject_flag); +} + +static void json_lock_medium(BlockDriverState *bs, bool locked) +{ + bdrv_lock_medium(bs->file, locked); +} + +static int json_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) +{ + return bdrv_ioctl(bs->file, req, buf); +} + static void json_invalidate_cache(BlockDriverState *bs, Error **errp) { return bdrv_invalidate_cache(bs->file, errp); @@ -161,10 +194,17 @@ static BlockDriver bdrv_json = { .bdrv_aio_writev = json_aio_writev, .bdrv_aio_flush = json_aio_flush, .bdrv_aio_discard = json_aio_discard, + .bdrv_aio_ioctl = json_aio_ioctl, .bdrv_co_write_zeroes = json_co_write_zeroes, .bdrv_co_get_block_status = json_co_get_block_status, + .bdrv_is_inserted = json_is_inserted, + .bdrv_media_changed = json_media_changed, + .bdrv_eject = json_eject, + .bdrv_lock_medium = json_lock_medium, + .bdrv_ioctl = json_ioctl, + .bdrv_invalidate_cache = json_invalidate_cache, .has_variable_length = true, -- 1.9.1