From patchwork Thu Jul 14 19:03:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: clord@redhat.com X-Patchwork-Id: 9230507 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 54C3860574 for ; Thu, 14 Jul 2016 19:35:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36EB527FBE for ; Thu, 14 Jul 2016 19:35:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A3CC28285; Thu, 14 Jul 2016 19:35:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C728527FBE for ; Thu, 14 Jul 2016 19:35:05 +0000 (UTC) Received: from localhost ([::1]:56459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmPY-00087B-Br for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:35:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvP-00047U-2H for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvK-0002lz-VV for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvE-0002i6-F2; Thu, 14 Jul 2016 15:03:44 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0377E3B70A; Thu, 14 Jul 2016 19:03:44 +0000 (UTC) Received: from dhcp-17-138.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6EJ3T8f000405; Thu, 14 Jul 2016 15:03:43 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:14 -0400 Message-Id: <1468523008-30013-19-git-send-email-clord@redhat.com> In-Reply-To: <1468523008-30013-1-git-send-email-clord@redhat.com> References: <1468523008-30013-1-git-send-email-clord@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 14 Jul 2016 19:03:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 18/32] blockdev: Separate cloop probe from its driver X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Colin Lord , qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Completes the separation of the cloop probe from the cloop driver. The cloop probe now returns the format in addition to the score, allowing correlation of the score and driver without the probe function being part of the driver itself. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block.c | 1 + block/cloop-probe.c | 11 ++++++++--- block/cloop.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index b16f8cf..8d21f87 100644 --- a/block.c +++ b/block.c @@ -62,6 +62,7 @@ typedef const char *BdrvProbeFunc(const uint8_t *buf, int buf_size, static BdrvProbeFunc *format_probes[] = { bdrv_bochs_probe, + bdrv_cloop_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/cloop-probe.c b/block/cloop-probe.c index 955c29c..779b377 100644 --- a/block/cloop-probe.c +++ b/block/cloop-probe.c @@ -1,17 +1,22 @@ #include "qemu/osdep.h" #include "block/probe.h" -int cloop_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *bdrv_cloop_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score) { + const char *format = "cloop"; const char *magic_version_2_0 = "#!/bin/sh\n" "#V2.0 Format\n" "modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1\n"; int length = strlen(magic_version_2_0); + assert(score); if (length > buf_size) { length = buf_size; } if (!memcmp(magic_version_2_0, buf, length)) { - return 2; + *score = 2; + return format; } - return 0; + *score = 0; + return format; } diff --git a/block/cloop.c b/block/cloop.c index c897e58..a2555d3 100644 --- a/block/cloop.c +++ b/block/cloop.c @@ -268,7 +268,6 @@ static void cloop_close(BlockDriverState *bs) static BlockDriver bdrv_cloop = { .format_name = "cloop", .instance_size = sizeof(BDRVCloopState), - .bdrv_probe = cloop_probe, .bdrv_open = cloop_open, .bdrv_refresh_limits = cloop_refresh_limits, .bdrv_co_preadv = cloop_co_preadv, diff --git a/include/block/probe.h b/include/block/probe.h index aac1fca..e434af5 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -int cloop_probe(const uint8_t *buf, int buf_size, const char *filename); int block_crypto_probe_luks(const uint8_t *buf, int buf_size, const char *filename); int dmg_probe(const uint8_t *buf, int buf_size, const char *filename); @@ -16,5 +15,7 @@ int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename); int vpc_probe(const uint8_t *buf, int buf_size, const char *filename); const char *bdrv_bochs_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *bdrv_cloop_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif