[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/25] migration: remove the QEMUFileOps 'get_return_path' callbac
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 24/25] migration: remove the QEMUFileOps 'get_return_path' callback |
Date: |
Thu, 23 Jun 2022 17:53:53 +0100 |
From: Daniel P. Berrangé <berrange@redhat.com>
This directly implements the get_return_path logic using QIOChannel APIs.
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>
---
migration/qemu-file-channel.c | 16 ----------------
migration/qemu-file.c | 22 ++++++++++------------
migration/qemu-file.h | 6 ------
3 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
index 2e139f7bcd..51717c1137 100644
--- a/migration/qemu-file-channel.c
+++ b/migration/qemu-file-channel.c
@@ -32,27 +32,11 @@
#include "yank_functions.h"
-static QEMUFile *channel_get_input_return_path(void *opaque)
-{
- QIOChannel *ioc = QIO_CHANNEL(opaque);
-
- return qemu_fopen_channel_output(ioc);
-}
-
-static QEMUFile *channel_get_output_return_path(void *opaque)
-{
- QIOChannel *ioc = QIO_CHANNEL(opaque);
-
- return qemu_fopen_channel_input(ioc);
-}
-
static const QEMUFileOps channel_input_ops = {
- .get_return_path = channel_get_input_return_path,
};
static const QEMUFileOps channel_output_ops = {
- .get_return_path = channel_get_output_return_path,
};
diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 355117fee0..fad0e33164 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -95,18 +95,6 @@ int qemu_file_shutdown(QEMUFile *f)
return ret;
}
-/*
- * Result: QEMUFile* for a 'return path' for comms in the opposite direction
- * NULL if not available
- */
-QEMUFile *qemu_file_get_return_path(QEMUFile *f)
-{
- if (!f->ops->get_return_path) {
- return NULL;
- }
- return f->ops->get_return_path(f->ioc);
-}
-
bool qemu_file_mode_is_not_valid(const char *mode)
{
if (mode == NULL ||
@@ -134,6 +122,16 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc,
return f;
}
+/*
+ * Result: QEMUFile* for a 'return path' for comms in the opposite direction
+ * NULL if not available
+ */
+QEMUFile *qemu_file_get_return_path(QEMUFile *f)
+{
+ object_ref(f->ioc);
+ return qemu_file_new_impl(f->ioc, f->ops, !f->is_writable);
+}
+
QEMUFile *qemu_file_new_output(QIOChannel *ioc, const QEMUFileOps *ops)
{
return qemu_file_new_impl(ioc, ops, true);
diff --git a/migration/qemu-file.h b/migration/qemu-file.h
index de3f066014..fe8f9766d1 100644
--- a/migration/qemu-file.h
+++ b/migration/qemu-file.h
@@ -55,13 +55,7 @@ typedef size_t (QEMURamSaveFunc)(QEMUFile *f,
size_t size,
uint64_t *bytes_sent);
-/*
- * Return a QEMUFile for comms in the opposite direction
- */
-typedef QEMUFile *(QEMURetPathFunc)(void *opaque);
-
typedef struct QEMUFileOps {
- QEMURetPathFunc *get_return_path;
} QEMUFileOps;
typedef struct QEMUFileHooks {
--
2.36.1
- [PULL 10/25] migration: rename qemu_ftell to qemu_file_total_transferred, (continued)
- [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), 2022/06/23
- [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) <=
- [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
- [PULL 20/25] migration: remove the QEMUFileOps 'set_blocking' callback, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 25/25] migration: remove the QEMUFileOps abstraction, Dr. David Alan Gilbert (git), 2022/06/23
- [PULL 23/25] migration: remove the QEMUFileOps 'writev_buffer' callback, Dr. David Alan Gilbert (git), 2022/06/23
- Re: [PULL 00/25] migration queue, Richard Henderson, 2022/06/23