From patchwork Tue Jul 5 15:24:29 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: 9214689 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 7AE716048F for ; Tue, 5 Jul 2016 15:57:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C91926861 for ; Tue, 5 Jul 2016 15:57:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 616DD26992; Tue, 5 Jul 2016 15:57: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 F230926861 for ; Tue, 5 Jul 2016 15:57:11 +0000 (UTC) Received: from localhost ([::1]:55985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSil-0004xX-4A for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:57:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDe-0006FN-AM for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDb-0000Am-P2 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDX-00008d-NC; Tue, 05 Jul 2016 11:24:55 -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 490B53B725; Tue, 5 Jul 2016 15:24:55 +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 u65FOWuP006841; Tue, 5 Jul 2016 11:24:54 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:29 -0400 Message-Id: <1467732272-23368-30-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.30]); Tue, 05 Jul 2016 15:24:55 +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 29/32] blockdev: Separate vpc 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 vpc probe from the vpc driver. The vpc 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/vpc.c | 15 +++++++++++---- block/vpc.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 9b839df..8226124 100644 --- a/block.c +++ b/block.c @@ -73,6 +73,7 @@ static BdrvProbeFunc *format_probes[] = { vdi_probe, vhdx_probe, vmdk_probe, + vpc_probe }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/probe/vpc.c b/block/probe/vpc.c index afe8271..0fe8a65 100644 --- a/block/probe/vpc.c +++ b/block/probe/vpc.c @@ -1,9 +1,16 @@ #include "qemu/osdep.h" #include "block/probe.h" -int vpc_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *vpc_probe(const uint8_t *buf, int buf_size, const char *filename, + int *score) { - if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8)) - return 100; - return 0; + const char *format = "vpc"; + assert(score); + if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8)) { + *score = 100; + return format; + } + + *score = 0; + return format; } diff --git a/block/vpc.c b/block/vpc.c index cb65022..cd87d8f 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -1050,7 +1050,6 @@ static BlockDriver bdrv_vpc = { .format_name = "vpc", .instance_size = sizeof(BDRVVPCState), - .bdrv_probe = vpc_probe, .bdrv_open = vpc_open, .bdrv_close = vpc_close, .bdrv_reopen_prepare = vpc_reopen_prepare, diff --git a/include/block/probe.h b/include/block/probe.h index 13df1d3..7facb75 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -int vpc_probe(const uint8_t *buf, int buf_size, const char *filename); const char *bochs_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *cloop_probe(const uint8_t *buf, int buf_size, const char *filename, @@ -26,5 +25,7 @@ const char *vhdx_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *vmdk_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *vpc_probe(const uint8_t *buf, int buf_size, const char *filename, + int *score); #endif