| Message ID | 20190823194927.23278-5-dmitry.fomichev@wdc.com |
|---|---|
| State | New |
| Headers | show |
| Series | virtio/block: handle zoned backing devices | expand |
On Fri, Aug 23, 2019 at 03:49:27PM -0400, Dmitry Fomichev wrote: > diff --git a/block/file-posix.c b/block/file-posix.c > index d9f2fc5e46..090e7c4d2f 100644 > --- a/block/file-posix.c > +++ b/block/file-posix.c > @@ -2884,6 +2884,20 @@ static int raw_check_perm(BlockDriverState *bs, uint64_t perm, uint64_t shared, > goto fail; > } > } > + > + /* > + * If we are opening a zoned block device, check if the backend > + * driver can properly handle such devices, abort if not. > + */ > + if (bdrv_is_zoned(bs) && > + (shared & BLK_PERM_SUPPORT_ZONED) && > + !(perm & BLK_PERM_SUPPORT_ZONED)) { > + error_setg(errp, > + "block backend driver doesn't support HM zoned devices"); Spelling out "host-managed" would be helpful in the error message. Web search results for "hm zoned" and "hm zoned devices" aren't great, whereas "host-managed zoned" brings up the T10 page. > + ret = -ENOTSUP; > + goto fail; > + } > + > return 0; > > fail: > diff --git a/hw/block/fdc.c b/hw/block/fdc.c > index c5f41b3eb6..673a8b39bc 100644 > --- a/hw/block/fdc.c > +++ b/hw/block/fdc.c > @@ -570,7 +570,7 @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp) > dev->conf.werror = BLOCKDEV_ON_ERROR_AUTO; > > if (!blkconf_apply_backend_options(&dev->conf, read_only, false, false, > - errp)) { > + errp)) { Please squash this whitespace change into the previous patch where the false argument was first introduced.
diff --git a/block/file-posix.c b/block/file-posix.c index d9f2fc5e46..090e7c4d2f 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2884,6 +2884,20 @@ static int raw_check_perm(BlockDriverState *bs, uint64_t perm, uint64_t shared, goto fail; } } + + /* + * If we are opening a zoned block device, check if the backend + * driver can properly handle such devices, abort if not. + */ + if (bdrv_is_zoned(bs) && + (shared & BLK_PERM_SUPPORT_ZONED) && + !(perm & BLK_PERM_SUPPORT_ZONED)) { + error_setg(errp, + "block backend driver doesn't support HM zoned devices"); + ret = -ENOTSUP; + goto fail; + } + return 0; fail: diff --git a/hw/block/fdc.c b/hw/block/fdc.c index c5f41b3eb6..673a8b39bc 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -570,7 +570,7 @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp) dev->conf.werror = BLOCKDEV_ON_ERROR_AUTO; if (!blkconf_apply_backend_options(&dev->conf, read_only, false, false, - errp)) { + errp)) { return; }
Abort opening a zoned device as a raw file in case the chosen block backend driver lacks proper support for this type of storage. Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com> --- block/file-posix.c | 14 ++++++++++++++ hw/block/fdc.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-)