From patchwork Tue Jul 5 15:24:21 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: 9214663 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 B246E6048B for ; Tue, 5 Jul 2016 15:54:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3F4426785 for ; Tue, 5 Jul 2016 15:54:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 988C026861; Tue, 5 Jul 2016 15:54:00 +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 3DA7026785 for ; Tue, 5 Jul 2016 15:54:00 +0000 (UTC) Received: from localhost ([::1]:55962 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSff-0004vD-CF for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:53:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDd-0006Dz-6d for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDa-0000AJ-P2 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDR-0008UR-Oc; 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 5DABDC05B1DF; Tue, 5 Jul 2016 15:24:49 +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 u65FOWuH006841; Tue, 5 Jul 2016 11:24:48 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:21 -0400 Message-Id: <1467732272-23368-22-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.32]); Tue, 05 Jul 2016 15:24:49 +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 21/32] blockdev: Separate parallels 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 parallels probe from the parallels driver. The parallels 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/parallels.c | 1 - block/probe/parallels.c | 18 +++++++++++------- include/block/probe.h | 3 ++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/block.c b/block.c index 7dbe201..0f4c9f6 100644 --- a/block.c +++ b/block.c @@ -65,6 +65,7 @@ static BdrvProbeFunc *format_probes[] = { cloop_probe, block_crypto_probe_luks, dmg_probe, + parallels_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/parallels.c b/block/parallels.c index 547373e..6994c41 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -709,7 +709,6 @@ static QemuOptsList parallels_create_opts = { static BlockDriver bdrv_parallels = { .format_name = "parallels", .instance_size = sizeof(BDRVParallelsState), - .bdrv_probe = parallels_probe, .bdrv_open = parallels_open, .bdrv_close = parallels_close, .bdrv_co_get_block_status = parallels_co_get_block_status, diff --git a/block/probe/parallels.c b/block/probe/parallels.c index 66cddea..3ebeddd 100644 --- a/block/probe/parallels.c +++ b/block/probe/parallels.c @@ -3,20 +3,24 @@ #include "block/probe.h" #include "block/driver/parallels.h" -int parallels_probe(const uint8_t *buf, int buf_size, - const char *filename) +const char *parallels_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score) { + const char *format = "parallels"; const ParallelsHeader *ph = (const void *)buf; + assert(score); + *score = 0; if (buf_size < sizeof(ParallelsHeader)) { - return 0; + return format; } if ((!memcmp(ph->magic, HEADER_MAGIC, 16) || - !memcmp(ph->magic, HEADER_MAGIC2, 16)) && - (le32_to_cpu(ph->version) == HEADER_VERSION)) { - return 100; + !memcmp(ph->magic, HEADER_MAGIC2, 16)) && + (le32_to_cpu(ph->version) == HEADER_VERSION)) { + *score = 100; + return format; } - return 0; + return format; } diff --git a/include/block/probe.h b/include/block/probe.h index ef6629f..7383a64 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -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); int bdrv_qed_probe(const uint8_t *buf, int buf_size, const char *filename); @@ -18,5 +17,7 @@ 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); +const char *parallels_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif