Skip to content

migration: remove QEMUFileOps concept and assume use of QIOChannel

Daniel P. Berrangé qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest21 patches 25 repliesIn review
  2. v120 patches 30 repliesSuperseded

Changes in v2 from the cover letter

- Fix explanation of QIOChannelNull functionality
- Improve commit message wrt renaming 'pos' field
- Add patch to rename qemu_update_transfer method too
- Avoid redundancy in qemu_file_total_transferred and qemu_file_total_transferred_fast docs
- Address line length / trailing whitespace
- Remove qemu_get_fd prototype at same time as QEMUFileGetFD typedef

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21io: add a QIOChannelNull equivalent to /dev/nullinclude/io/channel-null.h io/channel-null.c io/meson.build +3 more+392 -01 reply
2/21migration: switch to use QIOChannelNull for dummy channelmigration/ram.c+4 -31 reply
3/21migration: remove unreachble RDMA code in save_hook implmigration/rdma.c+21 -991 reply
4/21migration: rename rate limiting fields in QEMUFilemigration/qemu-file.c+19 -111 reply
5/21migration: rename 'pos' field in QEMUFile to 'bytes_processed'migration/qemu-file.c+10 -91 reply
6/21migration: rename qemu_ftell to qemu_file_total_transferredmigration/block.c migration/migration.c migration/qemu-file.c +3 more+45 -151 reply
7/21migration: rename qemu_update_position to qemu_file_credit_transfermigration/qemu-file.c migration/qemu-file.h migration/ram.c+11 -41 reply
8/21migration: rename qemu_file_update_transfer to qemu_file_acct_rate_limitmigration/multifd.c migration/qemu-file.c migration/qemu-file.h+11 -42 replies
9/21migration: introduce a QIOChannel impl for BlockDriverState VMStatemigration/channel-block.c migration/channel-block.h migration/meson.build+255 -03 replies
10/21migration: convert savevm to use QIOChannelBlock for VMStatemigration/savevm.c+4 -381 reply
11/21migration: stop passing 'opaque' parameter to QEMUFile hooksmigration/qemu-file.c migration/qemu-file.h migration/rdma.c+20 -211 reply
12/21migration: hardcode assumption that QEMUFile is backed with QIOChannelmigration/qemu-file-channel.c migration/qemu-file.c migration/qemu-file.h+20 -211 reply
13/21migration: introduce new constructors for QEMUFilemigration/qemu-file-channel.c migration/qemu-file.c migration/qemu-file.h+20 -51 reply
14/21migration: remove unused QEMUFileGetFD typedef / qemu_get_fd methodmigration/qemu-file.h+0 -51 reply
15/21migration: remove the QEMUFileOps 'shut_down' callbackmigration/qemu-file-channel.c migration/qemu-file.c migration/qemu-file.h+10 -401 reply
16/21migration: remove the QEMUFileOps 'set_blocking' callbackmigration/qemu-file-channel.c migration/qemu-file.c migration/qemu-file.h+1 -221 reply
17/21migration: remove the QEMUFileOps 'close' callbackmigration/qemu-file-channel.c migration/qemu-file.c migration/qemu-file.h+6 -281 reply
18/21migration: remove the QEMUFileOps 'get_buffer' callbackmigration/qemu-file-channel.c migration/qemu-file.c migration/qemu-file.h+16 -402 replies
19/21migration: remove the QEMUFileOps 'writev_buffer' callbackmigration/qemu-file-channel.c migration/qemu-file.c migration/qemu-file.h+8 -681 reply
20/21migration: remove the QEMUFileOps 'get_return_path' callbackmigration/qemu-file-channel.c migration/qemu-file.c migration/qemu-file.h+10 -341 reply
21/21migration: remove the QEMUFileOps abstractionmigration/channel.c migration/colo.c migration/meson.build +9 more+27 -1261 reply

Reviews trailers per patch

All 21 patches have a Reviewed-by or Acked-by.

PatchEric BlakeDr. David Alan GilbertDaniel P. BerrangéJuan Quintela
1/21R-b
2/21R-b R-b
3/21R-b R-b R-b
4/21R-b R-b
5/21R-b R-b
6/21R-b R-b
7/21R-b R-b
8/21R-b R-b
9/21R-b R-b
10/21R-b R-b
11/21R-b R-b
12/21R-b R-b
13/21R-b R-b
14/21R-b R-b
15/21R-b R-b
16/21R-b R-b
17/21R-b R-b
18/21R-b R-b
19/21R-b R-b
20/21R-b R-b
21/21R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v2 thread

Cover letter [PATCH v2 00/21] migration: remove QEMUFileOps concept and assume use of QIOChannel

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.

Changed in v2:

- Fix explanation of QIOChannelNull functionality
- Improve commit message wrt renaming 'pos' field
- Add patch to rename qemu_update_transfer method too
- Avoid redundancy in qemu_file_total_transferred and qemu_file_total_transferred_fast docs
- Address line length / trailing whitespace
- Remove qemu_get_fd prototype at same time as QEMUFileGetFD typedef

Daniel P. Berrangé (21):
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: rename qemu_file_update_transfer to
qemu_file_acct_rate_limit
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 / qemu_get_fd method
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             |  10 +-
 migration/multifd.c               |   4 +-
 migration/qemu-file-channel.c     | 194 ------------------------
 migration/qemu-file-channel.h     |  32 ----
 migration/qemu-file.c             | 193 +++++++++++++-----------
 migration/qemu-file.h             | 125 +++++++---------
 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 +-
 23 files changed, 879 insertions(+), 562 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
Signature · 1 line
2.36.1