From patchwork Tue Jul 5 15:24:20 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: 9214599 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 A36B760752 for ; Tue, 5 Jul 2016 15:30:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9513D25D97 for ; Tue, 5 Jul 2016 15:30:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87D592624C; Tue, 5 Jul 2016 15:30: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 3352D25D97 for ; Tue, 5 Jul 2016 15:30:06 +0000 (UTC) Received: from localhost ([::1]:55819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSIX-0003Fz-By for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:30:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDX-00066o-1h for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDV-000073-Pu for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDR-0008Tl-19; Tue, 05 Jul 2016 11:24:49 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 9ED2A80F72; Tue, 5 Jul 2016 15:24:48 +0000 (UTC) Received: from dhcp-17-138.bos.redhat.com (dhcp-17-5.bos.redhat.com [10.18.17.5]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u65FOWuG006841; Tue, 5 Jul 2016 11:24:48 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:20 -0400 Message-Id: <1467732272-23368-21-git-send-email-clord@redhat.com> In-Reply-To: <1467732272-23368-1-git-send-email-clord@redhat.com> References: <1467732272-23368-1-git-send-email-clord@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 05 Jul 2016 15:24:48 +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 v3 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.c | 1 - block/probe/dmg.c | 13 +++++++++---- include/block/probe.h | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index d936da1..7dbe201 100644 --- a/block.c +++ b/block.c @@ -64,6 +64,7 @@ static BdrvProbeFunc *format_probes[] = { bochs_probe, cloop_probe, block_crypto_probe_luks, + dmg_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/dmg.c b/block/dmg.c index 2c70687..945cc00 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -704,7 +704,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_co_preadv = dmg_co_preadv, .bdrv_close = dmg_close, diff --git a/block/probe/dmg.c b/block/probe/dmg.c index a40281b..5415b04 100644 --- a/block/probe/dmg.c +++ b/block/probe/dmg.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 *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/include/block/probe.h b/include/block/probe.h index e3bf04e..ef6629f 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 *cloop_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *block_crypto_probe_luks(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *dmg_probe(const uint8_t *buf, int buf_size, const char *filename, + int *score); #endif