From patchwork Mon Apr 12 14:49:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 49968 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 7CF7EB7C06 for ; Tue, 13 Apr 2010 00:51:44 +1000 (EST) Received: from localhost ([127.0.0.1]:39084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1KzF-0006kM-Iy for incoming@patchwork.ozlabs.org; Mon, 12 Apr 2010 10:51:41 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O1Ky6-0006gJ-Lg for qemu-devel@nongnu.org; Mon, 12 Apr 2010 10:50:30 -0400 Received: from [140.186.70.92] (port=43662 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1Kxs-0006eD-Pi for qemu-devel@nongnu.org; Mon, 12 Apr 2010 10:50:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O1KxZ-0000oO-2w for qemu-devel@nongnu.org; Mon, 12 Apr 2010 10:49:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32648) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O1KxY-0000oB-PA for qemu-devel@nongnu.org; Mon, 12 Apr 2010 10:49:57 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3CEnkRx006770 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Apr 2010 10:49:46 -0400 Received: from localhost.localdomain (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3CEnivq005231; Mon, 12 Apr 2010 10:49:45 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Mon, 12 Apr 2010 16:49:16 +0200 Message-Id: <1271083756-31269-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, hch@lst.de Subject: [Qemu-devel] [PATCH] block: Split bdrv_open 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 bdrv_open contains quite some code that is only useful for opening images (as opposed to opening files by a protocol), for example snapshots. This patch splits the code so that we have bdrv_open_file() for files (uses protocols), bdrv_open() for images (uses format drivers) and bdrv_do_open() for the code common for opening both images and files. Signed-off-by: Kevin Wolf --- This patch applies on top of Christoph's RFC for the format/protocol split block.c | 63 +++++++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 18 deletions(-) diff --git a/block.c b/block.c index 0c27f30..4bab221 100644 --- a/block.c +++ b/block.c @@ -42,6 +42,9 @@ #include #endif +static int bdrv_do_open(BlockDriverState *bs, const char *filename, int flags, + BlockDriver *drv); + static BlockDriverAIOCB *bdrv_aio_readv_em(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); @@ -335,6 +338,7 @@ static BlockDriver *find_image_format(const char *filename) return drv; } +/* Opens a file using a protocol (file, host_device, nbd, ...) */ int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags) { BlockDriverState *bs; @@ -347,7 +351,7 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags) } bs = bdrv_new(""); - ret = bdrv_open(bs, filename, flags, drv); + ret = bdrv_do_open(bs, filename, flags, drv); if (ret < 0) { bdrv_delete(bs); return ret; @@ -357,19 +361,11 @@ int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags) return 0; } +/* Opens a disk image (raw, qcow2, vmdk, ...) */ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, BlockDriver *drv) { - int ret, open_flags; - char tmp_filename[PATH_MAX]; - char backing_filename[PATH_MAX]; - - bs->is_temporary = 0; - bs->encrypted = 0; - bs->valid_key = 0; - bs->open_flags = flags; - /* buffer_alignment defaulted to 512, drivers can change this value */ - bs->buffer_alignment = 512; + int ret; if (flags & BDRV_O_SNAPSHOT) { BlockDriverState *bs1; @@ -377,6 +373,8 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, int is_protocol = 0; BlockDriver *bdrv_qcow2; QEMUOptionParameter *options; + char tmp_filename[PATH_MAX]; + char backing_filename[PATH_MAX]; /* if snapshot, we create a temporary backing file and open it instead of opening 'filename' directly */ @@ -424,8 +422,7 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, bs->is_temporary = 1; } - pstrcpy(bs->filename, sizeof(bs->filename), filename); - + /* Find the right image format driver */ if (!drv) { drv = find_image_format(filename); } @@ -434,11 +431,44 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, ret = -ENOENT; goto unlink_and_fail; } - if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) { - ret = -ENOTSUP; + + /* Open the image */ + ret = bdrv_do_open(bs, filename, flags, drv); + if (ret < 0) { goto unlink_and_fail; } + return 0; + +unlink_and_fail: + if (bs->is_temporary) { + unlink(filename); + } + return ret; +} + +/* Common part for opening disk images and files */ +static int bdrv_do_open(BlockDriverState *bs, const char *filename, int flags, + BlockDriver *drv) +{ + int ret, open_flags; + char backing_filename[PATH_MAX]; + + assert(drv != NULL); + + bs->is_temporary = 0; + bs->encrypted = 0; + bs->valid_key = 0; + bs->open_flags = flags; + /* buffer_alignment defaulted to 512, drivers can change this value */ + bs->buffer_alignment = 512; + + pstrcpy(bs->filename, sizeof(bs->filename), filename); + + if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) { + return -ENOTSUP; + } + bs->drv = drv; bs->opaque = qemu_mallocz(drv->instance_size); @@ -515,9 +545,6 @@ free_and_fail: qemu_free(bs->opaque); bs->opaque = NULL; bs->drv = NULL; -unlink_and_fail: - if (bs->is_temporary) - unlink(filename); return ret; }