summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAdelina Tuvenie <adelinatuvenie@gmail.com>2014-09-18 18:17:44 +0300
committerMichael Tokarev <mjt@tls.msk.ru>2014-09-22 12:09:31 +0400
commita011898d25b8a26a311d56dfe37e8d3a4374ec65 (patch)
treed8f23dafc81a6be1247e8e4e06302929676f58f2
parent4d63322cd4b3b5eba911ea98bf2050c939e432e3 (diff)
downloadfocaccia-qemu-a011898d25b8a26a311d56dfe37e8d3a4374ec65.tar.gz
focaccia-qemu-a011898d25b8a26a311d56dfe37e8d3a4374ec65.zip
block: allow creation of fixed vhdx images
When trying to create a fixed vhd image qemu-img will return the
following error:

 qemu-img: test.vhdx: Could not create image: Cannot allocate memory

This happens because of a incorrect check in vhdx.c. Specifficaly,
in vhdx_create_bat(), after allocating memory for the BAT entry,
there is a check to determine if the allocation was unsuccsessful.
The error comes from the fact that it checks if s->bat isn't NULL,
which is true in case of succsessful allocation,  and exits with
error ENOMEM.

Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--block/vhdx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/vhdx.c b/block/vhdx.c
index 796b7bd884..5bf292e33d 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -1593,7 +1593,7 @@ static int vhdx_create_bat(BlockDriverState *bs, BDRVVHDXState *s,
                 bdrv_has_zero_init(bs) == 0) {
         /* for a fixed file, the default BAT entry is not zero */
         s->bat = g_try_malloc0(length);
-        if (length && s->bat != NULL) {
+        if (length && s->bat == NULL) {
             ret = -ENOMEM;
             goto exit;
         }