From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50294)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1blpL7-0001wj-EA
	for qemu-devel@nongnu.org; Sun, 18 Sep 2016 23:33:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1blpL5-0008KT-DI
	for qemu-devel@nongnu.org; Sun, 18 Sep 2016 23:33:52 -0400
Date: Sun, 18 Sep 2016 23:33:43 -0400
From: Jeff Cody <jcody@redhat.com>
Message-ID: <20160919033343.GE32304@localhost.localdomain>
References: <1474172732-31994-1-git-send-email-famz@redhat.com>
	<1474172732-31994-6-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-6-git-send-email-famz@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v8 05/12] vpc: Use 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, rth@twiddle.net

On Sun, Sep 18, 2016 at 12:25:25PM +0800, Fam Zheng wrote:
> Previously we conditionally generated footer->uuid, when libuuid was
> available. Now that we have a built-in implementation, we can switch to
> it.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>  block/vpc.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/block/vpc.c b/block/vpc.c
> index 43707ed..8d5886f 100644
> --- a/block/vpc.c
> +++ b/block/vpc.c
> @@ -30,9 +30,7 @@
>  #include "qemu/module.h"
>  #include "migration/migration.h"
>  #include "qemu/bswap.h"
> -#if defined(CONFIG_UUID)
> -#include <uuid/uuid.h>
> -#endif
> +#include "qemu/uuid.h"
>  
>  /**************************************************************/
>  
> @@ -89,7 +87,7 @@ typedef struct vhd_footer {
>      uint32_t    checksum;
>  
>      /* UUID used to identify a parent hard disk (backing file) */
> -    uint8_t     uuid[16];
> +    QemuUUID    uuid;
>  
>      uint8_t     in_saved_state;
>  } QEMU_PACKED VHDFooter;
> @@ -980,9 +978,7 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp)
>  
>      footer->type = cpu_to_be32(disk_type);
>  
> -#if defined(CONFIG_UUID)
> -    uuid_generate(footer->uuid);
> -#endif
> +    qemu_uuid_generate(&footer->uuid);
>  
>      footer->checksum = cpu_to_be32(vpc_checksum(buf, HEADER_SIZE));
>  
> -- 
> 2.7.4
> 
> 
Reviewed-by: Jeff Cody <jcody@redhat.com>