[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/15] crypto: Make errp the last parameter of functi
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 07/15] crypto: Make errp the last parameter of functions |
Date: |
Mon, 24 Apr 2017 09:26:52 +0200 |
From: Fam Zheng <address@hidden>
Move opaque to 2nd instead of the 2nd to last, so that compilers help
check with the conversion.
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[Commit message typo corrected]
Signed-off-by: Markus Armbruster <address@hidden>
---
block/crypto.c | 12 ++++++------
crypto/block-luks.c | 21 +++++++++------------
include/crypto/block.h | 12 ++++++------
tests/test-crypto-block.c | 12 ++++++------
4 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index 4a20388..34549b2 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -56,11 +56,11 @@ static int block_crypto_probe_generic(QCryptoBlockFormat
format,
static ssize_t block_crypto_read_func(QCryptoBlock *block,
+ void *opaque,
size_t offset,
uint8_t *buf,
size_t buflen,
- Error **errp,
- void *opaque)
+ Error **errp)
{
BlockDriverState *bs = opaque;
ssize_t ret;
@@ -83,11 +83,11 @@ struct BlockCryptoCreateData {
static ssize_t block_crypto_write_func(QCryptoBlock *block,
+ void *opaque,
size_t offset,
const uint8_t *buf,
size_t buflen,
- Error **errp,
- void *opaque)
+ Error **errp)
{
struct BlockCryptoCreateData *data = opaque;
ssize_t ret;
@@ -102,9 +102,9 @@ static ssize_t block_crypto_write_func(QCryptoBlock *block,
static ssize_t block_crypto_init_func(QCryptoBlock *block,
+ void *opaque,
size_t headerlen,
- Error **errp,
- void *opaque)
+ Error **errp)
{
struct BlockCryptoCreateData *data = opaque;
int ret;
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index 4530f82..d5a31bb 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -473,10 +473,10 @@ qcrypto_block_luks_load_key(QCryptoBlock *block,
* then encrypted.
*/
rv = readfunc(block,
+ opaque,
slot->key_offset * QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,
splitkey, splitkeylen,
- errp,
- opaque);
+ errp);
if (rv < 0) {
goto cleanup;
}
@@ -676,11 +676,10 @@ qcrypto_block_luks_open(QCryptoBlock *block,
/* Read the entire LUKS header, minus the key material from
* the underlying device */
- rv = readfunc(block, 0,
+ rv = readfunc(block, opaque, 0,
(uint8_t *)&luks->header,
sizeof(luks->header),
- errp,
- opaque);
+ errp);
if (rv < 0) {
ret = rv;
goto fail;
@@ -1246,7 +1245,7 @@ qcrypto_block_luks_create(QCryptoBlock *block,
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE;
/* Reserve header space to match payload offset */
- initfunc(block, block->payload_offset, &local_err, opaque);
+ initfunc(block, opaque, block->payload_offset, &local_err);
if (local_err) {
error_propagate(errp, local_err);
goto error;
@@ -1268,11 +1267,10 @@ qcrypto_block_luks_create(QCryptoBlock *block,
/* Write out the partition header and key slot headers */
- writefunc(block, 0,
+ writefunc(block, opaque, 0,
(const uint8_t *)&luks->header,
sizeof(luks->header),
- &local_err,
- opaque);
+ &local_err);
/* Delay checking local_err until we've byte-swapped */
@@ -1297,12 +1295,11 @@ qcrypto_block_luks_create(QCryptoBlock *block,
/* Write out the master key material, starting at the
* sector immediately following the partition header. */
- if (writefunc(block,
+ if (writefunc(block, opaque,
luks->header.key_slots[0].key_offset *
QCRYPTO_BLOCK_LUKS_SECTOR_SIZE,
splitkey, splitkeylen,
- errp,
- opaque) != splitkeylen) {
+ errp) != splitkeylen) {
goto error;
}
diff --git a/include/crypto/block.h b/include/crypto/block.h
index b6971de..4a053a3 100644
--- a/include/crypto/block.h
+++ b/include/crypto/block.h
@@ -30,23 +30,23 @@ typedef struct QCryptoBlock QCryptoBlock;
* and QCryptoBlockOpenOptions in qapi/crypto.json */
typedef ssize_t (*QCryptoBlockReadFunc)(QCryptoBlock *block,
+ void *opaque,
size_t offset,
uint8_t *buf,
size_t buflen,
- Error **errp,
- void *opaque);
+ Error **errp);
typedef ssize_t (*QCryptoBlockInitFunc)(QCryptoBlock *block,
+ void *opaque,
size_t headerlen,
- Error **errp,
- void *opaque);
+ Error **errp);
typedef ssize_t (*QCryptoBlockWriteFunc)(QCryptoBlock *block,
+ void *opaque,
size_t offset,
const uint8_t *buf,
size_t buflen,
- Error **errp,
- void *opaque);
+ Error **errp);
/**
* qcrypto_block_has_format:
diff --git a/tests/test-crypto-block.c b/tests/test-crypto-block.c
index 1957a86..85e6603 100644
--- a/tests/test-crypto-block.c
+++ b/tests/test-crypto-block.c
@@ -187,11 +187,11 @@ static struct QCryptoBlockTestData {
static ssize_t test_block_read_func(QCryptoBlock *block,
+ void *opaque,
size_t offset,
uint8_t *buf,
size_t buflen,
- Error **errp,
- void *opaque)
+ Error **errp)
{
Buffer *header = opaque;
@@ -204,9 +204,9 @@ static ssize_t test_block_read_func(QCryptoBlock *block,
static ssize_t test_block_init_func(QCryptoBlock *block,
+ void *opaque,
size_t headerlen,
- Error **errp,
- void *opaque)
+ Error **errp)
{
Buffer *header = opaque;
@@ -219,11 +219,11 @@ static ssize_t test_block_init_func(QCryptoBlock *block,
static ssize_t test_block_write_func(QCryptoBlock *block,
+ void *opaque,
size_t offset,
const uint8_t *buf,
size_t buflen,
- Error **errp,
- void *opaque)
+ Error **errp)
{
Buffer *header = opaque;
--
2.7.4
- [Qemu-devel] [PULL 00/15] Error reporting patches for 2017-04-24, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 01/15] util/error: Fix leak in error_vprepend(), Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 02/15] socket: Make errp the last parameter of socket_connect, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 15/15] error: Apply error_propagate_null.cocci again, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 07/15] crypto: Make errp the last parameter of functions,
Markus Armbruster <=
- [Qemu-devel] [PULL 10/15] nfs: Make errp the last parameter of nfs_client_open, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 04/15] socket: Make errp the last parameter of unix_connect_saddr, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 08/15] mirror: Make errp the last parameter of mirror_start_job, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 05/15] socket: Make errp the last parameter of vsock_connect_saddr, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 14/15] qga: Make errp the last parameter of qga_vss_fsfreeze, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 11/15] fdc: Make errp the last parameter of fdctrl_connect_drives, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 09/15] block: Make errp the last parameter of commit_active_start, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 03/15] socket: Make errp the last parameter of inet_connect_saddr, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 06/15] block: Make errp the last parameter of bdrv_img_create, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 13/15] migration: Make errp the last parameter of local functions, Markus Armbruster, 2017/04/24