]> git.proxmox.com Git - mirror_qemu.git/commit
vmdk: Fix error for JSON descriptor file names
authorMax Reitz <mreitz@redhat.com>
Wed, 3 Dec 2014 13:57:22 +0000 (14:57 +0100)
committerStefan Hajnoczi <stefanha@redhat.com>
Fri, 12 Dec 2014 13:14:10 +0000 (13:14 +0000)
commit5c98415b2a2fde5739aefe51793f969ce8bb2758
tree9a9b7acd93caa089341164c00f6898ebfff375f7
parentebd9fbd7e102c533143c2c8372312b75c2b2678a
vmdk: Fix error for JSON descriptor file names

If vmdk blindly tries to use path_combine() using bs->file->filename as
the base file name, this will result in a bad error message for JSON
file names when calling bdrv_open(). It is better to only try
bs->file->exact_filename; if that is empty, bs->file->filename will be
useless for path_combine() and an error should be emitted (containing
bs->file->filename because desc_file_path (which is
bs->file->exact_filename) is empty).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 1417615043-26174-2-git-send-email-mreitz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
block.c
block/vmdk.c
include/block/block.h