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

vdi: Fix build with CONFIG_VDI_DEBUG 

Use qemu_uuid_unparse() instead of uuid_unparse() to make vdi.c compile
again when CONFIG_VDI_DEBUG is set. In order to prevent future bitrot,
replace '#ifdef CONFIG_VDI_DEBUG' by 'if (VDI_DEBUG)' so that the
compiler always sees the code.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2018-03-20 14:41:53 +01:00
parent 61fa64871d
commit 95a14d51b2
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
block/vdi.c
View File

@ -235,7 +235,6 @@ static void vdi_header_to_le(VdiHeader *header)
qemu_uuid_bswap(&header->uuid_parent); qemu_uuid_bswap(&header->uuid_parent);
} }
#if defined(CONFIG_VDI_DEBUG)
static void vdi_header_print(VdiHeader *header) static void vdi_header_print(VdiHeader *header)
{ {
char uuid[37]; char uuid[37];
@ -257,16 +256,15 @@ static void vdi_header_print(VdiHeader *header)
logout("block extra 0x%04x\n", header->block_extra); logout("block extra 0x%04x\n", header->block_extra);
logout("blocks tot. 0x%04x\n", header->blocks_in_image); logout("blocks tot. 0x%04x\n", header->blocks_in_image);
logout("blocks all. 0x%04x\n", header->blocks_allocated); logout("blocks all. 0x%04x\n", header->blocks_allocated);
uuid_unparse(header->uuid_image, uuid); qemu_uuid_unparse(&header->uuid_image, uuid);
logout("uuid image %s\n", uuid); logout("uuid image %s\n", uuid);
uuid_unparse(header->uuid_last_snap, uuid); qemu_uuid_unparse(&header->uuid_last_snap, uuid);
logout("uuid snap %s\n", uuid); logout("uuid snap %s\n", uuid);
uuid_unparse(header->uuid_link, uuid); qemu_uuid_unparse(&header->uuid_link, uuid);
logout("uuid link %s\n", uuid); logout("uuid link %s\n", uuid);
uuid_unparse(header->uuid_parent, uuid); qemu_uuid_unparse(&header->uuid_parent, uuid);
logout("uuid parent %s\n", uuid); logout("uuid parent %s\n", uuid);
} }
#endif
static int coroutine_fn vdi_co_check(BlockDriverState *bs, BdrvCheckResult *res, static int coroutine_fn vdi_co_check(BlockDriverState *bs, BdrvCheckResult *res,
BdrvCheckMode fix) BdrvCheckMode fix)
@ -387,9 +385,9 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
} }
vdi_header_to_cpu(&header); vdi_header_to_cpu(&header);
#if defined(CONFIG_VDI_DEBUG) if (VDI_DEBUG) {
vdi_header_print(&header); vdi_header_print(&header);
#endif }
if (header.disk_size > VDI_DISK_SIZE_MAX) { if (header.disk_size > VDI_DISK_SIZE_MAX) {
error_setg(errp, "Unsupported VDI image size (size is 0x%" PRIx64 error_setg(errp, "Unsupported VDI image size (size is 0x%" PRIx64
@ -825,9 +823,9 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options,
qemu_uuid_generate(&header.uuid_image); qemu_uuid_generate(&header.uuid_image);
qemu_uuid_generate(&header.uuid_last_snap); qemu_uuid_generate(&header.uuid_last_snap);
/* There is no need to set header.uuid_link or header.uuid_parent here. */ /* There is no need to set header.uuid_link or header.uuid_parent here. */
#if defined(CONFIG_VDI_DEBUG) if (VDI_DEBUG) {
vdi_header_print(&header); vdi_header_print(&header);
#endif }
vdi_header_to_le(&header); vdi_header_to_le(&header);
ret = blk_pwrite(blk, offset, &header, sizeof(header), 0); ret = blk_pwrite(blk, offset, &header, sizeof(header), 0);
if (ret < 0) { if (ret < 0) {