From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmpNy-0005yj-Jd for qemu-devel@nongnu.org; Fri, 07 Nov 2014 14:40:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XmpNp-0004FI-U4 for qemu-devel@nongnu.org; Fri, 07 Nov 2014 14:39:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmpNp-0004F6-Lb for qemu-devel@nongnu.org; Fri, 07 Nov 2014 14:39:45 -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 sA7Jdjdp011331 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 7 Nov 2014 14:39:45 -0500 From: Kevin Wolf Date: Fri, 7 Nov 2014 20:39:21 +0100 Message-Id: <1415389165-16157-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1415389165-16157-1-git-send-email-kwolf@redhat.com> References: <1415389165-16157-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 5/9] block: Factor bdrv_probe_all() out of find_image_format() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- block.c | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/block.c b/block.c index 4b5735c..2fdc33f 100644 --- a/block.c +++ b/block.c @@ -648,11 +648,40 @@ BlockDriver *bdrv_find_protocol(const char *filename, return NULL; } +/* + * Guess image format by probing its contents. + * This is not a good idea when your image is raw (CVE-2008-2004), but + * we do it anyway for backward compatibility. + * @buf contains the image's first @buf_size bytes. + * @buf_size is 2048 or the image's size, whatever is smaller. + * @filename is its filename. + * For all block drivers, call the bdrv_probe() method to get its + * probing score. + * Return the first block driver with the highest probing score. + */ +static BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size, + const char *filename) +{ + int score_max = 0, score; + BlockDriver *drv = NULL, *d; + + QLIST_FOREACH(d, &bdrv_drivers, list) { + if (d->bdrv_probe) { + score = d->bdrv_probe(buf, buf_size, filename); + if (score > score_max) { + score_max = score; + drv = d; + } + } + } + + return drv; +} + static int find_image_format(BlockDriverState *bs, const char *filename, BlockDriver **pdrv, Error **errp) { - int score, score_max; - BlockDriver *drv1, *drv; + BlockDriver *drv; uint8_t buf[2048]; int ret = 0; @@ -675,17 +704,7 @@ static int find_image_format(BlockDriverState *bs, const char *filename, return ret; } - score_max = 0; - drv = NULL; - QLIST_FOREACH(drv1, &bdrv_drivers, list) { - if (drv1->bdrv_probe) { - score = drv1->bdrv_probe(buf, ret, filename); - if (score > score_max) { - score_max = score; - drv = drv1; - } - } - } + drv = bdrv_probe_all(buf, ret, filename); if (!drv) { error_setg(errp, "Could not determine image format: No compatible " "driver found"); -- 1.8.3.1