[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/12] block/json: Add ioctl etc.
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 08/12] block/json: Add ioctl etc. |
Date: |
Fri, 7 Mar 2014 23:55:52 +0100 |
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 <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
---
block/json.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/block/json.c b/block/json.c
index 966a5f5..f21b7e3 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)
@@ -119,6 +127,31 @@ static coroutine_fn int64_t
json_co_get_block_status(BlockDriverState *bs,
(sector_num << BDRV_SECTOR_BITS);
}
+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)
{
return bdrv_invalidate_cache(bs->file);
@@ -163,10 +196,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.0
- Re: [Qemu-devel] [PATCH v2 02/12] check-qdict: Add test for qdict_join(), (continued)
- [Qemu-devel] [PATCH v2 03/12] block: Add "has_single_child" field for drivers, Max Reitz, 2014/03/07
- [Qemu-devel] [PATCH v2 04/12] block/json: Add JSON protocol driver, Max Reitz, 2014/03/07
- [Qemu-devel] [PATCH v2 05/12] block/json: Add functions for cache control, Max Reitz, 2014/03/07
- [Qemu-devel] [PATCH v2 06/12] block/json: Add functions for writing zeroes etc., Max Reitz, 2014/03/07
- [Qemu-devel] [PATCH v2 07/12] block/json: Add bdrv_co_get_block_status(), Max Reitz, 2014/03/07
- [Qemu-devel] [PATCH v2 08/12] block/json: Add ioctl etc.,
Max Reitz <=
- [Qemu-devel] [PATCH v2 09/12] block/json: Add bdrv_get_specific_info(), Max Reitz, 2014/03/07
- [Qemu-devel] [PATCH v2 10/12] block/raw_bsd: Add bdrv_get_specific_info(), Max Reitz, 2014/03/07
- [Qemu-devel] [PATCH v2 11/12] block/qapi: Ignore filters on top for format name, Max Reitz, 2014/03/07
- [Qemu-devel] [PATCH v2 12/12] iotests: Add test for the JSON protocol, Max Reitz, 2014/03/07
- Re: [Qemu-devel] [PATCH v2 00/12] block/json: Add JSON protocol driver, Max Reitz, 2014/03/21