From patchwork Tue Jul 5 15:24:24 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: 9214631 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 1A48D6048B for ; Tue, 5 Jul 2016 15:48:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C10626490 for ; Tue, 5 Jul 2016 15:48:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 006B226538; Tue, 5 Jul 2016 15:48:12 +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 8321D26490 for ; Tue, 5 Jul 2016 15:48:12 +0000 (UTC) Received: from localhost ([::1]:55926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSa3-0005Df-9u for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:48:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDc-0006Dd-0m for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDa-0000A3-I3 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDT-00005D-Vy; Tue, 05 Jul 2016 11:24:52 -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 8FD9AC05B1CD; Tue, 5 Jul 2016 15:24:51 +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 u65FOWuK006841; Tue, 5 Jul 2016 11:24:50 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:24 -0400 Message-Id: <1467732272-23368-25-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:51 +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 24/32] blockdev: Separate qed 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 qed probe from the qed driver. The qed 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/probe/qed.c | 16 +++++++++++----- block/qed.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index b4e347a..fee9f8c 100644 --- a/block.c +++ b/block.c @@ -68,6 +68,7 @@ static BdrvProbeFunc *format_probes[] = { parallels_probe, qcow_probe, qcow2_probe, + bdrv_qed_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/probe/qed.c b/block/probe/qed.c index c902489..3fdb5d7 100644 --- a/block/probe/qed.c +++ b/block/probe/qed.c @@ -3,16 +3,22 @@ #include "block/probe.h" #include "block/qed.h" -int bdrv_qed_probe(const uint8_t *buf, int buf_size, - const char *filename) +const char *bdrv_qed_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score) { + const char *format = "qed"; const QEDHeader *header = (const QEDHeader *)buf; + assert(score); + *score = 0; if (buf_size < sizeof(*header)) { - return 0; + return format; } + if (le32_to_cpu(header->magic) != QED_MAGIC) { - return 0; + return format; } - return 100; + + *score = 100; + return format; } diff --git a/block/qed.c b/block/qed.c index 21d8982..cf78ff0 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1638,7 +1638,6 @@ static BlockDriver bdrv_qed = { .create_opts = &qed_create_opts, .supports_backing = true, - .bdrv_probe = bdrv_qed_probe, .bdrv_open = bdrv_qed_open, .bdrv_close = bdrv_qed_close, .bdrv_reopen_prepare = bdrv_qed_reopen_prepare, diff --git a/include/block/probe.h b/include/block/probe.h index 222185b..63edd74 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -int bdrv_qed_probe(const uint8_t *buf, int buf_size, const char *filename); int raw_probe(const uint8_t *buf, int buf_size, const char *filename); int vdi_probe(const uint8_t *buf, int buf_size, const char *filename); int vhdx_probe(const uint8_t *buf, int buf_size, const char *filename); @@ -21,5 +20,7 @@ const char *qcow_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *qcow2_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *bdrv_qed_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif