diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-12-13 18:45:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-12-13 18:45:18 +0000 |
| commit | d8d5fefd8657d4f7b380b3a1533340434b5b9def (patch) | |
| tree | 24c2b02e6117625f2d3385c91c6226306e1be549 /include | |
| parent | 2d894e48362ad2a576fca929dcca1787f43a8af6 (diff) | |
| parent | c972fa123c73501b4b0c6de7873754ea3205a5eb (diff) | |
| download | qemu-d8d5fefd8657d4f7b380b3a1533340434b5b9def.zip qemu-d8d5fefd8657d4f7b380b3a1533340434b5b9def.tar.gz qemu-d8d5fefd8657d4f7b380b3a1533340434b5b9def.tar.bz2 | |
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging
Merge crypto patches 2018/12/12
- Fix documentation about default LUKS algorithms
- Support for multi-threaded block crypto
# gpg: Signature made Wed 12 Dec 2018 11:21:52 GMT
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/qcrypto-next-pull-request:
crypto: support multiple threads accessing one QCryptoBlock
crypto/block: introduce qcrypto_block_*crypt_helper functions
crypto/block: rename qcrypto_block_*crypt_helper
crypto/block: refactor qcrypto_block_*crypt_helper functions
crypto/block-luks: fix memory leak in qcrypto_block_luks_create
crypto: Fix defaults in QCryptoBlockCreateOptionsLUKS
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/block.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/crypto/block.h b/include/crypto/block.h index cd18f46..e729d5b 100644 --- a/include/crypto/block.h +++ b/include/crypto/block.h @@ -75,6 +75,7 @@ typedef enum { * @readfunc: callback for reading data from the volume * @opaque: data to pass to @readfunc * @flags: bitmask of QCryptoBlockOpenFlags values + * @n_threads: allow concurrent I/O from up to @n_threads threads * @errp: pointer to a NULL-initialized error object * * Create a new block encryption object for an existing @@ -107,6 +108,7 @@ QCryptoBlock *qcrypto_block_open(QCryptoBlockOpenOptions *options, QCryptoBlockReadFunc readfunc, void *opaque, unsigned int flags, + size_t n_threads, Error **errp); /** |