On 5/16/22 08:37, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 10c2a0c5e7d48e590d945c017b5b8af5b4c89a3c:
>
> Merge tag 'or1k-pull-request-20220515' of https://github.com/stffrdhrn/qemu into staging (2022-05-15 16:56:27 -0700)
>
> are available in the Git repository at:
>
> https://gitlab.com/dagrh/qemu.git tags/pull-migration-20220516a
>
> for you to fetch changes up to 5b1d9bab2da4fca3a3caee97c430e5709cb32b7b:
>
> multifd: Implement zero copy write in multifd migration (multifd-zero-copy) (2022-05-16 13:56:24 +0100)
>
> ----------------------------------------------------------------
> Migration pull 2022-05-16
>
> (This replaces the 28th April through 10th May sets)
> Compared to that last set it just has the Alpine
> uring check that Leo has added; although that's also
> now fixed upstream in Alpine.
>
> It contains:
> TLS test fixes from Dan
> Zerocopy migration feature from Leo
>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.
r~
>
> ----------------------------------------------------------------
> Daniel P. Berrangé (9):
> tests: fix encoding of IP addresses in x509 certs
> tests: add more helper macros for creating TLS x509 certs
> tests: add migration tests of TLS with PSK credentials
> tests: add migration tests of TLS with x509 credentials
> tests: convert XBZRLE migration test to use common helper
> tests: convert multifd migration tests to use common helper
> tests: add multifd migration tests of TLS with PSK credentials
> tests: add multifd migration tests of TLS with x509 credentials
> tests: ensure migration status isn't reported as failed
>
> Leonardo Bras (8):
> meson.build: Fix docker-test-build@alpine when including linux/errqueue.h
> QIOChannel: Add flags on io_writev and introduce io_flush callback
> QIOChannelSocket: Implement io_writev zero copy flag & io_flush for CONFIG_LINUX
> migration: Add zero-copy-send parameter for QMP/HMP for Linux
> migration: Add migrate_use_tls() helper
> multifd: multifd_send_sync_main now returns negative on error
> multifd: Send header packet without flags if zero-copy-send is enabled
> multifd: Implement zero copy write in multifd migration (multifd-zero-copy)
>
> chardev/char-io.c | 2 +-
> hw/remote/mpqemu-link.c | 2 +-
> include/io/channel-socket.h | 2 +
> include/io/channel.h | 38 +-
> io/channel-buffer.c | 1 +
> io/channel-command.c | 1 +
> io/channel-file.c | 1 +
> io/channel-socket.c | 118 ++++-
> io/channel-tls.c | 1 +
> io/channel-websock.c | 1 +
> io/channel.c | 49 +-
> meson.build | 12 +
> migration/channel.c | 3 +-
> migration/migration.c | 52 ++-
> migration/migration.h | 6 +
> migration/multifd.c | 74 ++-
> migration/multifd.h | 4 +-
> migration/ram.c | 29 +-
> migration/rdma.c | 1 +
> migration/socket.c | 12 +-
> monitor/hmp-cmds.c | 6 +
> qapi/migration.json | 24 +
> scsi/pr-manager-helper.c | 2 +-
> tests/qtest/meson.build | 12 +-
> tests/qtest/migration-helpers.c | 13 +
> tests/qtest/migration-helpers.h | 1 +
> tests/qtest/migration-test.c | 867 +++++++++++++++++++++++++++++++----
> tests/unit/crypto-tls-psk-helpers.c | 18 +-
> tests/unit/crypto-tls-psk-helpers.h | 1 +
> tests/unit/crypto-tls-x509-helpers.c | 16 +-
> tests/unit/crypto-tls-x509-helpers.h | 53 +++
> tests/unit/test-crypto-tlssession.c | 11 +-
> tests/unit/test-io-channel-socket.c | 1 +
> 33 files changed, 1295 insertions(+), 139 deletions(-)
>
>