From patchwork Wed Jan 20 17:13:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 43318 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C6588B7CBB for ; Thu, 21 Jan 2010 04:38:57 +1100 (EST) Received: from localhost ([127.0.0.1]:33238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXeUD-0000GB-QK for incoming@patchwork.ozlabs.org; Wed, 20 Jan 2010 12:36:57 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXe7Z-0000nQ-1P for qemu-devel@nongnu.org; Wed, 20 Jan 2010 12:13:33 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXe7U-0000lZ-2X for qemu-devel@nongnu.org; Wed, 20 Jan 2010 12:13:32 -0500 Received: from [199.232.76.173] (port=60462 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXe7T-0000lV-Rl for qemu-devel@nongnu.org; Wed, 20 Jan 2010 12:13:27 -0500 Received: from verein.lst.de ([213.95.11.210]:35860) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1NXe7T-0000CZ-4e for qemu-devel@nongnu.org; Wed, 20 Jan 2010 12:13:27 -0500 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id o0KHDPWY008836 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Wed, 20 Jan 2010 18:13:25 +0100 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id o0KHDPL9008835 for qemu-devel@nongnu.org; Wed, 20 Jan 2010 18:13:25 +0100 Date: Wed, 20 Jan 2010 18:13:25 +0100 From: Christoph Hellwig To: qemu-devel@nongnu.org Message-ID: <20100120171325.GA8811@lst.de> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.3.28i X-Spam-Score: 0 () X-Scanned-By: MIMEDefang 2.39 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH v2 1/2] block: clean up bdrv_open2 structure a bit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Check the whitelist as early as possible instead of continuing the setup, and move all the error handling code to the end of the function. Signed-off-by: Christoph Hellwig Index: qemu/block.c =================================================================== --- qemu.orig/block.c 2010-01-20 17:21:33.000000000 +0100 +++ qemu/block.c 2010-01-20 17:24:22.596006289 +0100 @@ -428,10 +428,16 @@ int bdrv_open2(BlockDriverState *bs, con drv = find_image_format(filename); } } + if (!drv) { ret = -ENOENT; goto unlink_and_fail; } + if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) { + ret = -ENOTSUP; + goto unlink_and_fail; + } + bs->drv = drv; bs->opaque = qemu_mallocz(drv->instance_size); @@ -453,20 +459,12 @@ int bdrv_open2(BlockDriverState *bs, con } else { open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT); } - if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) { - ret = -ENOTSUP; - } else { - ret = drv->bdrv_open(bs, filename, open_flags); - } + + ret = drv->bdrv_open(bs, filename, open_flags); if (ret < 0) { - qemu_free(bs->opaque); - bs->opaque = NULL; - bs->drv = NULL; - unlink_and_fail: - if (bs->is_temporary) - unlink(filename); - return ret; + goto free_and_fail; } + if (drv->bdrv_getlength) { bs->total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS; } @@ -499,6 +497,15 @@ int bdrv_open2(BlockDriverState *bs, con bs->change_cb(bs->change_opaque); } return 0; + +free_and_fail: + qemu_free(bs->opaque); + bs->opaque = NULL; + bs->drv = NULL; +unlink_and_fail: + if (bs->is_temporary) + unlink(filename); + return ret; } void bdrv_close(BlockDriverState *bs)