Re: [Qemu-devel] [PATCH v2 6/8] crypto: Switch to QEMU UUID API

[Daniel P. Berrange]

On Mon, Aug 08, 2016 at 02:09:26PM +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>
> ---
>  crypto/block-luks.c | 26 +++++++-------------------
>  1 file changed, 7 insertions(+), 19 deletions(-)

Reviewed-by: Daniel P. Berrange <address@hidden>.

FWIW, I'm happy for this patch to be merged as part of this
series - no need for it to go in via my crypto/ patches queue

> diff --git a/crypto/block-luks.c b/crypto/block-luks.c
> index aba4455..cca66aa 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
> @@ -961,10 +952,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
> 

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 :|