Failed in applying to current master (
apply log)
Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Stefan Weil <sw@weilnetz.de>, Thomas Huth <thuth@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>, Hyman Huang <yong.huang@smartx.com>, Gerd Hoffmann <kraxel@redhat.com>
MAINTAINERS | 5 +
block.c | 5 +-
block/crypto.c | 144 +++++++-
block/crypto.h | 8 +
block/qcow.c | 2 +-
block/qcow2.c | 2 +-
chardev/char-socket.c | 4 +
crypto/block-luks.c | 52 ++-
crypto/block.c | 4 +-
crypto/blockpriv.h | 2 +
crypto/cipher-gcrypt.c.inc | 8 +
crypto/cipher-nettle.c.inc | 49 +++
crypto/cipher.c | 6 +
docs/system/cpu-models-x86-abi.csv | 20 +-
docs/system/cpu-models-x86.rst.inc | 2 +-
include/crypto/block.h | 16 +
include/sysemu/os-posix.h | 1 +
include/sysemu/os-win32.h | 5 +
io/channel-tls.c | 1 +
io/trace-events | 1 +
meson.build | 66 ++--
os-posix.c | 22 ++
qapi/block-core.json | 13 +-
qapi/crypto.json | 13 +-
scripts/cpu-x86-uarch-abi.py | 1 -
system/vl.c | 3 +-
tests/qemu-iotests/210.out | 4 +
tests/qemu-iotests/tests/luks-detached-header | 316 ++++++++++++++++++
.../tests/luks-detached-header.out | 5 +
tests/unit/test-crypto-block.c | 2 +
tests/unit/test-crypto-cipher.c | 13 +
ui/vnc.c | 34 +-
ui/vnc.h | 22 +-
33 files changed, 760 insertions(+), 91 deletions(-)
create mode 100755 tests/qemu-iotests/tests/luks-detached-header
create mode 100644 tests/qemu-iotests/tests/luks-detached-header.out