[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 5/6] block/parallels: replace some magic numbers
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 5/6] block/parallels: replace some magic numbers |
Date: |
Mon, 22 Jan 2018 16:00:47 +0000 |
From: Klim Kireev <address@hidden>
Signed-off-by: Klim Kireev <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Edgar Kaziakhmedov <address@hidden>
Message-id: address@hidden
CC: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/parallels.h | 2 ++
block/parallels.c | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/block/parallels.h b/block/parallels.h
index 71183c0c8e..4b044079ef 100644
--- a/block/parallels.h
+++ b/block/parallels.h
@@ -34,6 +34,8 @@
#include "qemu/coroutine.h"
#include "qemu/typedefs.h"
+#define HEADS_NUMBER 16
+#define SEC_IN_CYL 32
#define DEFAULT_CLUSTER_SIZE 1048576 /* 1 MiB */
/* always little-endian */
diff --git a/block/parallels.c b/block/parallels.c
index f9a3b999ea..7a8e8b05a9 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -476,8 +476,9 @@ static int parallels_create(const char *filename, QemuOpts
*opts, Error **errp)
memcpy(header.magic, HEADER_MAGIC2, sizeof(header.magic));
header.version = cpu_to_le32(HEADER_VERSION);
/* don't care much about geometry, it is not used on image level */
- header.heads = cpu_to_le32(16);
- header.cylinders = cpu_to_le32(total_size / BDRV_SECTOR_SIZE / 16 / 32);
+ header.heads = cpu_to_le32(HEADS_NUMBER);
+ header.cylinders = cpu_to_le32(total_size / BDRV_SECTOR_SIZE
+ / HEADS_NUMBER / SEC_IN_CYL);
header.tracks = cpu_to_le32(cl_size >> BDRV_SECTOR_BITS);
header.bat_entries = cpu_to_le32(bat_entries);
header.nb_sectors = cpu_to_le64(DIV_ROUND_UP(total_size,
BDRV_SECTOR_SIZE));
--
2.14.3
- [Qemu-devel] [PULL v2 0/6] Block patches, Stefan Hajnoczi, 2018/01/22
- [Qemu-devel] [PULL v2 1/6] block: add block_set_io_throttle virtio-blk-pci QMP example, Stefan Hajnoczi, 2018/01/22
- [Qemu-devel] [PULL v2 2/6] docs/interop/prl-xml: description of Parallels Disk format, Stefan Hajnoczi, 2018/01/22
- [Qemu-devel] [PULL v2 3/6] configure: add dependency, Stefan Hajnoczi, 2018/01/22
- [Qemu-devel] [PULL v2 4/6] block/parallels: move some structures into header, Stefan Hajnoczi, 2018/01/22
- [Qemu-devel] [PULL v2 5/6] block/parallels: replace some magic numbers,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 6/6] block/parallels: add backing support to readv/writev, Stefan Hajnoczi, 2018/01/22
- Re: [Qemu-devel] [PULL v2 0/6] Block patches, Peter Maydell, 2018/01/24