ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vpc: Use QEMU UUID API 

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>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-Id: <1474432046-325-6-git-send-email-famz@redhat.com>
This commit is contained in:
Fam Zheng 2016-09-21 12:27:18 +08:00
parent 7c6f55b697
commit 38440a21fa
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/vpc.c
View File

@ -30,9 +30,7 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "migration/migration.h" #include "migration/migration.h"
#include "qemu/bswap.h" #include "qemu/bswap.h"
#if defined(CONFIG_UUID) #include "qemu/uuid.h"
#include <uuid/uuid.h>
#endif
/**************************************************************/ /**************************************************************/
@ -89,7 +87,7 @@ typedef struct vhd_footer {
uint32_t checksum; uint32_t checksum;
/* UUID used to identify a parent hard disk (backing file) */ /* UUID used to identify a parent hard disk (backing file) */
uint8_t uuid[16]; QemuUUID uuid;
uint8_t in_saved_state; uint8_t in_saved_state;
} QEMU_PACKED VHDFooter; } 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); footer->type = cpu_to_be32(disk_type);
#if defined(CONFIG_UUID) qemu_uuid_generate(&footer->uuid);
uuid_generate(footer->uuid);
#endif
footer->checksum = cpu_to_be32(vpc_checksum(buf, HEADER_SIZE)); footer->checksum = cpu_to_be32(vpc_checksum(buf, HEADER_SIZE));