From patchwork Thu Jul 14 19:03:13 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: 9230491 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 F2B5260574 for ; Thu, 14 Jul 2016 19:26:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF4B128249 for ; Thu, 14 Jul 2016 19:26:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3D0F27FBE; Thu, 14 Jul 2016 19:26:42 +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 6925627FBE for ; Thu, 14 Jul 2016 19:26:42 +0000 (UTC) Received: from localhost ([::1]:56403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmHQ-0006dE-RP for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:26:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvJ-0003zc-RV for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvH-0002je-FZ for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51118) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvD-0002hr-W2; Thu, 14 Jul 2016 15:03:44 -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 9396D7EA85; Thu, 14 Jul 2016 19:03:43 +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 u6EJ3T8e000405; Thu, 14 Jul 2016 15:03:42 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:13 -0400 Message-Id: <1468523008-30013-18-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.28]); Thu, 14 Jul 2016 19:03:43 +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 17/32] blockdev: Separate bochs 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 Modifies the bochs probe to return the format name as well as the score as the final step of separating the probe function from the driver. This keeps the probe completely independent of the driver, making future modularization easier to accomplish. Returning the format name as well as the score allows the score to be correlated to the driver without the probe function needing to be part of the driver. Signed-off-by: Colin Lord Reviewed-by: Max Reitz --- block.c | 20 ++++++++++++++++++++ block/bochs-probe.c | 25 ++++++++++++++++--------- block/bochs.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 38 insertions(+), 11 deletions(-) diff --git a/block.c b/block.c index 3a0dc19..b16f8cf 100644 --- a/block.c +++ b/block.c @@ -25,6 +25,7 @@ #include "trace.h" #include "block/block_int.h" #include "block/blockjob.h" +#include "block/probe.h" #include "qemu/error-report.h" #include "module_block.h" #include "qemu/module.h" @@ -56,6 +57,13 @@ #define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */ +typedef const char *BdrvProbeFunc(const uint8_t *buf, int buf_size, + const char *filename, int *score); + +static BdrvProbeFunc *format_probes[] = { + bdrv_bochs_probe, +}; + static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = QTAILQ_HEAD_INITIALIZER(graph_bdrv_states); @@ -576,6 +584,8 @@ BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size, const char *filename) { int score_max = 0, score; + const char *format_max = NULL; + const char *format; size_t i; BlockDriver *drv = NULL, *d; @@ -595,6 +605,16 @@ BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size, } } + for (i = 0; i < ARRAY_SIZE(format_probes); i++) { + format = format_probes[i](buf, buf_size, filename, &score); + if (score > score_max) { + score_max = score; + format_max = format; + /* TODO: move call to find_format outside this loop */ + drv = bdrv_find_format(format_max); + } + } + return drv; } diff --git a/block/bochs-probe.c b/block/bochs-probe.c index befe2cf..57161dc 100644 --- a/block/bochs-probe.c +++ b/block/bochs-probe.c @@ -3,19 +3,26 @@ #include "block/probe.h" #include "bochs.h" -int bochs_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *bdrv_bochs_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score) { + const char *format = "bochs"; const struct bochs_header *bochs = (const void *)buf; + assert(score); + *score = 0; - if (buf_size < HEADER_SIZE) - return 0; + if (buf_size < HEADER_SIZE) { + return format; + } if (!strcmp(bochs->magic, HEADER_MAGIC) && - !strcmp(bochs->type, REDOLOG_TYPE) && - !strcmp(bochs->subtype, GROWING_TYPE) && - ((le32_to_cpu(bochs->version) == HEADER_VERSION) || - (le32_to_cpu(bochs->version) == HEADER_V1))) - return 100; + !strcmp(bochs->type, REDOLOG_TYPE) && + !strcmp(bochs->subtype, GROWING_TYPE) && + ((le32_to_cpu(bochs->version) == HEADER_VERSION) || + (le32_to_cpu(bochs->version) == HEADER_V1))) { + *score = 100; + return format; + } - return 0; + return format; } diff --git a/block/bochs.c b/block/bochs.c index 5c9a696..7051ffc 100644 --- a/block/bochs.c +++ b/block/bochs.c @@ -234,7 +234,6 @@ static void bochs_close(BlockDriverState *bs) static BlockDriver bdrv_bochs = { .format_name = "bochs", .instance_size = sizeof(BDRVBochsState), - .bdrv_probe = bochs_probe, .bdrv_open = bochs_open, .bdrv_refresh_limits = bochs_refresh_limits, .bdrv_co_preadv = bochs_co_preadv, diff --git a/include/block/probe.h b/include/block/probe.h index 6cf878b..aac1fca 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -int bochs_probe(const uint8_t *buf, int buf_size, const char *filename); int cloop_probe(const uint8_t *buf, int buf_size, const char *filename); int block_crypto_probe_luks(const uint8_t *buf, int buf_size, const char *filename); @@ -15,5 +14,7 @@ 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); int vpc_probe(const uint8_t *buf, int buf_size, const char *filename); +const char *bdrv_bochs_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif