From patchwork Fri Apr 12 20:47:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 236198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B07272C00AF for ; Sat, 13 Apr 2013 06:50:36 +1000 (EST) Received: from localhost ([::1]:35198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQkva-0004vU-Uu for incoming@patchwork.ozlabs.org; Fri, 12 Apr 2013 16:50:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQktR-00027W-Ms for qemu-devel@nongnu.org; Fri, 12 Apr 2013 16:48:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQktM-0004bw-QC for qemu-devel@nongnu.org; Fri, 12 Apr 2013 16:48:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQktM-0004bn-HW for qemu-devel@nongnu.org; Fri, 12 Apr 2013 16:48:16 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3CKmF5t016312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 12 Apr 2013 16:48:16 -0400 Received: from dhcp-200-207.str.redhat.com (ovpn-116-52.ams2.redhat.com [10.36.116.52]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3CKmCIq009994; Fri, 12 Apr 2013 16:48:14 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 12 Apr 2013 22:47:54 +0200 Message-Id: <1365799688-19918-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1365799688-19918-1-git-send-email-kwolf@redhat.com> References: <1365799688-19918-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 01/15] block: Fail gracefully when using a format driver on protocol level 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 Specifying the wrong driver could fail an assertion: $ qemu-system-x86_64 -drive file.driver=qcow2,file=x qemu-system-x86_64: block.c:721: bdrv_open_common: Assertion `file != ((void *)0)' failed. Signed-off-by: Kevin Wolf --- block.c | 7 +++++++ tests/qemu-iotests/051 | 7 +++++++ tests/qemu-iotests/051.out | 10 ++++++++++ 3 files changed, 24 insertions(+) diff --git a/block.c b/block.c index 602d8a4..f23bdcc 100644 --- a/block.c +++ b/block.c @@ -718,6 +718,13 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, assert(drv->bdrv_parse_filename || filename != NULL); ret = drv->bdrv_file_open(bs, filename, options, open_flags); } else { + if (file == NULL) { + qerror_report(ERROR_CLASS_GENERIC_ERROR, "The '%s' block driver is " + "not suitable for the bottom level", + drv->format_name); + ret = -EINVAL; + goto free_and_fail; + } assert(file != NULL); bs->file = file; ret = drv->bdrv_open(bs, options, open_flags); diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 17a1d92..8f96ef4 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -142,6 +142,13 @@ run_qemu -drive media=cdrom,cache=writethrough run_qemu -drive media=cdrom,cache=unsafe run_qemu -drive media=cdrom,cache=invalid_value +echo +echo === Specifying the protocol layer === +echo + +run_qemu -drive file=$TEST_IMG,file.driver=file +run_qemu -drive file=$TEST_IMG,file.driver=qcow2 + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index da0d18b..194f2d2 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -159,4 +159,14 @@ qququiquit Testing: -drive media=cdrom,cache=invalid_value qemu: -drive media=cdrom,cache=invalid_value: invalid cache option + +=== Specifying the protocol layer === + +Testing: -drive file=TEST_DIR/t.qcow2,file.driver=file +qququiquit + +Testing: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2 +qemu: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2: The 'qcow2' block driver is not suitable for the bottom level +qemu: -drive file=TEST_DIR/t.qcow2,file.driver=qcow2: could not open disk image TEST_DIR/t.qcow2: Invalid argument + *** done