diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-04-07 17:33:02 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-04-11 16:40:55 +0200 |
| commit | 9ed98cae151368cc89c4bb77c9f325f7185e8f09 (patch) | |
| tree | 74319a0ea554ff239fb471c8a7fd5f5f89cdbbc7 | |
| parent | e5203a3b5db1fb1328f104a4863284198b551ce0 (diff) | |
| download | qemu-9ed98cae151368cc89c4bb77c9f325f7185e8f09.zip qemu-9ed98cae151368cc89c4bb77c9f325f7185e8f09.tar.gz qemu-9ed98cae151368cc89c4bb77c9f325f7185e8f09.tar.bz2 | |
block-backend: ignore inserted state in blk_co_nb_sectors
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>
Message-Id: <20230407153303.391121-8-pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/block-backend.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 36e3a67..cf58d4d 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -1615,9 +1615,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); @@ -1625,23 +1623,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, |