chardev/char-socket.c | 4 +-- include/io/channel.h | 6 ++++ io/channel-buffer.c | 1 + io/channel-command.c | 1 + io/channel-file.c | 1 + io/channel-null.c | 1 + io/channel-socket.c | 17 ++++++++++- io/channel-tls.c | 1 + io/channel-websock.c | 1 + io/channel.c | 16 +++++++--- migration/channel-block.c | 1 + migration/channel.c | 45 +++++++++++++++++++++++++++++ migration/channel.h | 5 ++++ migration/migration.c | 45 +++++++++++++++++++++-------- migration/multifd.c | 12 +++----- migration/multifd.h | 2 +- migration/postcopy-ram.c | 5 +--- migration/postcopy-ram.h | 2 +- migration/rdma.c | 1 + scsi/qemu-pr-helper.c | 2 +- tests/qtest/tpm-emu.c | 2 +- tests/unit/test-io-channel-socket.c | 1 + util/vhost-user-server.c | 2 +- 23 files changed, 138 insertions(+), 36 deletions(-)