On Mon, Aug 08, 2016 at 02:09:25PM +0800, Fam Zheng wrote: > Previously we conditionally generate if footer->uuid, when libuuid is
s/generate if/generated/ s/is/was/ > available. Now that we have a built-in implementation, we can switch to > it. > > Signed-off-by: Fam Zheng <f...@redhat.com> > --- > 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 <uuid/uuid.h> > -#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 >
