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 <f...@redhat.com>
> Reviewed-by: Eric Blake <ebl...@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 <jc...@redhat.com>