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

qed: mark more functions as coroutine_fns and GRAPH_RDLOCK 

Mark functions as coroutine_fn when they are only called by other coroutine_fns
and they can suspend.  Change calls to co_wrappers to use the non-wrapped
functions, which in turn requires adding GRAPH_RDLOCK annotations.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20230601115145.196465-3-pbonzini@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-06-01 13:51:35 +02:00 committed by Kevin Wolf
parent 36c6c8773a
commit bba667da7f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/qed-check.c
View File

@ -200,7 +200,8 @@ static void qed_check_for_leaks(QEDCheck *check)
/** /**
* Mark an image clean once it passes check or has been repaired * Mark an image clean once it passes check or has been repaired
*/ */
static void qed_check_mark_clean(BDRVQEDState *s, BdrvCheckResult *result) static void coroutine_fn GRAPH_RDLOCK
qed_check_mark_clean(BDRVQEDState *s, BdrvCheckResult *result)
{ {
/* Skip if there were unfixable corruptions or I/O errors */ /* Skip if there were unfixable corruptions or I/O errors */
if (result->corruptions > 0 || result->check_errors > 0) { if (result->corruptions > 0 || result->check_errors > 0) {
@ -213,7 +214,7 @@ static void qed_check_mark_clean(BDRVQEDState *s, BdrvCheckResult *result)
} }
/* Ensure fixes reach storage before clearing check bit */ /* Ensure fixes reach storage before clearing check bit */
bdrv_flush(s->bs); bdrv_co_flush(s->bs);
s->header.features &= ~QED_F_NEED_CHECK; s->header.features &= ~QED_F_NEED_CHECK;
qed_write_header_sync(s); qed_write_header_sync(s);

7
block/qed.c
View File

@ -195,14 +195,15 @@ static bool qed_is_image_size_valid(uint64_t image_size, uint32_t cluster_size,
* *
* The string is NUL-terminated. * The string is NUL-terminated.
*/ */
static int qed_read_string(BdrvChild *file, uint64_t offset, size_t n, static int coroutine_fn GRAPH_RDLOCK
char *buf, size_t buflen) qed_read_string(BdrvChild *file, uint64_t offset,
size_t n, char *buf, size_t buflen)
{ {
int ret; int ret;
if (n >= buflen) { if (n >= buflen) {
return -EINVAL; return -EINVAL;
} }
ret = bdrv_pread(file, offset, n, buf, 0); ret = bdrv_co_pread(file, offset, n, buf, 0);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }