[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/23] crypto: Switch to QEMU UUID API
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 07/23] crypto: Switch to QEMU UUID API |
Date: |
Fri, 23 Sep 2016 13:10:14 +0800 |
The uuid generation doesn't return error, so update the function
signature and calling code accordingly.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
---
crypto/block-luks.c | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index a848232..4530f82 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -29,10 +29,7 @@
#include "crypto/pbkdf.h"
#include "crypto/secret.h"
#include "crypto/random.h"
-
-#ifdef CONFIG_UUID
-#include <uuid/uuid.h>
-#endif
+#include "qemu/uuid.h"
#include "qemu/coroutine.h"
@@ -877,18 +874,12 @@ qcrypto_block_luks_open(QCryptoBlock *block,
}
-static int
-qcrypto_block_luks_uuid_gen(uint8_t *uuidstr, Error **errp)
+static void
+qcrypto_block_luks_uuid_gen(uint8_t *uuidstr)
{
-#ifdef CONFIG_UUID
- uuid_t uuid;
- uuid_generate(uuid);
- uuid_unparse(uuid, (char *)uuidstr);
- return 0;
-#else
- error_setg(errp, "Unable to generate uuids on this platform");
- return -1;
-#endif
+ QemuUUID uuid;
+ qemu_uuid_generate(&uuid);
+ qemu_uuid_unparse(&uuid, (char *)uuidstr);
}
static int
@@ -965,10 +956,7 @@ qcrypto_block_luks_create(QCryptoBlock *block,
* it out to disk
*/
luks->header.version = QCRYPTO_BLOCK_LUKS_VERSION;
- if (qcrypto_block_luks_uuid_gen(luks->header.uuid,
- errp) < 0) {
- goto error;
- }
+ qcrypto_block_luks_uuid_gen(luks->header.uuid);
cipher_alg = qcrypto_block_luks_cipher_alg_lookup(luks_opts.cipher_alg,
errp);
--
2.7.4
- [Qemu-devel] [PULL 00/23] Various patches, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 01/23] docker: Handle exceptions when looking for docker command, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 03/23] uuid: Make null_uuid static, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 02/23] util: Add UUID API, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 05/23] vdi: Use QEMU UUID API, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 04/23] vhdx: Use QEMU UUID API, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 06/23] vpc: Use QEMU UUID API, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 07/23] crypto: Switch to QEMU UUID API,
Fam Zheng <=
- [Qemu-devel] [PULL 08/23] tests: No longer dependent on CONFIG_UUID, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 09/23] configure: Remove detection code for UUID, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 10/23] vl: Switch qemu_uuid to QemuUUID, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 11/23] uuid: Tighten uuid parse, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 13/23] Add UUID files to MAINTAINERS, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 12/23] tests: Add uuid tests, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 14/23] tests: Ignore test-uuid, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 15/23] docker: Generate /packages.txt in centos6 image, Fam Zheng, 2016/09/23