From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9H0N-0004r3-R7 for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9H01-0006u8-3x for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:19 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:44913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9H00-0006tz-TJ for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:57 -0500 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Jan 2015 10:35:56 -0700 From: Michael Roth Date: Thu, 8 Jan 2015 11:34:12 -0600 Message-Id: <1420738472-23267-69-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 68/88] block/vvfat: qcow driver may not be found List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Max Reitz 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 Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 1bcb15cf776a57e8963072c1919a59a90aea8e94) Signed-off-by: Michael Roth --- block/vvfat.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block/vvfat.c b/block/vvfat.c index 70176b1..1de8808 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:"); -- 1.9.1