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

block: make serializing requests functions 'void' 

Return codes of the following functions are never used in the code:
* bdrv_wait_serialising_requests_locked
* bdrv_wait_serialising_requests
* bdrv_make_request_serialising

Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Hanna Reitz <hreitz@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Fam Zheng <fam@euphon.net>
CC: Ronnie Sahlberg <ronniesahlberg@gmail.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Peter Lieven <pl@kamp.de>
CC: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20220817083736.40981-3-den@openvz.org>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Denis V. Lunev 2022-08-17 10:37:36 +02:00 committed by Kevin Wolf
parent 006e196244
commit 131498f775
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
block/io.c
View File

@ -828,20 +828,16 @@ bdrv_find_conflicting_request(BdrvTrackedRequest *self)
} }
/* Called with self->bs->reqs_lock held */ /* Called with self->bs->reqs_lock held */
static bool coroutine_fn static void coroutine_fn
bdrv_wait_serialising_requests_locked(BdrvTrackedRequest *self) bdrv_wait_serialising_requests_locked(BdrvTrackedRequest *self)
{ {
BdrvTrackedRequest *req; BdrvTrackedRequest *req;
bool waited = false;
while ((req = bdrv_find_conflicting_request(self))) { while ((req = bdrv_find_conflicting_request(self))) {
self->waiting_for = req; self->waiting_for = req;
qemu_co_queue_wait(&req->wait_queue, &self->bs->reqs_lock); qemu_co_queue_wait(&req->wait_queue, &self->bs->reqs_lock);
self->waiting_for = NULL; self->waiting_for = NULL;
waited = true;
} }
return waited;
} }
/* Called with req->bs->reqs_lock held */ /* Called with req->bs->reqs_lock held */
@ -934,36 +930,31 @@ void bdrv_dec_in_flight(BlockDriverState *bs)
bdrv_wakeup(bs); bdrv_wakeup(bs);
} }
static bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self) static void coroutine_fn
bdrv_wait_serialising_requests(BdrvTrackedRequest *self)
{ {
BlockDriverState *bs = self->bs; BlockDriverState *bs = self->bs;
bool waited = false;
if (!qatomic_read(&bs->serialising_in_flight)) { if (!qatomic_read(&bs->serialising_in_flight)) {
return false; return;
} }
qemu_co_mutex_lock(&bs->reqs_lock); qemu_co_mutex_lock(&bs->reqs_lock);
waited = bdrv_wait_serialising_requests_locked(self); bdrv_wait_serialising_requests_locked(self);
qemu_co_mutex_unlock(&bs->reqs_lock); qemu_co_mutex_unlock(&bs->reqs_lock);
return waited;
} }
bool coroutine_fn bdrv_make_request_serialising(BdrvTrackedRequest *req, void coroutine_fn bdrv_make_request_serialising(BdrvTrackedRequest *req,
uint64_t align) uint64_t align)
{ {
bool waited;
IO_CODE(); IO_CODE();
qemu_co_mutex_lock(&req->bs->reqs_lock); qemu_co_mutex_lock(&req->bs->reqs_lock);
tracked_request_set_serialising(req, align); tracked_request_set_serialising(req, align);
waited = bdrv_wait_serialising_requests_locked(req); bdrv_wait_serialising_requests_locked(req);
qemu_co_mutex_unlock(&req->bs->reqs_lock); qemu_co_mutex_unlock(&req->bs->reqs_lock);
return waited;
} }
int bdrv_check_qiov_request(int64_t offset, int64_t bytes, int bdrv_check_qiov_request(int64_t offset, int64_t bytes,

2
include/block/block_int-io.h
View File

@ -73,7 +73,7 @@ static inline int coroutine_fn bdrv_co_pwrite(BdrvChild *child,
return bdrv_co_pwritev(child, offset, bytes, &qiov, flags); return bdrv_co_pwritev(child, offset, bytes, &qiov, flags);
} }
bool coroutine_fn bdrv_make_request_serialising(BdrvTrackedRequest *req, void coroutine_fn bdrv_make_request_serialising(BdrvTrackedRequest *req,
uint64_t align); uint64_t align);
BdrvTrackedRequest *coroutine_fn bdrv_co_get_self_request(BlockDriverState *bs); BdrvTrackedRequest *coroutine_fn bdrv_co_get_self_request(BlockDriverState *bs);