From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <famz@redhat.com>,
Jeff Cody <jcody@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Max Reitz <mreitz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PATCH RESEND 15/50] block: Fail requests to empty BlockBackend
Date: Tue, 27 Jan 2015 14:45:48 -0500 [thread overview]
Message-ID: <1422387983-32153-16-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1422387983-32153-1-git-send-email-mreitz@redhat.com>
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 <mreitz@redhat.com>
---
block/block-backend.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 42 insertions(+), 1 deletion(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 62be370..4f3122a 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);
}
@@ -670,6 +674,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);
}
@@ -711,12 +719,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);
}
@@ -732,11 +748,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);
}
@@ -853,6 +877,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);
}
@@ -1003,6 +1032,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);
}
@@ -1019,11 +1052,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
next prev parent reply other threads:[~2015-01-27 19:46 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 19:45 [Qemu-devel] [PATCH RESEND 00/50] blockdev: BlockBackend and media Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 01/50] blockdev: Allow creation of BDS trees without BB Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 02/50] iotests: Only create BB if necessary Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 03/50] hw/block/fdc: Implement tray status Max Reitz
2015-01-30 21:04 ` John Snow
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 04/50] hw/usb-storage: Check whether BB is inserted Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 05/50] block: Fix BB AIOCB AioContext without BDS Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 06/50] block: Add blk_is_available() Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 07/50] block: Make bdrv_is_inserted() recursive Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 08/50] block/quorum: Implement bdrv_is_inserted() Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 09/50] block: Move guest_block_size into BlockBackend Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 10/50] block: Remove wr_highest_offset from BlockAcctStats Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 11/50] block: Move BlockAcctStats into BlockBackend Max Reitz
2015-01-27 20:31 ` Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 12/50] block: Move I/O status and error actions into BB Max Reitz
2015-01-27 20:51 ` Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 13/50] block: Add BlockBackendRootState Max Reitz
2015-01-27 21:03 ` Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 14/50] block: Make some BB functions fall back to BBRS Max Reitz
2015-01-27 21:15 ` Eric Blake
2015-01-27 19:45 ` Max Reitz [this message]
2015-01-27 21:24 ` [Qemu-devel] [PATCH RESEND 15/50] block: Fail requests to empty BlockBackend Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 16/50] block: Prepare remaining BB functions for NULL BDS Max Reitz
2015-01-27 21:36 ` Eric Blake
2015-01-27 21:39 ` Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 17/50] block: Respect empty BB in bdrv_lookup_bs() Max Reitz
2015-01-27 21:56 ` Eric Blake
2015-01-28 18:31 ` John Snow
2015-01-28 18:35 ` Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 18/50] block: Respect empty BB in bdrv_query_info() Max Reitz
2015-01-27 21:57 ` Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 19/50] blockdev: Use BlockBackend for blockdev-backup TA Max Reitz
2015-01-27 21:59 ` Eric Blake
2015-01-27 22:13 ` Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 20/50] blockdev: Check blk_is_available() in sn-del-int-sync Max Reitz
2015-01-27 22:10 ` Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 21/50] blockdev: Check BB validity in internal snapshot TA Max Reitz
2015-01-27 23:02 ` Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 22/50] blockdev: Check BB validity in drive-backup TA Max Reitz
2015-01-27 23:44 ` Eric Blake
2015-01-28 16:27 ` Max Reitz
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 23/50] blockdev: Catch NULL BDS in block_set_io_throttle Max Reitz
2015-01-28 15:26 ` Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 24/50] blockdev: Check BB validity in block-stream Max Reitz
2015-01-28 15:28 ` Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 25/50] blockdev: Check BB validity in block-commit Max Reitz
2015-01-28 16:09 ` Eric Blake
2015-01-27 19:45 ` [Qemu-devel] [PATCH RESEND 26/50] blockdev: Check BB validity in drive-backup Max Reitz
2015-01-28 16:20 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 27/50] blockdev: Check BB validity in blockdev-backup Max Reitz
2015-01-28 16:42 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 28/50] blockdev: Check BB validity in drive-mirror Max Reitz
2015-01-28 16:43 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 29/50] blockdev: Check BB validity in find_block_job() Max Reitz
2015-01-28 16:44 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 30/50] blockdev: Check BB validity in change-backing-file Max Reitz
2015-01-28 16:50 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 31/50] block: Add blk_insert_bs() Max Reitz
2015-01-28 16:52 ` Eric Blake
2015-01-28 16:58 ` Max Reitz
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 32/50] blockdev: Check BB validity in eject and change Max Reitz
2015-01-28 17:42 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 33/50] blockdev: Respect NULL BDS in do_drive_del() Max Reitz
2015-01-28 17:45 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 34/50] blockdev: Do not create BDS for empty drive Max Reitz
2015-01-28 17:50 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 35/50] blockdev: Pull out blockdev option extraction Max Reitz
2015-01-28 19:23 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 36/50] blockdev: Allow more options for BB-less BDS tree Max Reitz
2015-01-28 19:26 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 37/50] block: Add blk_remove_bs() Max Reitz
2015-01-28 19:49 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 38/50] blockdev: Add blockdev-open-tray Max Reitz
2015-01-28 19:56 ` Eric Blake
2015-01-28 19:59 ` Max Reitz
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 39/50] blockdev: Add blockdev-close-tray Max Reitz
2015-01-28 19:58 ` Eric Blake
2015-01-28 20:00 ` Max Reitz
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 40/50] blockdev: Add blockdev-remove-medium Max Reitz
2015-01-28 20:11 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 41/50] blockdev: Add blockdev-insert-medium Max Reitz
2015-01-28 20:18 ` Eric Blake
2015-01-28 20:20 ` Max Reitz
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 42/50] blockdev: Implement eject with basic operations Max Reitz
2015-01-28 20:26 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 43/50] blockdev: Implement change " Max Reitz
2015-01-28 20:30 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 44/50] block: Inquire tray state before tray-moved events Max Reitz
2015-01-28 20:37 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 45/50] qmp: Introduce blockdev-change-medium Max Reitz
2015-01-28 21:01 ` Eric Blake
2015-01-28 21:19 ` Max Reitz
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 46/50] hmp: Use blockdev-change-medium for change command Max Reitz
2015-01-28 21:02 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 47/50] blockdev: Add read-only option to blockdev-change-medium Max Reitz
2015-01-28 21:08 ` Eric Blake
2015-01-28 21:22 ` Max Reitz
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 48/50] hmp: Add read-only option to change command Max Reitz
2015-01-28 21:22 ` Eric Blake
2015-01-28 21:26 ` Max Reitz
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 49/50] iotests: More options for VM.add_drive() Max Reitz
2015-01-28 21:27 ` Eric Blake
2015-01-28 21:28 ` Max Reitz
2015-01-28 21:58 ` Eric Blake
2015-01-27 19:46 ` [Qemu-devel] [PATCH RESEND 50/50] iotests: Add test for change-related QMP commands Max Reitz
2015-01-28 21:57 ` Eric Blake
2015-01-28 22:02 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422387983-32153-16-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=armbru@redhat.com \
--cc=famz@redhat.com \
--cc=jcody@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).