diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-12-02 18:32:43 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2015-02-22 12:03:31 -0600 |
| commit | 1961d1c3474aa4d957f5eff4d122908250089fdb (patch) | |
| tree | cc0130aebe01303911c07643f99cba04fc04e0e9 | |
| parent | e81703b42c7552e9f43701a3e7fd937b7fa3080b (diff) | |
| download | qemu-1961d1c3474aa4d957f5eff4d122908250089fdb.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.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/block/vvfat.c b/block/vvfat.c index cefe3a4f79..e34a789699 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2917,6 +2917,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:"); |