[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v9 06/13] crypto: Switch to QEMU UUID API
From: |
Daniel P. Berrange |
Subject: |
Re: [Qemu-devel] [PATCH v9 06/13] crypto: Switch to QEMU UUID API |
Date: |
Wed, 21 Sep 2016 09:44:43 +0100 |
User-agent: |
Mutt/1.7.0 (2016-08-17) |
On Wed, Sep 21, 2016 at 12:27:19PM +0800, Fam Zheng wrote:
> 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>
> ---
> 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);
Reviewed-by: Daniel P. Berrange <address@hidden>
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
- [Qemu-devel] [PATCH v9 00/13] UUID clean ups for 2.8, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 01/13] util: Add UUID API, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 02/13] uuid: Make null_uuid static, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 03/13] vhdx: Use QEMU UUID API, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 04/13] vdi: Use QEMU UUID API, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 05/13] vpc: Use QEMU UUID API, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 06/13] crypto: Switch to QEMU UUID API, Fam Zheng, 2016/09/21
- Re: [Qemu-devel] [PATCH v9 06/13] crypto: Switch to QEMU UUID API,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v9 07/13] tests: No longer dependent on CONFIG_UUID, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 08/13] configure: Remove detection code for UUID, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 10/13] uuid: Tighten uuid parse, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 09/13] vl: Switch qemu_uuid to QemuUUID, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 11/13] tests: Add uuid tests, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 12/13] Add UUID files to MAINTAINERS, Fam Zheng, 2016/09/21
- [Qemu-devel] [PATCH v9 13/13] tests: Ignore test-uuid, Fam Zheng, 2016/09/21