[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/37] block: Fail requests to empty BlockBackend
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 16/37] block: Fail requests to empty BlockBackend |
Date: |
Mon, 9 Feb 2015 12:11:16 -0500 |
If there is no BlockDriverState in a BlockBackend or if the tray of the
guest device is open, fail all requests (where that is possible) with
-ENOMEDIUM.
The reason the status of the guest device is taken into account is
because once the guest device's tray is opened, any request on the same
BlockBackend as the guest uses should fail. If the BDS tree is supposed
to be usable even after ejecting it from the guest, a different
BlockBackend must be used.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/block-backend.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 8206360..524cf59 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -507,7 +507,7 @@ static int blk_check_byte_request(BlockBackend *blk,
int64_t offset,
return -EIO;
}
- if (!blk_is_inserted(blk)) {
+ if (!blk_is_available(blk)) {
return -ENOMEDIUM;
}
@@ -635,6 +635,10 @@ int blk_pwrite(BlockBackend *blk, int64_t offset, const
void *buf, int count)
int64_t blk_getlength(BlockBackend *blk)
{
+ if (!blk_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
return bdrv_getlength(blk->bs);
}
@@ -645,6 +649,10 @@ void blk_get_geometry(BlockBackend *blk, uint64_t
*nb_sectors_ptr)
int64_t blk_nb_sectors(BlockBackend *blk)
{
+ if (!blk_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
return bdrv_nb_sectors(blk->bs);
}
@@ -675,6 +683,10 @@ BlockAIOCB *blk_aio_writev(BlockBackend *blk, int64_t
sector_num,
BlockAIOCB *blk_aio_flush(BlockBackend *blk,
BlockCompletionFunc *cb, void *opaque)
{
+ if (!blk_is_available(blk)) {
+ return abort_aio_request(blk, cb, opaque, -ENOMEDIUM);
+ }
+
return bdrv_aio_flush(blk->bs, cb, opaque);
}
@@ -716,12 +728,20 @@ int blk_aio_multiwrite(BlockBackend *blk, BlockRequest
*reqs, int num_reqs)
int blk_ioctl(BlockBackend *blk, unsigned long int req, void *buf)
{
+ if (!blk_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
return bdrv_ioctl(blk->bs, req, buf);
}
BlockAIOCB *blk_aio_ioctl(BlockBackend *blk, unsigned long int req, void *buf,
BlockCompletionFunc *cb, void *opaque)
{
+ if (!blk_is_available(blk)) {
+ return abort_aio_request(blk, cb, opaque, -ENOMEDIUM);
+ }
+
return bdrv_aio_ioctl(blk->bs, req, buf, cb, opaque);
}
@@ -737,11 +757,19 @@ int blk_co_discard(BlockBackend *blk, int64_t sector_num,
int nb_sectors)
int blk_co_flush(BlockBackend *blk)
{
+ if (!blk_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
return bdrv_co_flush(blk->bs);
}
int blk_flush(BlockBackend *blk)
{
+ if (!blk_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
return bdrv_flush(blk->bs);
}
@@ -858,6 +886,11 @@ void blk_set_enable_write_cache(BlockBackend *blk, bool
wce)
void blk_invalidate_cache(BlockBackend *blk, Error **errp)
{
+ if (!blk->bs) {
+ error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, blk->name);
+ return;
+ }
+
bdrv_invalidate_cache(blk->bs, errp);
}
@@ -1013,6 +1046,10 @@ int blk_write_compressed(BlockBackend *blk, int64_t
sector_num,
int blk_truncate(BlockBackend *blk, int64_t offset)
{
+ if (!blk_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
return bdrv_truncate(blk->bs, offset);
}
@@ -1029,11 +1066,19 @@ int blk_discard(BlockBackend *blk, int64_t sector_num,
int nb_sectors)
int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,
int64_t pos, int size)
{
+ if (!blk_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
return bdrv_save_vmstate(blk->bs, buf, pos, size);
}
int blk_load_vmstate(BlockBackend *blk, uint8_t *buf, int64_t pos, int size)
{
+ if (!blk_is_available(blk)) {
+ return -ENOMEDIUM;
+ }
+
return bdrv_load_vmstate(blk->bs, buf, pos, size);
}
--
2.1.0
- [Qemu-devel] [PATCH v2 08/37] block: Make bdrv_is_inserted() recursive, (continued)
- [Qemu-devel] [PATCH v2 08/37] block: Make bdrv_is_inserted() recursive, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 10/37] block: Move guest_block_size into BlockBackend, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 09/37] block/quorum: Implement bdrv_is_inserted(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 11/37] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 17/37] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 14/37] block: Add BlockBackendRootState, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 18/37] blockdev: Use BB for blockdev-backup transaction, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 16/37] block: Fail requests to empty BlockBackend,
Max Reitz <=
- [Qemu-devel] [PATCH v2 13/37] block: Move I/O status and error actions into BB, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 15/37] block: Make some BB functions fall back to BBRS, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 19/37] block: Add blk_insert_bs(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 21/37] blockdev: Do not create BDS for empty drive, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 24/37] block: Add blk_remove_bs(), Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 22/37] blockdev: Pull out blockdev option extraction, Max Reitz, 2015/02/09
- [Qemu-devel] [PATCH v2 34/37] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/02/09