Failed in applying to current master (
apply log)
Maintainers: "Daniel P. Berrangé" <berrange@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>
crypto/tlssession.c | 103 ++++++++++++++++++++++++++++++++-
crypto/trace-events | 2 +
include/crypto/tlssession.h | 14 +++++
include/io/channel.h | 1 +
io/channel-tls.c | 5 ++
meson.build | 9 +++
meson_options.txt | 2 +
migration/migration-hmp-cmds.c | 10 ++--
migration/tls.c | 9 +++
scripts/meson-buildoptions.sh | 5 ++
10 files changed, 152 insertions(+), 8 deletions(-)