From patchwork Tue Nov 25 14:07:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 414701 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id ABF671401DC for ; Wed, 26 Nov 2014 01:09:11 +1100 (AEDT) Received: from localhost ([::1]:57458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtGnl-0001ZW-GT for incoming@patchwork.ozlabs.org; Tue, 25 Nov 2014 09:09:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtGn2-0000az-HH for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:08:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtGmu-0006fp-LI for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:08:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtGmu-0006fP-Dl; Tue, 25 Nov 2014 09:08:16 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAPE8CYU024953 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 25 Nov 2014 09:08:12 -0500 Received: from localhost (dhcp-192-247.str.redhat.com [10.33.192.247]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sAPE8Ad6028076 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Tue, 25 Nov 2014 09:08:11 -0500 From: Max Reitz To: qemu-devel@nongnu.org Date: Tue, 25 Nov 2014 15:07:55 +0100 Message-Id: <1416924485-13304-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1416924485-13304-1-git-send-email-mreitz@redhat.com> References: <1416924485-13304-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Peter Lieven , qemu-stable@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH 02/12] block/vvfat: qcow driver may not be found X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Although virtually impossible right now, bdrv_find_format("qcow") may fail. The vvfat block driver should mind that case. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz --- block/vvfat.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block/vvfat.c b/block/vvfat.c index cefe3a4..e34a789 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:");