[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/38] block/parallels: replace magic constants 4, 64
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 07/38] block/parallels: replace magic constants 4, 64 with proper sizeofs |
Date: |
Fri, 22 May 2015 10:01:39 +0100 |
From: "Denis V. Lunev" <address@hidden>
simple purification..
Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Roman Kagan <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Roman Kagan <address@hidden>
Message-id: address@hidden
CC: Kevin Wolf <address@hidden>
Signed-off-by: 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 f3ffece..138e618 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 {
@@ -67,7 +66,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) ||
@@ -120,7 +119,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;
@@ -131,7 +130,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;
}
--
2.1.0
- [Qemu-devel] [PULL 00/38] Block patches, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 02/38] block/parallels: rename parallels_header to ParallelsHeader, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 03/38] block/parallels: switch to bdrv_read, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 01/38] iotests, parallels: quote TEST_IMG in 076 test to be path-safe, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 05/38] block/parallels: add get_block_status, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 07/38] block/parallels: replace magic constants 4, 64 with proper sizeofs,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 08/38] block/parallels: mark parallels format driver as zero inited, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 06/38] block/parallels: provide _co_readv routine for parallels format driver, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 04/38] block/parallels: read up to cluster end in one go, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 09/38] block/parallels: _co_writev callback for Parallels format, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 11/38] block/parallels: support parallels image creation, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 10/38] iotests, parallels: test for write into Parallels image, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 12/38] iotests, parallels: test for newly created parallels image via qemu-img, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 13/38] parallels: change copyright information in the image header, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 14/38] block/parallels: rename catalog_ names to bat_, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 18/38] block/parallels: move parallels_open/probe to the very end of the file, Stefan Hajnoczi, 2015/05/22