Merge remote-tracking branch 'afaerber/qom-cpu' into staging

[qemu.git] / block / vdi.c

diff --git a/block/vdi.c b/block/vdi.c
index 257a592ea9ef60c213ce08833b576aa625d3d6ec..87c691b50453058d8a7fee5dc5989bc7d8df7259 100644 (file)
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -443,9 +443,7 @@ 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 = g_malloc(bmap_size * SECTOR_SIZE);
-    }
+    s->bmap = g_malloc(bmap_size * SECTOR_SIZE);
     ret = bdrv_read(bs->file, s->bmap_sector, (uint8_t *)s->bmap, bmap_size);
     if (ret < 0) {
         goto fail_free_bmap;