From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu0NL-0000Jc-HU for qemu-devel@nongnu.org; Thu, 27 Nov 2014 09:49:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu0NF-0003TJ-Qq for qemu-devel@nongnu.org; Thu, 27 Nov 2014 09:48:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu0NF-0003T3-Hz for qemu-devel@nongnu.org; Thu, 27 Nov 2014 09:48:49 -0500 From: Max Reitz Date: Thu, 27 Nov 2014 15:48:29 +0100 Message-Id: <1417099720-16428-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1417099720-16428-1-git-send-email-mreitz@redhat.com> References: <1417099720-16428-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 02/13] block: Omit bdrv_find_format for essential drivers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Lieven , Markus Armbruster , Max Reitz , Stefan Hajnoczi We can always assume raw, file and qcow2 being available; so do not use bdrv_find_format() to locate their BlockDriver objects but statically reference the respective objects. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz --- block.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index 9d003bc..fbd7cb2 100644 --- a/block.c +++ b/block.c @@ -629,7 +629,7 @@ BlockDriver *bdrv_find_protocol(const char *filename, } if (!path_has_protocol(filename) || !allow_protocol_prefix) { - return bdrv_find_format("file"); + return bdrv_file; } p = strchr(filename, ':'); @@ -658,12 +658,7 @@ static int find_image_format(BlockDriverState *bs, const char *filename, /* Return the raw BlockDriver * to scsi-generic devices or empty drives */ if (bs->sg || !bdrv_is_inserted(bs) || bdrv_getlength(bs) == 0) { - drv = bdrv_find_format("raw"); - if (!drv) { - error_setg(errp, "Could not find raw image format"); - ret = -ENOENT; - } - *pdrv = drv; + *pdrv = bdrv_raw; return ret; } @@ -1293,7 +1288,6 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) /* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */ char *tmp_filename = g_malloc0(PATH_MAX + 1); int64_t total_size; - BlockDriver *bdrv_qcow2; QemuOpts *opts = NULL; QDict *snapshot_options; BlockDriverState *bs_snapshot; @@ -1318,7 +1312,6 @@ int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp) goto out; } - bdrv_qcow2 = bdrv_find_format("qcow2"); opts = qemu_opts_create(bdrv_qcow2->create_opts, NULL, 0, &error_abort); qemu_opt_set_number(opts, BLOCK_OPT_SIZE, total_size); -- 1.9.3