Commit b76b6e95 authored by Stefan Weil's avatar Stefan Weil Committed by Kevin Wolf
Browse files

block/vdi: Allow disk images of size 0 



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 <kwolf@redhat.com>
Signed-off-by: default avatarStefan Weil <weil@mail.berlios.de>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent c3349197

block/vdi.c

+7 −2
Original line number Diff line number Diff line
@@ -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;

    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 = 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;