block: Rename bdrv_load/save_vmstate() to bdrv_co_load/save_vmstate()
Since these functions always run in coroutine context, adjust their name to include "_co_", just like all other BlockDriver callbacks. No functional change intended. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20230113204212.359076-15-kwolf@redhat.com> Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
c834dc0586
commit
ca5e2ad98d
|
@ -2720,8 +2720,8 @@ bdrv_co_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
|
||||||
|
|
||||||
bdrv_inc_in_flight(bs);
|
bdrv_inc_in_flight(bs);
|
||||||
|
|
||||||
if (drv->bdrv_load_vmstate) {
|
if (drv->bdrv_co_load_vmstate) {
|
||||||
ret = drv->bdrv_load_vmstate(bs, qiov, pos);
|
ret = drv->bdrv_co_load_vmstate(bs, qiov, pos);
|
||||||
} else if (child_bs) {
|
} else if (child_bs) {
|
||||||
ret = bdrv_co_readv_vmstate(child_bs, qiov, pos);
|
ret = bdrv_co_readv_vmstate(child_bs, qiov, pos);
|
||||||
} else {
|
} else {
|
||||||
|
@ -2753,8 +2753,8 @@ bdrv_co_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
|
||||||
|
|
||||||
bdrv_inc_in_flight(bs);
|
bdrv_inc_in_flight(bs);
|
||||||
|
|
||||||
if (drv->bdrv_save_vmstate) {
|
if (drv->bdrv_co_save_vmstate) {
|
||||||
ret = drv->bdrv_save_vmstate(bs, qiov, pos);
|
ret = drv->bdrv_co_save_vmstate(bs, qiov, pos);
|
||||||
} else if (child_bs) {
|
} else if (child_bs) {
|
||||||
ret = bdrv_co_writev_vmstate(child_bs, qiov, pos);
|
ret = bdrv_co_writev_vmstate(child_bs, qiov, pos);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -5287,8 +5287,8 @@ static int64_t qcow2_check_vmstate_request(BlockDriverState *bs,
|
||||||
return pos;
|
return pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
static coroutine_fn int qcow2_save_vmstate(BlockDriverState *bs,
|
static coroutine_fn int qcow2_co_save_vmstate(BlockDriverState *bs,
|
||||||
QEMUIOVector *qiov, int64_t pos)
|
QEMUIOVector *qiov, int64_t pos)
|
||||||
{
|
{
|
||||||
int64_t offset = qcow2_check_vmstate_request(bs, qiov, pos);
|
int64_t offset = qcow2_check_vmstate_request(bs, qiov, pos);
|
||||||
if (offset < 0) {
|
if (offset < 0) {
|
||||||
|
@ -5299,8 +5299,8 @@ static coroutine_fn int qcow2_save_vmstate(BlockDriverState *bs,
|
||||||
return bs->drv->bdrv_co_pwritev_part(bs, offset, qiov->size, qiov, 0, 0);
|
return bs->drv->bdrv_co_pwritev_part(bs, offset, qiov->size, qiov, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static coroutine_fn int qcow2_load_vmstate(BlockDriverState *bs,
|
static coroutine_fn int qcow2_co_load_vmstate(BlockDriverState *bs,
|
||||||
QEMUIOVector *qiov, int64_t pos)
|
QEMUIOVector *qiov, int64_t pos)
|
||||||
{
|
{
|
||||||
int64_t offset = qcow2_check_vmstate_request(bs, qiov, pos);
|
int64_t offset = qcow2_check_vmstate_request(bs, qiov, pos);
|
||||||
if (offset < 0) {
|
if (offset < 0) {
|
||||||
|
@ -6081,8 +6081,8 @@ BlockDriver bdrv_qcow2 = {
|
||||||
.bdrv_co_get_info = qcow2_co_get_info,
|
.bdrv_co_get_info = qcow2_co_get_info,
|
||||||
.bdrv_get_specific_info = qcow2_get_specific_info,
|
.bdrv_get_specific_info = qcow2_get_specific_info,
|
||||||
|
|
||||||
.bdrv_save_vmstate = qcow2_save_vmstate,
|
.bdrv_co_save_vmstate = qcow2_co_save_vmstate,
|
||||||
.bdrv_load_vmstate = qcow2_load_vmstate,
|
.bdrv_co_load_vmstate = qcow2_co_load_vmstate,
|
||||||
|
|
||||||
.is_format = true,
|
.is_format = true,
|
||||||
.supports_backing = true,
|
.supports_backing = true,
|
||||||
|
|
|
@ -700,10 +700,10 @@ struct BlockDriver {
|
||||||
Error **errp);
|
Error **errp);
|
||||||
BlockStatsSpecific *(*bdrv_get_specific_stats)(BlockDriverState *bs);
|
BlockStatsSpecific *(*bdrv_get_specific_stats)(BlockDriverState *bs);
|
||||||
|
|
||||||
int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_save_vmstate)(
|
int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_save_vmstate)(
|
||||||
BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
|
BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
|
||||||
|
|
||||||
int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_load_vmstate)(
|
int coroutine_fn GRAPH_RDLOCK_PTR (*bdrv_co_load_vmstate)(
|
||||||
BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
|
BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
|
||||||
|
|
||||||
/* removable device specific */
|
/* removable device specific */
|
||||||
|
|
Loading…
Reference in New Issue