[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/36] block/vpc: fix virtual size for images created
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 17/36] block/vpc: fix virtual size for images created with disk2vhd |
Date: |
Thu, 7 Nov 2013 14:12:25 +0100 |
From: Peter Lieven <address@hidden>
Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/vpc.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/block/vpc.c b/block/vpc.c
index 627d11c..577cc45 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -211,6 +211,15 @@ static int vpc_open(BlockDriverState *bs, QDict *options,
int flags,
bs->total_sectors = (int64_t)
be16_to_cpu(footer->cyls) * footer->heads * footer->secs_per_cyl;
+ /* images created with disk2vhd report a far higher virtual size
+ * than expected with the cyls * heads * sectors_per_cyl formula.
+ * use the footer->size instead if the image was created with
+ * disk2vhd.
+ */
+ if (!strncmp(footer->creator_app, "d2v", 4)) {
+ bs->total_sectors = be64_to_cpu(footer->size) / BDRV_SECTOR_SIZE;
+ }
+
/* Allow a maximum disk size of approximately 2 TB */
if (bs->total_sectors >= 65535LL * 255 * 255) {
ret = -EFBIG;
--
1.8.3.1
- [Qemu-devel] [PULL 19/36] block: vhdx - add header update capability., (continued)
- [Qemu-devel] [PULL 19/36] block: vhdx - add header update capability., Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 21/36] block: vhdx - log support struct and defines, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 23/36] block: vhdx - update log guid in header, and first write tracker, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 02/36] qemu-iotests: Filter out actual image size in 067, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 30/36] block: vhdx - move more endian translations to vhdx-endian.c, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 31/36] block: vhdx - break out code operations to functions, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 32/36] block: vhdx - fix comment typos in header, fix incorrect struct fields, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 36/36] block: vhdx qemu-iotest - log replay of data sector, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 18/36] block: vhdx - minor comments and typo correction., Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 06/36] block: qemu-iotests, add quotes to $TEST_IMG.base usage in 017, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 17/36] block/vpc: fix virtual size for images created with disk2vhd,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 09/36] block: qemu-iotests, add quotes to $TEST_IMG usage for 051, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 11/36] blockdev: fix drive_init() opts and bs_opts leaks, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 28/36] block: vhdx write support, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 16/36] block: Save errno before error_setg_errno, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 15/36] qdev-monitor-test: add device_add leak test cases, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 07/36] block: qemu-iotests, add quotes to $TEST_IMG usage in 019, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 10/36] block: qemu-iotests, add quotes to $TEST_IMG usage in 061, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 20/36] block: vhdx code movement - VHDXMetadataEntries and BDRVVHDXState to header., Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 34/36] block: vhdx - update _make_test_img() to filter out vhdx options, Stefan Hajnoczi, 2013/11/07
- [Qemu-devel] [PULL 14/36] blockdev-test: add test case for drive_add duplicate IDs, Stefan Hajnoczi, 2013/11/07