[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/20] migration: switch to use QIOChannelNull for dummy channel
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 02/20] migration: switch to use QIOChannelNull for dummy channel |
Date: |
Tue, 24 May 2022 12:02:17 +0100 |
This removes one further custom impl of QEMUFile, in favour of a
QIOChannel based impl.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
migration/ram.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 5f5e37f64d..89082716d6 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -32,11 +32,13 @@
#include "qemu/bitmap.h"
#include "qemu/madvise.h"
#include "qemu/main-loop.h"
+#include "io/channel-null.h"
#include "xbzrle.h"
#include "ram.h"
#include "migration.h"
#include "migration/register.h"
#include "migration/misc.h"
+#include "migration/qemu-file-channel.h"
#include "qemu-file.h"
#include "postcopy-ram.h"
#include "page_cache.h"
@@ -457,8 +459,6 @@ static QemuThread *compress_threads;
*/
static QemuMutex comp_done_lock;
static QemuCond comp_done_cond;
-/* The empty QEMUFileOps will be used by file in CompressParam */
-static const QEMUFileOps empty_ops = { };
static QEMUFile *decomp_file;
static DecompressParam *decomp_param;
@@ -569,7 +569,8 @@ static int compress_threads_save_setup(void)
/* comp_param[i].file is just used as a dummy buffer to save data,
* set its ops to empty.
*/
- comp_param[i].file = qemu_fopen_ops(NULL, &empty_ops, false);
+ comp_param[i].file = qemu_fopen_channel_output(
+ QIO_CHANNEL(qio_channel_null_new()));
comp_param[i].done = true;
comp_param[i].quit = false;
qemu_mutex_init(&comp_param[i].mutex);
--
2.36.1
- [PATCH 00/20] migration: remove QEMUFileOps concept and assume use of QIOChannel, Daniel P . Berrangé, 2022/05/24
- [PATCH 04/20] migration: rename rate limiting fields in QEMUFile, Daniel P . Berrangé, 2022/05/24
- [PATCH 05/20] migration: rename 'pos' field in QEMUFile to 'bytes_processed', Daniel P . Berrangé, 2022/05/24
- [PATCH 02/20] migration: switch to use QIOChannelNull for dummy channel,
Daniel P . Berrangé <=
- [PATCH 07/20] migration: rename qemu_update_position to qemu_file_credit_transfer, Daniel P . Berrangé, 2022/05/24
- [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