From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUVr0-0005dv-9f for qemu-devel@nongnu.org; Tue, 02 Aug 2016 05:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUVqv-0000RA-Jz for qemu-devel@nongnu.org; Tue, 02 Aug 2016 05:19:14 -0400 From: Fam Zheng Date: Tue, 2 Aug 2016 17:18:35 +0800 Message-Id: <1470129518-21087-5-git-send-email-famz@redhat.com> In-Reply-To: <1470129518-21087-1-git-send-email-famz@redhat.com> References: <1470129518-21087-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH 4/7] vpc: Use QEMU UUID API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: famz@redhat.com, berrange@redhat.com, pbonzini@redhat.com, kwolf@redhat.com, mreitz@redhat.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com, sw@weilnetz.de, qemu-block@nongnu.org Previously we conditionally generate if footer->uuid, when libuuid is available. Now that we have a built-in implementation, we can switch to it. Signed-off-by: Fam Zheng --- block/vpc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 43707ed..4a60438 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 -#endif +#include "qemu/uuid.h" /**************************************************************/ @@ -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