[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH for-2.12 v2 02/12] vdi: Fix build with CONFIG_VDI_DE
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH for-2.12 v2 02/12] vdi: Fix build with CONFIG_VDI_DEBUG |
Date: |
Wed, 21 Mar 2018 18:37:04 +0100 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/vdi.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/block/vdi.c b/block/vdi.c
index 73c059e69d..4a2d1ff88d 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -235,7 +235,6 @@ static void vdi_header_to_le(VdiHeader *header)
qemu_uuid_bswap(&header->uuid_parent);
}
-#if defined(CONFIG_VDI_DEBUG)
static void vdi_header_print(VdiHeader *header)
{
char uuid[37];
@@ -257,16 +256,15 @@ static void vdi_header_print(VdiHeader *header)
logout("block extra 0x%04x\n", header->block_extra);
logout("blocks tot. 0x%04x\n", header->blocks_in_image);
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);
- uuid_unparse(header->uuid_last_snap, uuid);
+ qemu_uuid_unparse(&header->uuid_last_snap, 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);
- uuid_unparse(header->uuid_parent, uuid);
+ qemu_uuid_unparse(&header->uuid_parent, uuid);
logout("uuid parent %s\n", uuid);
}
-#endif
static int coroutine_fn vdi_co_check(BlockDriverState *bs, BdrvCheckResult
*res,
BdrvCheckMode fix)
@@ -387,9 +385,9 @@ static int vdi_open(BlockDriverState *bs, QDict *options,
int flags,
}
vdi_header_to_cpu(&header);
-#if defined(CONFIG_VDI_DEBUG)
- vdi_header_print(&header);
-#endif
+ if (VDI_DEBUG) {
+ vdi_header_print(&header);
+ }
if (header.disk_size > VDI_DISK_SIZE_MAX) {
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_last_snap);
/* There is no need to set header.uuid_link or header.uuid_parent here. */
-#if defined(CONFIG_VDI_DEBUG)
- vdi_header_print(&header);
-#endif
+ if (VDI_DEBUG) {
+ vdi_header_print(&header);
+ }
vdi_header_to_le(&header);
ret = blk_pwrite(blk, offset, &header, sizeof(header), 0);
if (ret < 0) {
--
2.13.6
- [Qemu-block] [PATCH for-2.12 v2 00/12] block: Follow-up for .bdrv_co_create (part 1), Kevin Wolf, 2018/03/21
- [Qemu-block] [PATCH for-2.12 v2 02/12] vdi: Fix build with CONFIG_VDI_DEBUG,
Kevin Wolf <=
- [Qemu-block] [PATCH for-2.12 v2 01/12] vdi: Change 'static' create option to 'preallocation' in QMP, Kevin Wolf, 2018/03/21
- [Qemu-block] [PATCH for-2.12 v2 03/12] qemu-iotests: Test vdi image creation with QMP, Kevin Wolf, 2018/03/21
- [Qemu-block] [PATCH for-2.12 v2 05/12] luks: Turn another invalid assertion into check, Kevin Wolf, 2018/03/21
- [Qemu-block] [PATCH for-2.12 v2 04/12] qemu-iotests: Enable 025 for luks, Kevin Wolf, 2018/03/21
- [Qemu-block] [PATCH for-2.12 v2 06/12] qemu-iotests: Test invalid resize on luks, Kevin Wolf, 2018/03/21
- [Qemu-block] [PATCH for-2.12 v2 07/12] parallels: Check maximum cluster size on create, Kevin Wolf, 2018/03/21
- [Qemu-block] [PATCH for-2.12 v2 09/12] vhdx: Require power-of-two block size on create, Kevin Wolf, 2018/03/21