Re: [PULL 00/25] migration queue

[Richard Henderson]

On 6/23/22 09:53, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 2b049d2c8dc01de750410f8f1a4eac498c04c723:
>
>    Merge tag 'pull-aspeed-20220622' of https://github.com/legoater/qemu into 
> staging (2022-06-22 07:27:06 -0700)
>
> are available in the Git repository at:
>
>    https://gitlab.com/dagrh/qemu.git tags/pull-migration-20220623b
>
> for you to fetch changes up to 77ef2dc1c8c6a482fd06fdf3b59d0647f0850e3e:
>
>    migration: remove the QEMUFileOps abstraction (2022-06-23 10:18:13 +0100)
>
> ----------------------------------------------------------------
> [v3] Migration pull 2022-06-23
>
> This replaces my and Juan's earlier pulls over the last 2 days;
> 4th time lucky?
>
> Compared to my pull earlier:
>    Removed Hyman's dirty ring set
>
> In this migration PULL request:
> - Dainiel Berrangé - qemufileops cleanup
> - Leonardo Bras  - cleanups for zero copy
> - Juan Quintela  - RDMA cleanups

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/7.1 as 
appropriate.


r~


> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> ----------------------------------------------------------------
> 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
>
> Juan Quintela (1):
>        migration: Remove RDMA_UNREGISTRATION_EXAMPLE
>
> Leonardo Bras (3):
>        QIOChannelSocket: Introduce assert and reduce ifdefs to improve 
> readability
>        QIOChannelSocket: Fix zero-copy send so socket flush works
>        migration: Change zero_copy_send from migration parameter to migration 
> capability
>
>   include/io/channel-null.h         |  55 +++++++++
>   io/channel-null.c                 | 237 ++++++++++++++++++++++++++++++++++++++
>   io/channel-socket.c               |  19 ++-
>   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             |  68 +++++------
>   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                  | 185 ++++++-----------------------
>   migration/savevm.c                |  55 ++-------
>   migration/vmstate.c               |   5 +-
>   monitor/hmp-cmds.c                |   6 -
>   qapi/migration.json               |  33 ++----
>   tests/unit/meson.build            |   1 +
>   tests/unit/test-io-channel-null.c |  95 +++++++++++++++
>   tests/unit/test-vmstate.c         |   5 +-
>   26 files changed, 928 insertions(+), 671 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