[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/20] migration: introduce new constructors for QEMUFile
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 12/20] migration: introduce new constructors for QEMUFile |
Date: |
Tue, 24 May 2022 12:02:27 +0100 |
Prepare for the elimination of QEMUFileOps by introducing a pair of new
constructors. This lets us distinguish between an input and output file
object explicitly rather than via the existance of specific callbacks.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
migration/qemu-file-channel.c | 4 ++--
migration/qemu-file.c | 18 ++++++++++++++++--
migration/qemu-file.h | 3 ++-
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
index ce8eced417..5cb8ac93c0 100644
--- a/migration/qemu-file-channel.c
+++ b/migration/qemu-file-channel.c
@@ -184,11 +184,11 @@ static const QEMUFileOps channel_output_ops = {
QEMUFile *qemu_fopen_channel_input(QIOChannel *ioc)
{
object_ref(OBJECT(ioc));
- return qemu_fopen_ops(ioc, &channel_input_ops);
+ return qemu_file_new_input(ioc, &channel_input_ops);
}
QEMUFile *qemu_fopen_channel_output(QIOChannel *ioc)
{
object_ref(OBJECT(ioc));
- return qemu_fopen_ops(ioc, &channel_output_ops);
+ return qemu_file_new_output(ioc, &channel_output_ops);
}
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index ea1e8da0cb..5548e1abf3 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -38,6 +38,7 @@ struct QEMUFile {
const QEMUFileOps *ops;
const QEMUFileHooks *hooks;
QIOChannel *ioc;
+ bool is_writable;
/*
* Maximum amount of data in bytes to transfer during one
@@ -111,7 +112,9 @@ bool qemu_file_mode_is_not_valid(const char *mode)
return false;
}
-QEMUFile *qemu_fopen_ops(QIOChannel *ioc, const QEMUFileOps *ops)
+static QEMUFile *qemu_file_new_impl(QIOChannel *ioc,
+ const QEMUFileOps *ops,
+ bool is_writable)
{
QEMUFile *f;
@@ -119,10 +122,21 @@ QEMUFile *qemu_fopen_ops(QIOChannel *ioc, const
QEMUFileOps *ops)
f->ioc = ioc;
f->ops = ops;
+ f->is_writable = is_writable;
return f;
}
+QEMUFile *qemu_file_new_output(QIOChannel *ioc, const QEMUFileOps *ops)
+{
+ return qemu_file_new_impl(ioc, ops, true);
+}
+
+QEMUFile *qemu_file_new_input(QIOChannel *ioc, const QEMUFileOps *ops)
+{
+ return qemu_file_new_impl(ioc, ops, false);
+}
+
void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks)
{
@@ -181,7 +195,7 @@ void qemu_file_set_error(QEMUFile *f, int ret)
bool qemu_file_is_writable(QEMUFile *f)
{
- return f->ops->writev_buffer;
+ return f->is_writable;
}
static void qemu_iovec_release_ram(QEMUFile *f)
diff --git a/migration/qemu-file.h b/migration/qemu-file.h
index 0458b1d3b6..07c86bfea3 100644
--- a/migration/qemu-file.h
+++ b/migration/qemu-file.h
@@ -118,7 +118,8 @@ typedef struct QEMUFileHooks {
QEMURamSaveFunc *save_page;
} QEMUFileHooks;
-QEMUFile *qemu_fopen_ops(QIOChannel *ioc, const QEMUFileOps *ops);
+QEMUFile *qemu_file_new_input(QIOChannel *ioc, const QEMUFileOps *ops);
+QEMUFile *qemu_file_new_output(QIOChannel *ioc, const QEMUFileOps *ops);
void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks);
int qemu_get_fd(QEMUFile *f);
int qemu_fclose(QEMUFile *f);
--
2.36.1
- [PATCH 09/20] migration: convert savevm to use QIOChannelBlock for VMState, (continued)
- [PATCH 09/20] migration: convert savevm to use QIOChannelBlock for VMState, Daniel P . Berrangé, 2022/05/24
- [PATCH 10/20] migration: stop passing 'opaque' parameter to QEMUFile hooks, Daniel P . Berrangé, 2022/05/24
- [PATCH 13/20] migration: remove unused QEMUFileGetFD typedef, Daniel P . Berrangé, 2022/05/24
- [PATCH 06/20] migration: rename qemu_ftell to qemu_file_total_transferred, Daniel P . Berrangé, 2022/05/24
- [PATCH 01/20] io: add a QIOChannelNull equivalent to /dev/null, Daniel P . Berrangé, 2022/05/24
- [PATCH 11/20] migration: hardcode assumption that QEMUFile is backed with QIOChannel, Daniel P . Berrangé, 2022/05/24
- [PATCH 03/20] migration: remove unreachble RDMA code in save_hook impl, Daniel P . Berrangé, 2022/05/24
- [PATCH 15/20] migration: remove the QEMUFileOps 'set_blocking' callback, Daniel P . Berrangé, 2022/05/24
- [PATCH 12/20] migration: introduce new constructors for QEMUFile,
Daniel P . Berrangé <=
- [PATCH 16/20] migration: remove the QEMUFileOps 'close' callback, Daniel P . Berrangé, 2022/05/24
- [PATCH 14/20] migration: remove the QEMUFileOps 'shut_down' callback, Daniel P . Berrangé, 2022/05/24
- [PATCH 17/20] migration: remove the QEMUFileOps 'get_buffer' callback, Daniel P . Berrangé, 2022/05/24
- [PATCH 20/20] migration: remove the QEMUFileOps abstraction, Daniel P . Berrangé, 2022/05/24
- [PATCH 18/20] migration: remove the QEMUFileOps 'writev_buffer' callback, Daniel P . Berrangé, 2022/05/24
- [PATCH 08/20] migration: introduce a QIOChannel impl for BlockDriverState VMState, Daniel P . Berrangé, 2022/05/24
- [PATCH 19/20] migration: remove the QEMUFileOps 'get_return_path' callback, Daniel P . Berrangé, 2022/05/24