Re: [PULL 00/16] migration queue

[Dr. David Alan Gilbert]

* Dr. David Alan Gilbert (git) (dgilbert@redhat.com) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> The following changes since commit 178bacb66d98d9ee7a702b9f2a4dfcd88b72a9ab:
> 
>   Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into 
> staging (2022-05-09 11:07:04 -0700)
> 
> are available in the Git repository at:
> 
>   https://gitlab.com/dagrh/qemu.git tags/pull-migration-20220510a
> 
> for you to fetch changes up to 511f4a0506af1d380115a61f3362149953646871:
> 
>   multifd: Implement zero copy write in multifd migration (multifd-zero-copy) 
> (2022-05-10 09:15:06 +0100)

Nack
This is still failing the Alpine build test:

ninja: job failed: cc -m64 -mcx16 -Ilibio.fa.p -I. -I.. -Iqapi -Itrace -Iui 
-Iui/shader -I/usr/include/p11-kit-1 -I/usr/include/glib-2.0 
-I/usr/lib/glib-2.0/include -fdiagnostics-color=auto -Wall -Winvalid-pch 
-Werror -std=gnu11 -O2 -g -isystem /builds/dagrh/qemu/linux-headers -isystem 
linux-headers -iquote . -iquote /builds/dagrh/qemu -iquote 
/builds/dagrh/qemu/include -iquote /builds/dagrh/qemu/disas/libvixl -iquote 
/builds/dagrh/qemu/tcg/i386 -pthread -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes 
-Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes 
-fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration 
-Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self 
-Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels 
-Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs 
-Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE -MD -MQ 
libio.fa.p/io_channel-socket.c.o -MF libio.fa.p/io_channel-socket.c.o.d -o 
libio.fa.p/io_channel-socket.c.o -c ../io/channel-socket.c
In file included from /usr/include/linux/errqueue.h:6,
                 from ../io/channel-socket.c:29:
/usr/include/linux/time_types.h:7:8: error: redefinition of 'struct 
__kernel_timespec'
    7 | struct __kernel_timespec {
      |        ^~~~~~~~~~~~~~~~~
In file included from /usr/include/liburing.h:19,
                 from /builds/dagrh/qemu/include/block/aio.h:18,
                 from /builds/dagrh/qemu/include/io/channel.h:26,
                 from /builds/dagrh/qemu/include/io/channel-socket.h:24,
                 from ../io/channel-socket.c:24:
/usr/include/liburing/compat.h:9:8: note: originally defined here
    9 | struct __kernel_timespec {
      |        ^~~~~~~~~~~~~~~~~
ninja: subcommand failed
make: *** [Makefile:163: run-ninja] Error 1

> ----------------------------------------------------------------
> Migration pull 2022-05-10
> 
> This replaces yesterdays and the pull originally sent on 28th April;
> compared to yesterdays this fixes an accidental change to skiboot.
> 
> It contains:
>   TLS test fixes from Dan
>   Zerocopy migration feature from Leo
> 
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> 
> ----------------------------------------------------------------
> 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 (7):
>       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                          |   1 +
>  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, 1284 insertions(+), 139 deletions(-)
> 
> 
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK