From patchwork Thu Jul 14 19:03:16 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: 9230451 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 6F8F760572 for ; Thu, 14 Jul 2016 19:04:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6192623B3D for ; Thu, 14 Jul 2016 19:04:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5602524DA1; Thu, 14 Jul 2016 19:04:46 +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 F33D723B3D for ; Thu, 14 Jul 2016 19:04:45 +0000 (UTC) Received: from localhost ([::1]:56267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlwD-0004JW-4A for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:04:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvL-00042T-NQ for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvJ-0002ky-Il for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvF-0002iT-Ue; Thu, 14 Jul 2016 15:03:46 -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 857A6F6E62; Thu, 14 Jul 2016 19:03:45 +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 u6EJ3T8h000405; Thu, 14 Jul 2016 15:03:44 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:16 -0400 Message-Id: <1468523008-30013-21-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.26]); Thu, 14 Jul 2016 19:03:45 +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 20/32] blockdev: Separate dmg 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 dmg probe from the dmg driver. The dmg 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/dmg-probe.c | 13 +++++++++---- block/dmg.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 6a144cc..f7dc4a4 100644 --- a/block.c +++ b/block.c @@ -64,6 +64,7 @@ static BdrvProbeFunc *format_probes[] = { bdrv_bochs_probe, bdrv_cloop_probe, bdrv_crypto_probe_luks, + bdrv_dmg_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/dmg-probe.c b/block/dmg-probe.c index a40281b..cc6efa8 100644 --- a/block/dmg-probe.c +++ b/block/dmg-probe.c @@ -1,17 +1,22 @@ #include "qemu/osdep.h" #include "block/probe.h" -int dmg_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *bdrv_dmg_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score) { + const char *format = "dmg"; int len; + assert(score); + *score = 0; if (!filename) { - return 0; + return format; } len = strlen(filename); if (len > 4 && !strcmp(filename + len - 4, ".dmg")) { - return 2; + *score = 2; + return format; } - return 0; + return format; } diff --git a/block/dmg.c b/block/dmg.c index 4bbb079..8e50a6b 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -709,7 +709,6 @@ static void dmg_close(BlockDriverState *bs) static BlockDriver bdrv_dmg = { .format_name = "dmg", .instance_size = sizeof(BDRVDMGState), - .bdrv_probe = dmg_probe, .bdrv_open = dmg_open, .bdrv_refresh_limits = dmg_refresh_limits, .bdrv_co_preadv = dmg_co_preadv, diff --git a/include/block/probe.h b/include/block/probe.h index b15dd91..bd5a532 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -int dmg_probe(const uint8_t *buf, int buf_size, const char *filename); int parallels_probe(const uint8_t *buf, int buf_size, const char *filename); int qcow_probe(const uint8_t *buf, int buf_size, const char *filename); int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename); @@ -17,5 +16,7 @@ const char *bdrv_cloop_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *bdrv_crypto_probe_luks(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *bdrv_dmg_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif