From patchwork Thu Jul 14 19:03: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: 9230459 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 575596075D for ; Thu, 14 Jul 2016 19:09:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47B49281DB for ; Thu, 14 Jul 2016 19:09:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C8A828305; Thu, 14 Jul 2016 19:09:24 +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 D9503281DB for ; Thu, 14 Jul 2016 19:09:23 +0000 (UTC) Received: from localhost ([::1]:56295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNm0g-0000tk-Qv for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:09:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvQ-00049g-NO 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 1bNlvP-0002oZ-8I for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvJ-0002ku-LU; 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 382594BAA9; Thu, 14 Jul 2016 19:03:49 +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 u6EJ3T8m000405; Thu, 14 Jul 2016 15:03:48 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:21 -0400 Message-Id: <1468523008-30013-26-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.30]); Thu, 14 Jul 2016 19:03: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 v4 25/32] blockdev: Separate raw 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 raw probe from the raw driver. The raw 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/raw-probe.c | 8 ++++++-- block/raw_bsd.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 3dc7644..f37161d 100644 --- a/block.c +++ b/block.c @@ -69,6 +69,7 @@ static BdrvProbeFunc *format_probes[] = { bdrv_qcow_probe, bdrv_qcow2_probe, bdrv_qed_probe, + bdrv_raw_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/raw-probe.c b/block/raw-probe.c index 22c6bcb..ac45e13 100644 --- a/block/raw-probe.c +++ b/block/raw-probe.c @@ -1,10 +1,14 @@ #include "qemu/osdep.h" #include "block/probe.h" -int raw_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *bdrv_raw_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score) { + const char *format = "raw"; + assert(score); /* smallest possible positive score so that raw is used if and only if no * other block driver works */ - return 1; + *score = 1; + return format; } diff --git a/block/raw_bsd.c b/block/raw_bsd.c index 25d5185..908cb59 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -226,7 +226,6 @@ static int raw_probe_geometry(BlockDriverState *bs, HDGeometry *geo) BlockDriver bdrv_raw = { .format_name = "raw", - .bdrv_probe = &raw_probe, .bdrv_reopen_prepare = &raw_reopen_prepare, .bdrv_open = &raw_open, .bdrv_close = &raw_close, diff --git a/include/block/probe.h b/include/block/probe.h index cbb9c12..662d5d7 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -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); int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename); @@ -22,5 +21,7 @@ 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); +const char *bdrv_raw_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif