ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: use bdrv_co_refresh_total_sectors when possible 

In some places we are sure we are always running in a
coroutine, therefore it's useless to call the generated_co_wrapper,
instead call directly the _co_ function.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230113204212.359076-9-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2023-01-13 21:42:06 +01:00 committed by Kevin Wolf
parent d886257d84
commit bd53086e82
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/block-backend.c
View File

@ -1235,8 +1235,8 @@ void blk_set_disable_request_queuing(BlockBackend *blk, bool disable)
blk->disable_request_queuing = disable; blk->disable_request_queuing = disable;
} }
static int blk_check_byte_request(BlockBackend *blk, int64_t offset, static coroutine_fn int blk_check_byte_request(BlockBackend *blk,
int64_t bytes) int64_t offset, int64_t bytes)
{ {
int64_t len; int64_t len;
@ -1253,7 +1253,7 @@ static int blk_check_byte_request(BlockBackend *blk, int64_t offset,
} }
if (!blk->allow_write_beyond_eof) { if (!blk->allow_write_beyond_eof) {
len = bdrv_getlength(blk_bs(blk)); len = bdrv_co_getlength(blk_bs(blk));
if (len < 0) { if (len < 0) {
return len; return len;
} }

4
block/io.c
View File

@ -3444,7 +3444,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
if (new_bytes && backing) { if (new_bytes && backing) {
int64_t backing_len; int64_t backing_len;
backing_len = bdrv_getlength(backing->bs); backing_len = bdrv_co_getlength(backing->bs);
if (backing_len < 0) { if (backing_len < 0) {
ret = backing_len; ret = backing_len;
error_setg_errno(errp, -ret, "Could not get backing file size"); error_setg_errno(errp, -ret, "Could not get backing file size");
@ -3474,7 +3474,7 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
goto out; goto out;
} }
ret = bdrv_refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS); ret = bdrv_co_refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "Could not refresh total sector count"); error_setg_errno(errp, -ret, "Could not refresh total sector count");
} else { } else {

6
block/preallocate.c
View File

@ -287,7 +287,7 @@ static bool coroutine_fn handle_write(BlockDriverState *bs, int64_t offset,
} }
if (s->data_end < 0) { if (s->data_end < 0) {
s->data_end = bdrv_getlength(bs->file->bs); s->data_end = bdrv_co_getlength(bs->file->bs);
if (s->data_end < 0) { if (s->data_end < 0) {
return false; return false;
} }
@ -309,7 +309,7 @@ static bool coroutine_fn handle_write(BlockDriverState *bs, int64_t offset,
} }
if (s->file_end < 0) { if (s->file_end < 0) {
s->file_end = bdrv_getlength(bs->file->bs); s->file_end = bdrv_co_getlength(bs->file->bs);
if (s->file_end < 0) { if (s->file_end < 0) {
return false; return false;
} }
@ -381,7 +381,7 @@ preallocate_co_truncate(BlockDriverState *bs, int64_t offset,
if (s->data_end >= 0 && offset > s->data_end) { if (s->data_end >= 0 && offset > s->data_end) {
if (s->file_end < 0) { if (s->file_end < 0) {
s->file_end = bdrv_getlength(bs->file->bs); s->file_end = bdrv_co_getlength(bs->file->bs);
if (s->file_end < 0) { if (s->file_end < 0) {
error_setg(errp, "failed to get file length"); error_setg(errp, "failed to get file length");
return s->file_end; return s->file_end;

2
block/qed.c
View File

@ -424,7 +424,7 @@ static int coroutine_fn bdrv_qed_do_open(BlockDriverState *bs, QDict *options,
} }
/* Round down file size to the last cluster */ /* Round down file size to the last cluster */
file_size = bdrv_getlength(bs->file->bs); file_size = bdrv_co_getlength(bs->file->bs);
if (file_size < 0) { if (file_size < 0) {
error_setg(errp, "Failed to get file length"); error_setg(errp, "Failed to get file length");
return file_size; return file_size;