[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/17] block/io: refactor save/load vmstate
From: |
Stefan Hajnoczi |
Subject: |
[PULL 13/17] block/io: refactor save/load vmstate |
Date: |
Wed, 30 Sep 2020 11:13:01 +0100 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Like for read/write in a previous commit, drop extra indirection layer,
generate directly bdrv_readv_vmstate() and bdrv_writev_vmstate().
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20200924185414.28642-8-vsementsov@virtuozzo.com>
---
block/coroutines.h | 10 +++----
include/block/block.h | 6 ++--
block/io.c | 70 ++++++++++++++++++++++---------------------
3 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/block/coroutines.h b/block/coroutines.h
index 6c63a819c9..f69179f5ef 100644
--- a/block/coroutines.h
+++ b/block/coroutines.h
@@ -57,11 +57,9 @@ bdrv_common_block_status_above(BlockDriverState *bs,
int64_t *map,
BlockDriverState **file);
-int coroutine_fn
-bdrv_co_rw_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos,
- bool is_read);
-int generated_co_wrapper
-bdrv_rw_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos,
- bool is_read);
+int coroutine_fn bdrv_co_readv_vmstate(BlockDriverState *bs,
+ QEMUIOVector *qiov, int64_t pos);
+int coroutine_fn bdrv_co_writev_vmstate(BlockDriverState *bs,
+ QEMUIOVector *qiov, int64_t pos);
#endif /* BLOCK_COROUTINES_INT_H */
diff --git a/include/block/block.h b/include/block/block.h
index eef4cceaf0..8b87df69a1 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -572,8 +572,10 @@ int path_has_protocol(const char *path);
int path_is_absolute(const char *path);
char *path_combine(const char *base_path, const char *filename);
-int bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
-int bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
+int generated_co_wrapper
+bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
+int generated_co_wrapper
+bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos);
int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
int64_t pos, int size);
diff --git a/block/io.c b/block/io.c
index c3dc1db036..54f0968aee 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2475,28 +2475,50 @@ int bdrv_is_allocated_above(BlockDriverState *top,
}
int coroutine_fn
-bdrv_co_rw_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos,
- bool is_read)
+bdrv_co_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
{
BlockDriver *drv = bs->drv;
BlockDriverState *child_bs = bdrv_primary_bs(bs);
int ret = -ENOTSUP;
+ if (!drv) {
+ return -ENOMEDIUM;
+ }
+
bdrv_inc_in_flight(bs);
+ if (drv->bdrv_load_vmstate) {
+ ret = drv->bdrv_load_vmstate(bs, qiov, pos);
+ } else if (child_bs) {
+ ret = bdrv_co_readv_vmstate(child_bs, qiov, pos);
+ }
+
+ bdrv_dec_in_flight(bs);
+
+ return ret;
+}
+
+int coroutine_fn
+bdrv_co_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
+{
+ BlockDriver *drv = bs->drv;
+ BlockDriverState *child_bs = bdrv_primary_bs(bs);
+ int ret = -ENOTSUP;
+
if (!drv) {
- ret = -ENOMEDIUM;
- } else if (drv->bdrv_load_vmstate) {
- if (is_read) {
- ret = drv->bdrv_load_vmstate(bs, qiov, pos);
- } else {
- ret = drv->bdrv_save_vmstate(bs, qiov, pos);
- }
+ return -ENOMEDIUM;
+ }
+
+ bdrv_inc_in_flight(bs);
+
+ if (drv->bdrv_save_vmstate) {
+ ret = drv->bdrv_save_vmstate(bs, qiov, pos);
} else if (child_bs) {
- ret = bdrv_co_rw_vmstate(child_bs, qiov, pos, is_read);
+ ret = bdrv_co_writev_vmstate(child_bs, qiov, pos);
}
bdrv_dec_in_flight(bs);
+
return ret;
}
@@ -2504,38 +2526,18 @@ int bdrv_save_vmstate(BlockDriverState *bs, const
uint8_t *buf,
int64_t pos, int size)
{
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, size);
- int ret;
+ int ret = bdrv_writev_vmstate(bs, &qiov, pos);
- ret = bdrv_writev_vmstate(bs, &qiov, pos);
- if (ret < 0) {
- return ret;
- }
-
- return size;
-}
-
-int bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
-{
- return bdrv_rw_vmstate(bs, qiov, pos, false);
+ return ret < 0 ? ret : size;
}
int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf,
int64_t pos, int size)
{
QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, size);
- int ret;
+ int ret = bdrv_readv_vmstate(bs, &qiov, pos);
- ret = bdrv_readv_vmstate(bs, &qiov, pos);
- if (ret < 0) {
- return ret;
- }
-
- return size;
-}
-
-int bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos)
-{
- return bdrv_rw_vmstate(bs, qiov, pos, true);
+ return ret < 0 ? ret : size;
}
/**************************************************************/
--
2.26.2
- [PULL 01/17] util/vfio-helpers: Pass page protections to qemu_vfio_pci_map_bar(), (continued)
- [PULL 01/17] util/vfio-helpers: Pass page protections to qemu_vfio_pci_map_bar(), Stefan Hajnoczi, 2020/09/30
- [PULL 02/17] block/nvme: Map doorbells pages write-only, Stefan Hajnoczi, 2020/09/30
- [PULL 04/17] block/nvme: Drop NVMeRegs structure, directly use NvmeBar, Stefan Hajnoczi, 2020/09/30
- [PULL 05/17] block/nvme: Use register definitions from 'block/nvme.h', Stefan Hajnoczi, 2020/09/30
- [PULL 03/17] block/nvme: Reduce I/O registers scope, Stefan Hajnoczi, 2020/09/30
- [PULL 06/17] block/nvme: Replace magic value by SCALE_MS definition, Stefan Hajnoczi, 2020/09/30
- [PULL 08/17] block/io: refactor coroutine wrappers, Stefan Hajnoczi, 2020/09/30
- [PULL 09/17] block: declare some coroutine functions in block/coroutines.h, Stefan Hajnoczi, 2020/09/30
- [PULL 10/17] scripts: add block-coroutine-wrapper.py, Stefan Hajnoczi, 2020/09/30
- [PULL 11/17] block: generate coroutine-wrapper code, Stefan Hajnoczi, 2020/09/30
- [PULL 13/17] block/io: refactor save/load vmstate,
Stefan Hajnoczi <=
- [PULL 14/17] include/block/block.h: drop non-ascii quotation mark, Stefan Hajnoczi, 2020/09/30
- [PULL 12/17] block: drop bdrv_prwv, Stefan Hajnoczi, 2020/09/30
- [PULL 15/17] docs: add 'io_uring' option to 'aio' param in qemu-options.hx, Stefan Hajnoczi, 2020/09/30
- [PULL 16/17] util/vfio-helpers: Collect IOVA reserved regions, Stefan Hajnoczi, 2020/09/30
- [PULL 17/17] util/vfio-helpers: Rework the IOVA allocator to avoid IOVA reserved regions, Stefan Hajnoczi, 2020/09/30
- [PULL 07/17] block: return error-code from bdrv_invalidate_cache, Stefan Hajnoczi, 2020/09/30