From patchwork Thu Jul 14 19:03:17 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: 9230493 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 D79A660574 for ; Thu, 14 Jul 2016 19:26:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C524227FBE for ; Thu, 14 Jul 2016 19:26:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9861282F5; Thu, 14 Jul 2016 19:26: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 616AD27FBE for ; Thu, 14 Jul 2016 19:26:46 +0000 (UTC) Received: from localhost ([::1]:56404 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmHV-0006hW-F9 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:26:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvM-00043R-AF 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 1bNlvK-0002lS-68 for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvG-0002iy-MA; 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 46D2811BB40; Thu, 14 Jul 2016 19:03:46 +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 u6EJ3T8i000405; Thu, 14 Jul 2016 15:03:45 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:17 -0400 Message-Id: <1468523008-30013-22-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.38]); Thu, 14 Jul 2016 19:03:46 +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 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-probe.c | 17 +++++++++++------ block/parallels.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index f7dc4a4..18974c6 100644 --- a/block.c +++ b/block.c @@ -65,6 +65,7 @@ static BdrvProbeFunc *format_probes[] = { bdrv_cloop_probe, bdrv_crypto_probe_luks, bdrv_dmg_probe, + bdrv_parallels_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/parallels-probe.c b/block/parallels-probe.c index ff2f6ba..659a09b 100644 --- a/block/parallels-probe.c +++ b/block/parallels-probe.c @@ -3,19 +3,24 @@ #include "block/probe.h" #include "parallels.h" -int parallels_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *bdrv_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/block/parallels.c b/block/parallels.c index 70e9439..88294f7 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/include/block/probe.h b/include/block/probe.h index bd5a532..090e0ae 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 *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); +const char *bdrv_parallels_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif