[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/19] block/parallels: replace magic constants 4, 6
From: |
Denis V. Lunev |
Subject: |
[Qemu-devel] [PATCH 07/19] block/parallels: replace magic constants 4, 64 with proper sizeofs |
Date: |
Tue, 30 Dec 2014 12:28:19 +0300 |
simple purification..
Signed-off-by: Denis V. Lunev <address@hidden>
Acked-by: Roman Kagan <address@hidden>
CC: Kevin Wolf <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
---
block/parallels.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 64b169b..306f2e3 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -32,7 +32,6 @@
#define HEADER_MAGIC "WithoutFreeSpace"
#define HEADER_MAGIC2 "WithouFreSpacExt"
#define HEADER_VERSION 2
-#define HEADER_SIZE 64
// always little-endian
typedef struct ParallelsHeader {
@@ -63,7 +62,7 @@ static int parallels_probe(const uint8_t *buf, int buf_size,
const char *filenam
{
const ParallelsHeader *ph = (const void *)buf;
- if (buf_size < HEADER_SIZE)
+ if (buf_size < sizeof(ParallelsHeader))
return 0;
if ((!memcmp(ph->magic, HEADER_MAGIC, 16) ||
@@ -116,7 +115,7 @@ static int parallels_open(BlockDriverState *bs, QDict
*options, int flags,
}
s->catalog_size = le32_to_cpu(ph.catalog_entries);
- if (s->catalog_size > INT_MAX / 4) {
+ if (s->catalog_size > INT_MAX / sizeof(uint32_t)) {
error_setg(errp, "Catalog too large");
ret = -EFBIG;
goto fail;
@@ -127,7 +126,8 @@ static int parallels_open(BlockDriverState *bs, QDict
*options, int flags,
goto fail;
}
- ret = bdrv_pread(bs->file, 64, s->catalog_bitmap, s->catalog_size * 4);
+ ret = bdrv_pread(bs->file, sizeof(ParallelsHeader),
+ s->catalog_bitmap, s->catalog_size * sizeof(uint32_t));
if (ret < 0) {
goto fail;
}
--
1.9.1
- [Qemu-devel] [PATCH v2 0/19] write/create for Parallels images with reasonable performance, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 02/19] block/parallels: rename parallels_header to ParallelsHeader, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 03/19] block/parallels: switch to bdrv_read, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 01/19] iotests, parallels: quote TEST_IMG in 076 test to be path-safe, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 05/19] block/parallels: add get_block_status, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 04/19] block/parallels: read up to cluster end in one go, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 07/19] block/parallels: replace magic constants 4, 64 with proper sizeofs,
Denis V. Lunev <=
- [Qemu-devel] [PATCH 08/19] block/parallels: _co_writev callback for Parallels format, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 06/19] block/parallels: provide _co_readv routine for parallels format driver, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 09/19] iotests, parallels: test for write into Parallels image, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 10/19] block/parallels: support parallels image creation, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 13/19] block/parallels: store ParallelsHeader to the BDRVParallelsState, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 11/19] iotests, parallels: test for newly created parallels image via qemu-img, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 16/19] block/parallels: no need to flush on each block allocation table update, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 15/19] block/parallels: rename catalog_ names to bat_, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 12/19] parallels: change copyright information in the image header, Denis V. Lunev, 2014/12/30
- [Qemu-devel] [PATCH 17/19] block/parallels: delay writing to BAT till bdrv_co_flush_to_os, Denis V. Lunev, 2014/12/30