[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/8] block-backend: ignore inserted state in blk_co_nb_sectors
From: |
Paolo Bonzini |
Subject: |
[PATCH 7/8] block-backend: ignore inserted state in blk_co_nb_sectors |
Date: |
Fri, 7 Apr 2023 17:33:02 +0200 |
All callers of blk_co_nb_sectors (and blk_nb_sectors) are able to
handle a non-inserted CD-ROM as a zero-length file, they do not need
to raise an error.
Not using blk_co_is_available() aligns the function with
blk_co_get_geometry(), which becomes a simple wrapper for
blk_co_nb_sectors(). It will also make it possible to skip the creation
of a coroutine in the (common) case where bs->bl.has_variable_length
is false.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block/block-backend.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index f159cc51d264..d08e949799ee 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -1627,9 +1627,7 @@ int64_t coroutine_fn blk_co_getlength(BlockBackend *blk)
return bdrv_co_getlength(blk_bs(blk));
}
-/* return 0 as number of sectors if no device present or error */
-void coroutine_fn blk_co_get_geometry(BlockBackend *blk,
- uint64_t *nb_sectors_ptr)
+int64_t coroutine_fn blk_co_nb_sectors(BlockBackend *blk)
{
BlockDriverState *bs = blk_bs(blk);
@@ -1637,23 +1635,18 @@ void coroutine_fn blk_co_get_geometry(BlockBackend *blk,
GRAPH_RDLOCK_GUARD();
if (!bs) {
- *nb_sectors_ptr = 0;
+ return -ENOMEDIUM;
} else {
- int64_t nb_sectors = bdrv_co_nb_sectors(bs);
- *nb_sectors_ptr = nb_sectors < 0 ? 0 : nb_sectors;
+ return bdrv_co_nb_sectors(bs);
}
}
-int64_t coroutine_fn blk_co_nb_sectors(BlockBackend *blk)
+/* return 0 as number of sectors if no device present or error */
+void coroutine_fn blk_co_get_geometry(BlockBackend *blk,
+ uint64_t *nb_sectors_ptr)
{
- IO_CODE();
- GRAPH_RDLOCK_GUARD();
-
- if (!blk_co_is_available(blk)) {
- return -ENOMEDIUM;
- }
-
- return bdrv_co_nb_sectors(blk_bs(blk));
+ int64_t ret = blk_co_nb_sectors(blk);
+ *nb_sectors_ptr = ret < 0 ? 0 : ret;
}
BlockAIOCB *blk_aio_preadv(BlockBackend *blk, int64_t offset,
--
2.39.2
- [PATCH 1/8] block: move has_variable_length to BlockLimits, (continued)
- [PATCH 1/8] block: move has_variable_length to BlockLimits, Paolo Bonzini, 2023/04/07
- [PATCH 2/8] block: remove has_variable_length from filters, Paolo Bonzini, 2023/04/07
- [PATCH 3/8] block: refresh bs->total_sectors on reopen, Paolo Bonzini, 2023/04/07
- [PATCH 4/8] block: remove has_variable_length from BlockDriver, Paolo Bonzini, 2023/04/07
- [PATCH 6/8] block-backend: inline bdrv_co_get_geometry, Paolo Bonzini, 2023/04/07
- [PATCH 7/8] block-backend: ignore inserted state in blk_co_nb_sectors,
Paolo Bonzini <=
- [PATCH 8/8] block, block-backend: write some hot coroutine wrappers by hand, Paolo Bonzini, 2023/04/07
- [PATCH 5/8] migration/block: replace uses of blk_nb_sectors that do not check result, Paolo Bonzini, 2023/04/07
- Re: [PATCH 8.0 regression 0/8] block: remove bdrv_co_get_geometry coroutines from I/O hot path, Kevin Wolf, 2023/04/11