diff options
| author | Fam Zheng <famz@redhat.com> | 2016-09-21 12:27:16 +0800 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2016-09-23 11:42:52 +0800 |
| commit | cb6414dfec8a308e68529b0fd2a454403c05bbb3 (patch) | |
| tree | d66548acfb9abde899d704d3b5fee687dd49c9b7 /block/vhdx.c | |
| parent | 3630be75d8eda7811f5783d1dc50f4d8682fdaec (diff) | |
| download | qemu-cb6414dfec8a308e68529b0fd2a454403c05bbb3.tar.gz | |
vhdx: Use QEMU UUID API
This removes our dependency to libuuid, so that the driver can always be
built.
Similar to how we handled data plane configure options, --enable-vhdx
and --disable-vhdx are also changed to a nop with a message saying it's
obsolete.
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-4-git-send-email-famz@redhat.com>
Diffstat (limited to 'block/vhdx.c')
| -rw-r--r-- | block/vhdx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/block/vhdx.c b/block/vhdx.c index 75ef2b1c2d..0ba2f0a2f9 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -25,8 +25,7 @@ #include "qemu/bswap.h" #include "block/vhdx.h" #include "migration/migration.h" - -#include <uuid/uuid.h> +#include "qemu/uuid.h" /* Options for VHDX creation */ @@ -213,11 +212,11 @@ bool vhdx_checksum_is_valid(uint8_t *buf, size_t size, int crc_offset) */ void vhdx_guid_generate(MSGUID *guid) { - uuid_t uuid; + QemuUUID uuid; assert(guid != NULL); - uuid_generate(uuid); - memcpy(guid, uuid, sizeof(MSGUID)); + qemu_uuid_generate(&uuid); + memcpy(guid, &uuid, sizeof(MSGUID)); } /* Check for region overlaps inside the VHDX image */ |