|
@@ -33,8 +33,8 @@ typedef struct BlkverifyRequest {
|
|
uint64_t bytes;
|
|
uint64_t bytes;
|
|
int flags;
|
|
int flags;
|
|
|
|
|
|
- int (*request_fn)(BdrvChild *, int64_t, int64_t, QEMUIOVector *,
|
|
|
|
- BdrvRequestFlags);
|
|
|
|
|
|
+ int GRAPH_RDLOCK_PTR (*request_fn)(
|
|
|
|
+ BdrvChild *, int64_t, int64_t, QEMUIOVector *, BdrvRequestFlags);
|
|
|
|
|
|
int ret; /* test image result */
|
|
int ret; /* test image result */
|
|
int raw_ret; /* raw image result */
|
|
int raw_ret; /* raw image result */
|
|
@@ -170,8 +170,11 @@ static void coroutine_fn blkverify_do_test_req(void *opaque)
|
|
BlkverifyRequest *r = opaque;
|
|
BlkverifyRequest *r = opaque;
|
|
BDRVBlkverifyState *s = r->bs->opaque;
|
|
BDRVBlkverifyState *s = r->bs->opaque;
|
|
|
|
|
|
|
|
+ bdrv_graph_co_rdlock();
|
|
r->ret = r->request_fn(s->test_file, r->offset, r->bytes, r->qiov,
|
|
r->ret = r->request_fn(s->test_file, r->offset, r->bytes, r->qiov,
|
|
r->flags);
|
|
r->flags);
|
|
|
|
+ bdrv_graph_co_rdunlock();
|
|
|
|
+
|
|
r->done++;
|
|
r->done++;
|
|
qemu_coroutine_enter_if_inactive(r->co);
|
|
qemu_coroutine_enter_if_inactive(r->co);
|
|
}
|
|
}
|
|
@@ -180,13 +183,16 @@ static void coroutine_fn blkverify_do_raw_req(void *opaque)
|
|
{
|
|
{
|
|
BlkverifyRequest *r = opaque;
|
|
BlkverifyRequest *r = opaque;
|
|
|
|
|
|
|
|
+ bdrv_graph_co_rdlock();
|
|
r->raw_ret = r->request_fn(r->bs->file, r->offset, r->bytes, r->raw_qiov,
|
|
r->raw_ret = r->request_fn(r->bs->file, r->offset, r->bytes, r->raw_qiov,
|
|
r->flags);
|
|
r->flags);
|
|
|
|
+ bdrv_graph_co_rdunlock();
|
|
|
|
+
|
|
r->done++;
|
|
r->done++;
|
|
qemu_coroutine_enter_if_inactive(r->co);
|
|
qemu_coroutine_enter_if_inactive(r->co);
|
|
}
|
|
}
|
|
|
|
|
|
-static int coroutine_fn
|
|
|
|
|
|
+static int coroutine_fn GRAPH_RDLOCK
|
|
blkverify_co_prwv(BlockDriverState *bs, BlkverifyRequest *r, uint64_t offset,
|
|
blkverify_co_prwv(BlockDriverState *bs, BlkverifyRequest *r, uint64_t offset,
|
|
uint64_t bytes, QEMUIOVector *qiov, QEMUIOVector *raw_qiov,
|
|
uint64_t bytes, QEMUIOVector *qiov, QEMUIOVector *raw_qiov,
|
|
int flags, bool is_write)
|
|
int flags, bool is_write)
|
|
@@ -222,7 +228,7 @@ blkverify_co_prwv(BlockDriverState *bs, BlkverifyRequest *r, uint64_t offset,
|
|
return r->ret;
|
|
return r->ret;
|
|
}
|
|
}
|
|
|
|
|
|
-static int coroutine_fn
|
|
|
|
|
|
+static int coroutine_fn GRAPH_RDLOCK
|
|
blkverify_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
|
blkverify_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
|
QEMUIOVector *qiov, BdrvRequestFlags flags)
|
|
QEMUIOVector *qiov, BdrvRequestFlags flags)
|
|
{
|
|
{
|
|
@@ -251,7 +257,7 @@ blkverify_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
-static int coroutine_fn
|
|
|
|
|
|
+static int coroutine_fn GRAPH_RDLOCK
|
|
blkverify_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
|
blkverify_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
|
|
QEMUIOVector *qiov, BdrvRequestFlags flags)
|
|
QEMUIOVector *qiov, BdrvRequestFlags flags)
|
|
{
|
|
{
|