From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
qemu-block@nongnu.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
"Hailiang Zhang" <zhang.zhanghailiang@huawei.com>,
"Juan Quintela" <quintela@redhat.com>,
"Fam Zheng" <fam@euphon.net>
Subject: [PATCH 00/20] migration: remove QEMUFileOps concept and assume use of QIOChannel
Date: Tue, 24 May 2022 12:02:15 +0100 [thread overview]
Message-ID: <20220524110235.145079-1-berrange@redhat.com> (raw)
Quite a while ago now, the majority of QEMUFile implementations were
switched over to use QIOChannel APIs, but a couple remained.
The newish multifd code is directly using QIOChannel, only calling
in to QEMUFile for the VMState transfer and for rate limiting
purposes.
This series finishes the job of converting QEMUFile to always have
a QIOChannel as its backend, enabling a removal of QEMUFileOps.
Most callers still need to use the QEMUFile APIs though, as that
performs buffering of reads/writes.
As a followup to this series, however, it would be practical to
introduce a QIOChannelCache that layers on top of another QIOChannel
to add buffering equivalent to what QEMUFile does, possibly with
the rate limiting too.
At that point QEMUFile would not really be doing much at all and
could possibly go away entirely, leaving just the MigrationState
object for global state tracking, managing one or more QIOChannel
objects for the data transfer. I think this could simplify future
evolution of migration code.
I'm not likely to have time in the immediate future to work on
such a followup though.
Daniel P. Berrangé (20):
io: add a QIOChannelNull equivalent to /dev/null
migration: switch to use QIOChannelNull for dummy channel
migration: remove unreachble RDMA code in save_hook impl
migration: rename rate limiting fields in QEMUFile
migration: rename 'pos' field in QEMUFile to 'bytes_processed'
migration: rename qemu_ftell to qemu_file_total_transferred
migration: rename qemu_update_position to qemu_file_credit_transfer
migration: introduce a QIOChannel impl for BlockDriverState VMState
migration: convert savevm to use QIOChannelBlock for VMState
migration: stop passing 'opaque' parameter to QEMUFile hooks
migration: hardcode assumption that QEMUFile is backed with QIOChannel
migration: introduce new constructors for QEMUFile
migration: remove unused QEMUFileGetFD typedef
migration: remove the QEMUFileOps 'shut_down' callback
migration: remove the QEMUFileOps 'set_blocking' callback
migration: remove the QEMUFileOps 'close' callback
migration: remove the QEMUFileOps 'get_buffer' callback
migration: remove the QEMUFileOps 'writev_buffer' callback
migration: remove the QEMUFileOps 'get_return_path' callback
migration: remove the QEMUFileOps abstraction
include/io/channel-null.h | 55 +++++++
io/channel-null.c | 237 ++++++++++++++++++++++++++++++
io/meson.build | 1 +
io/trace-events | 3 +
migration/block.c | 10 +-
migration/channel-block.c | 195 ++++++++++++++++++++++++
migration/channel-block.h | 59 ++++++++
migration/channel.c | 4 +-
migration/colo.c | 5 +-
migration/meson.build | 2 +-
migration/migration.c | 9 +-
migration/qemu-file-channel.c | 194 ------------------------
migration/qemu-file-channel.h | 32 ----
migration/qemu-file.c | 188 +++++++++++++-----------
migration/qemu-file.h | 122 +++++++--------
migration/ram.c | 8 +-
migration/rdma.c | 144 +++++-------------
migration/savevm.c | 55 ++-----
migration/vmstate.c | 4 +-
tests/unit/meson.build | 1 +
tests/unit/test-io-channel-null.c | 95 ++++++++++++
tests/unit/test-vmstate.c | 5 +-
22 files changed, 870 insertions(+), 558 deletions(-)
create mode 100644 include/io/channel-null.h
create mode 100644 io/channel-null.c
create mode 100644 migration/channel-block.c
create mode 100644 migration/channel-block.h
delete mode 100644 migration/qemu-file-channel.c
delete mode 100644 migration/qemu-file-channel.h
create mode 100644 tests/unit/test-io-channel-null.c
--
2.36.1
next reply other threads:[~2022-05-24 11:57 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-24 11:02 Daniel P. Berrangé [this message]
2022-05-24 11:02 ` [PATCH 01/20] io: add a QIOChannelNull equivalent to /dev/null Daniel P. Berrangé
2022-05-24 21:14 ` Eric Blake
2022-06-16 16:26 ` Daniel P. Berrangé
2022-05-24 11:02 ` [PATCH 02/20] migration: switch to use QIOChannelNull for dummy channel Daniel P. Berrangé
2022-05-24 21:15 ` Eric Blake
2022-05-24 11:02 ` [PATCH 03/20] migration: remove unreachble RDMA code in save_hook impl Daniel P. Berrangé
2022-05-25 12:29 ` Eric Blake
2022-06-08 17:59 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 04/20] migration: rename rate limiting fields in QEMUFile Daniel P. Berrangé
2022-06-09 9:29 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 05/20] migration: rename 'pos' field in QEMUFile to 'bytes_processed' Daniel P. Berrangé
2022-06-09 9:51 ` Dr. David Alan Gilbert
2022-06-09 9:57 ` Daniel P. Berrangé
2022-06-09 9:59 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 06/20] migration: rename qemu_ftell to qemu_file_total_transferred Daniel P. Berrangé
2022-06-09 10:23 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 07/20] migration: rename qemu_update_position to qemu_file_credit_transfer Daniel P. Berrangé
2022-06-09 10:29 ` Dr. David Alan Gilbert
2022-06-09 12:56 ` Peter Maydell
2022-06-09 13:02 ` Daniel P. Berrangé
2022-06-09 13:15 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 08/20] migration: introduce a QIOChannel impl for BlockDriverState VMState Daniel P. Berrangé
2022-05-24 11:02 ` [PATCH 09/20] migration: convert savevm to use QIOChannelBlock for VMState Daniel P. Berrangé
2022-06-09 14:57 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 10/20] migration: stop passing 'opaque' parameter to QEMUFile hooks Daniel P. Berrangé
2022-06-09 15:00 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 11/20] migration: hardcode assumption that QEMUFile is backed with QIOChannel Daniel P. Berrangé
2022-06-09 15:01 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 12/20] migration: introduce new constructors for QEMUFile Daniel P. Berrangé
2022-06-09 15:33 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 13/20] migration: remove unused QEMUFileGetFD typedef Daniel P. Berrangé
2022-06-09 16:03 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 14/20] migration: remove the QEMUFileOps 'shut_down' callback Daniel P. Berrangé
2022-06-09 16:12 ` Dr. David Alan Gilbert
2022-06-09 16:14 ` Daniel P. Berrangé
2022-06-09 16:17 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 15/20] migration: remove the QEMUFileOps 'set_blocking' callback Daniel P. Berrangé
2022-06-09 16:21 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 16/20] migration: remove the QEMUFileOps 'close' callback Daniel P. Berrangé
2022-06-09 16:40 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 17/20] migration: remove the QEMUFileOps 'get_buffer' callback Daniel P. Berrangé
2022-06-09 16:46 ` Dr. David Alan Gilbert
2022-06-09 17:09 ` Daniel P. Berrangé
2022-05-24 11:02 ` [PATCH 18/20] migration: remove the QEMUFileOps 'writev_buffer' callback Daniel P. Berrangé
2022-06-09 16:51 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 19/20] migration: remove the QEMUFileOps 'get_return_path' callback Daniel P. Berrangé
2022-06-09 16:54 ` Dr. David Alan Gilbert
2022-05-24 11:02 ` [PATCH 20/20] migration: remove the QEMUFileOps abstraction Daniel P. Berrangé
2022-06-09 16:59 ` Dr. David Alan Gilbert
2022-06-09 17:10 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220524110235.145079-1-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=fam@euphon.net \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
--cc=zhang.zhanghailiang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).