[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/25] migration: convert savevm to use QIOChannelBlock for VMStat
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 14/25] migration: convert savevm to use QIOChannelBlock for VMState |
Date: |
Thu, 23 Jun 2022 17:53:43 +0100 |
From: Daniel P. Berrangé <berrange@redhat.com>
With this change, all QEMUFile usage is backed by QIOChannel at
last.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
dgilbert: Wrap long lines
---
migration/savevm.c | 44 ++++++--------------------------------------
1 file changed, 6 insertions(+), 38 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 75d05f1a84..3e9612121a 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -35,6 +35,7 @@
#include "migration/misc.h"
#include "migration/register.h"
#include "migration/global_state.h"
+#include "migration/channel-block.h"
#include "ram.h"
#include "qemu-file-channel.h"
#include "qemu-file.h"
@@ -130,48 +131,15 @@ static struct mig_cmd_args {
/***********************************************************/
/* savevm/loadvm support */
-static ssize_t block_writev_buffer(void *opaque, struct iovec *iov, int iovcnt,
- int64_t pos, Error **errp)
-{
- int ret;
- QEMUIOVector qiov;
-
- qemu_iovec_init_external(&qiov, iov, iovcnt);
- ret = bdrv_writev_vmstate(opaque, &qiov, pos);
- if (ret < 0) {
- return ret;
- }
-
- return qiov.size;
-}
-
-static ssize_t block_get_buffer(void *opaque, uint8_t *buf, int64_t pos,
- size_t size, Error **errp)
-{
- return bdrv_load_vmstate(opaque, buf, pos, size);
-}
-
-static int bdrv_fclose(void *opaque, Error **errp)
-{
- return bdrv_flush(opaque);
-}
-
-static const QEMUFileOps bdrv_read_ops = {
- .get_buffer = block_get_buffer,
- .close = bdrv_fclose
-};
-
-static const QEMUFileOps bdrv_write_ops = {
- .writev_buffer = block_writev_buffer,
- .close = bdrv_fclose
-};
-
static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int is_writable)
{
if (is_writable) {
- return qemu_fopen_ops(bs, &bdrv_write_ops, false);
+ return qemu_fopen_channel_output(
+ QIO_CHANNEL(qio_channel_block_new(bs)));
+ } else {
+ return qemu_fopen_channel_input(
+ QIO_CHANNEL(qio_channel_block_new(bs)));
}
- return qemu_fopen_ops(bs, &bdrv_read_ops, false);
}
--
2.36.1
- [PULL 01/25] migration: Remove RDMA_UNREGISTRATION_EXAMPLE, (continued)
- [PULL 01/25] migration: Remove RDMA_UNREGISTRATION_EXAMPLE, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 03/25] QIOChannelSocket: Fix zero-copy send so socket flush works, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 05/25] io: add a QIOChannelNull equivalent to /dev/null, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 07/25] migration: remove unreachble RDMA code in save_hook impl, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 06/25] migration: switch to use QIOChannelNull for dummy channel, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 09/25] migration: rename 'pos' field in QEMUFile to 'bytes_processed', Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 11/25] migration: rename qemu_update_position to qemu_file_credit_transfer, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 04/25] migration: Change zero_copy_send from migration parameter to migration capability, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 15/25] migration: stop passing 'opaque' parameter to QEMUFile hooks, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 14/25] migration: convert savevm to use QIOChannelBlock for VMState,
Dr. David Alan Gilbert (git) <=
- [PULL 18/25] migration: remove unused QEMUFileGetFD typedef / qemu_get_fd method, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 17/25] migration: introduce new constructors for QEMUFile, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 21/25] migration: remove the QEMUFileOps 'close' callback, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 22/25] migration: remove the QEMUFileOps 'get_buffer' callback, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 24/25] migration: remove the QEMUFileOps 'get_return_path' callback, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 19/25] migration: remove the QEMUFileOps 'shut_down' callback, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 08/25] migration: rename rate limiting fields in QEMUFile, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 12/25] migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limit, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 13/25] migration: introduce a QIOChannel impl for BlockDriverState VMState, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 16/25] migration: hardcode assumption that QEMUFile is backed with QIOChannel, Dr. David Alan Gilbert (git), 2022/06/23