From patchwork Thu Jul 14 19:03: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: 648566 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rr5YQ0Xbmz9sC4 for ; Fri, 15 Jul 2016 05:36:42 +1000 (AEST) Received: from localhost ([::1]:56478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmR6-0002w1-0L for incoming@patchwork.ozlabs.org; Thu, 14 Jul 2016 15:36:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvR-00049k-NA for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvQ-0002pN-DM for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52231) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvI-0002kT-SD; Thu, 14 Jul 2016 15:03:49 -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 7498AC049D5A; Thu, 14 Jul 2016 19:03:48 +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 u6EJ3T8l000405; Thu, 14 Jul 2016 15:03:47 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:20 -0400 Message-Id: <1468523008-30013-25-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.31]); Thu, 14 Jul 2016 19:03: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 v4 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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/qed-probe.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 145be9b..3dc7644 100644 --- a/block.c +++ b/block.c @@ -68,6 +68,7 @@ static BdrvProbeFunc *format_probes[] = { bdrv_parallels_probe, bdrv_qcow_probe, bdrv_qcow2_probe, + bdrv_qed_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/qed-probe.c b/block/qed-probe.c index 40261f0..5ad8359 100644 --- a/block/qed-probe.c +++ b/block/qed-probe.c @@ -3,16 +3,22 @@ #include "block/probe.h" #include "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 544ed0d..a8d790a 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 1a68cef..cbb9c12 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 *bdrv_qcow_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *bdrv_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