From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50393)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1blpLc-0002H7-5R
	for qemu-devel@nongnu.org; Sun, 18 Sep 2016 23:34:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1blpLb-0008WK-1l
	for qemu-devel@nongnu.org; Sun, 18 Sep 2016 23:34:24 -0400
Date: Sun, 18 Sep 2016 23:34:16 -0400
From: Jeff Cody <jcody@redhat.com>
Message-ID: <20160919033416.GF32304@localhost.localdomain>
References: <1474172732-31994-1-git-send-email-famz@redhat.com>
	<1474172732-31994-7-git-send-email-famz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1474172732-31994-7-git-send-email-famz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v8 06/12] crypto: Switch to QEMU UUID API
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famz@redhat.com>
Cc: qemu-devel@nongnu.org, kwolf@redhat.com, qemu-block@nongnu.org, sw@weilnetz.de, mdroth@linux.vnet.ibm.com, armbru@redhat.com, pbonzini@redhat.com, mreitz@redhat.com, eblake@redhat.com, rth@twiddle.net

On Sun, Sep 18, 2016 at 12:25: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 <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>  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 aba4455..da65dc0 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
> 
Reviewed-by: Jeff Cody <jcody@redhat.com>