[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/21] block/vdi: Allow disk images of size 0
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 11/21] block/vdi: Allow disk images of size 0 |
Date: |
Fri, 14 May 2010 19:10:45 +0200 |
From: Stefan Weil <address@hidden>
Even it is not very useful, users may create images of size 0.
Without the special option CONFIG_ZERO_MALLOC, qemu_mallocz
aborts execution when it is told to allocate 0 bytes,
so avoid this kind of call.
Cc: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/vdi.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/block/vdi.c b/block/vdi.c
index 2b4d2c2..3ea4103 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -435,7 +435,9 @@ static int vdi_open(BlockDriverState *bs, int flags)
bmap_size = header.blocks_in_image * sizeof(uint32_t);
bmap_size = (bmap_size + SECTOR_SIZE - 1) / SECTOR_SIZE;
- s->bmap = qemu_malloc(bmap_size * SECTOR_SIZE);
+ if (bmap_size > 0) {
+ s->bmap = qemu_malloc(bmap_size * SECTOR_SIZE);
+ }
if (bdrv_read(bs->file, s->bmap_sector, (uint8_t *)s->bmap, bmap_size) <
0) {
goto fail_free_bmap;
}
@@ -857,7 +859,10 @@ static int vdi_create(const char *filename,
QEMUOptionParameter *options)
result = -errno;
}
- bmap = (uint32_t *)qemu_mallocz(bmap_size);
+ bmap = NULL;
+ if (bmap_size > 0) {
+ bmap = (uint32_t *)qemu_mallocz(bmap_size);
+ }
for (i = 0; i < blocks; i++) {
if (image_type == VDI_TYPE_STATIC) {
bmap[i] = i;
--
1.6.6.1
- [Qemu-devel] [PATCH 01/21] block: Remove semicolon in BDRV_SECTOR_MASK macro, (continued)
- [Qemu-devel] [PATCH 01/21] block: Remove semicolon in BDRV_SECTOR_MASK macro, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 04/21] cloop: use qemu block API, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 05/21] ide: Fix ide_dma_cancel, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 09/21] block: Fix protocol detection for Windows devices, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 07/21] bochs: use qemu block API, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 03/21] cloop: use pread, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 08/21] block: Avoid unchecked casts for AIOCBs, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 06/21] bochs: use pread, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 12/21] parallels: use pread, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 13/21] parallels: use qemu block API, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 11/21] block/vdi: Allow disk images of size 0,
Kevin Wolf <=
- [Qemu-devel] [PATCH 15/21] dmg: fix reading of uncompressed chunks, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 14/21] block/vpc: Fix conversion from size to disk geometry, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 02/21] qemu-nbd: Improve error reporting, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 16/21] dmg: use pread, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 17/21] dmg: use qemu block API, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 18/21] block/vdi: Fix image opening and creation for odd disk sizes, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 20/21] Fix docs for block stats monitor command, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 21/21] block: Remove special case for vvfat, Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 19/21] use qemu_free() instead of free(), Kevin Wolf, 2010/05/14
- [Qemu-devel] [PATCH 10/21] block: Fix bdrv_commit, Kevin Wolf, 2010/05/14