summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2014-12-02 18:32:43 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2015-01-07 15:07:33 -0600
commitb3729b2ec2c205b7a09a741c2484403b59e04b80 (patch)
treea5cc22bf1d06a5b8af9ef5054334f09a1331f553
parent1b9ea8961a8787672e7c146c91ee33aa815eb0da (diff)
downloadqemu-b3729b2ec2c205b7a09a741c2484403b59e04b80.tar.gz
block/vvfat: qcow driver may not be found
Although virtually impossible right now, bdrv_find_format("qcow") may fail. The vvfat block driver should heed that case. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 1bcb15cf776a57e8963072c1919a59a90aea8e94) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--block/vvfat.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/block/vvfat.c b/block/vvfat.c
index 70176b1619..1de8808a4e 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -2926,6 +2926,12 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp)
}
bdrv_qcow = bdrv_find_format("qcow");
+ if (!bdrv_qcow) {
+ error_setg(errp, "Failed to locate qcow driver");
+ ret = -ENOENT;
+ goto err;
+ }
+
opts = qemu_opts_create(bdrv_qcow->create_opts, NULL, 0, &error_abort);
qemu_opt_set_number(opts, BLOCK_OPT_SIZE, s->sector_count * 512);
qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, "fat:");