[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 1/4] block: Pass bdrv_* methods to bs->file by de
From: |
Manos Pitsidianakis |
Subject: |
[Qemu-block] [PATCH v3 1/4] block: Pass bdrv_* methods to bs->file by default |
Date: |
Tue, 4 Jul 2017 11:40:56 +0300 |
The following functions fail if bs->drv does not implement them:
bdrv_probe_blocksizes
bdrv_probe_geometry
bdrv_truncate
bdrv_has_zero_init
bdrv_get_info
bdrv_media_changed
bdrv_eject
bdrv_lock_medium
bdrv_co_ioctl
Instead, the call should be passed to bs->file if it exists, to allow
filter drivers to support those methods without implementing them.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Manos Pitsidianakis <address@hidden>
---
block.c | 27 +++++++++++++++++++++++++--
block/io.c | 5 +++++
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 69439628..8a122142 100644
--- a/block.c
+++ b/block.c
@@ -494,6 +494,8 @@ int bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes
*bsz)
if (drv && drv->bdrv_probe_blocksizes) {
return drv->bdrv_probe_blocksizes(bs, bsz);
+ } else if (drv && bs->file && bs->file->bs) {
+ return bdrv_probe_blocksizes(bs->file->bs, bsz);
}
return -ENOTSUP;
@@ -511,6 +513,8 @@ int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry
*geo)
if (drv && drv->bdrv_probe_geometry) {
return drv->bdrv_probe_geometry(bs, geo);
+ } else if (drv && bs->file && bs->file->bs) {
+ return bdrv_probe_geometry(bs->file->bs, geo);
}
return -ENOTSUP;
@@ -3406,11 +3410,15 @@ int bdrv_truncate(BdrvChild *child, int64_t offset,
Error **errp)
assert(child->perm & BLK_PERM_RESIZE);
+ /* if bs->drv == NULL, bs is closed, so there's nothing to do here */
if (!drv) {
error_setg(errp, "No medium inserted");
return -ENOMEDIUM;
}
if (!drv->bdrv_truncate) {
+ if (bs->file && bs->file->bs) {
+ return bdrv_truncate(bs->file, offset, errp);
+ }
error_setg(errp, "Image format driver does not support resize");
return -ENOTSUP;
}
@@ -3778,6 +3786,9 @@ int bdrv_has_zero_init(BlockDriverState *bs)
if (bs->drv->bdrv_has_zero_init) {
return bs->drv->bdrv_has_zero_init(bs);
}
+ if (bs->file && bs->file->bs) {
+ return bdrv_has_zero_init(bs->file->bs);
+ }
/* safe default */
return 0;
@@ -3832,10 +3843,16 @@ void bdrv_get_backing_filename(BlockDriverState *bs,
int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
{
BlockDriver *drv = bs->drv;
- if (!drv)
+ /* if bs->drv == NULL, bs is closed, so there's nothing to do here */
+ if (!drv) {
return -ENOMEDIUM;
- if (!drv->bdrv_get_info)
+ }
+ if (!drv->bdrv_get_info) {
+ if (bs->file && bs->file->bs) {
+ return bdrv_get_info(bs->file->bs, bdi);
+ }
return -ENOTSUP;
+ }
memset(bdi, 0, sizeof(*bdi));
return drv->bdrv_get_info(bs, bdi);
}
@@ -4205,6 +4222,8 @@ int bdrv_media_changed(BlockDriverState *bs)
if (drv && drv->bdrv_media_changed) {
return drv->bdrv_media_changed(bs);
+ } else if (drv && bs->file && bs->file->bs) {
+ return bdrv_media_changed(bs->file->bs);
}
return -ENOTSUP;
}
@@ -4218,6 +4237,8 @@ void bdrv_eject(BlockDriverState *bs, bool eject_flag)
if (drv && drv->bdrv_eject) {
drv->bdrv_eject(bs, eject_flag);
+ } else if (drv && bs->file && bs->file->bs) {
+ bdrv_eject(bs->file->bs, eject_flag);
}
}
@@ -4233,6 +4254,8 @@ void bdrv_lock_medium(BlockDriverState *bs, bool locked)
if (drv && drv->bdrv_lock_medium) {
drv->bdrv_lock_medium(bs, locked);
+ } else if (drv && bs->file && bs->file->bs) {
+ bdrv_lock_medium(bs->file->bs, locked);
}
}
diff --git a/block/io.c b/block/io.c
index 5c146b5a..c22a9bf2 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2425,6 +2425,11 @@ int bdrv_co_ioctl(BlockDriverState *bs, int req, void
*buf)
};
BlockAIOCB *acb;
+ if (drv && !drv->bdrv_aio_ioctl && !drv->bdrv_co_ioctl &&
+ bs->file && bs->file->bs) {
+ return bdrv_co_ioctl(bs->file->bs, req, buf);
+ }
+
bdrv_inc_in_flight(bs);
if (!drv || (!drv->bdrv_aio_ioctl && !drv->bdrv_co_ioctl)) {
co.ret = -ENOTSUP;
--
2.11.0