From patchwork Thu Jul 14 19:03:25 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: 9230509 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 5D42060574 for ; Thu, 14 Jul 2016 19:35:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A21727FBE for ; Thu, 14 Jul 2016 19:35:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C68428285; Thu, 14 Jul 2016 19:35:14 +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 D914927FBE for ; Thu, 14 Jul 2016 19:35:13 +0000 (UTC) Received: from localhost ([::1]:56462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmPg-0008Jy-UK for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:35:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvV-0004C5-4Q for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvT-0002qZ-4W for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:04:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvM-0002mu-Ij; Thu, 14 Jul 2016 15:03:52 -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 2D926D2EF7; Thu, 14 Jul 2016 19:03:52 +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 u6EJ3T8q000405; Thu, 14 Jul 2016 15:03:51 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:25 -0400 Message-Id: <1468523008-30013-30-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.38]); Thu, 14 Jul 2016 19:03:52 +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 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/vpc-probe.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 bb2faf8..bc550e4 100644 --- a/block.c +++ b/block.c @@ -73,6 +73,7 @@ static BdrvProbeFunc *format_probes[] = { bdrv_vdi_probe, bdrv_vhdx_probe, bdrv_vmdk_probe, + bdrv_vpc_probe }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/vpc-probe.c b/block/vpc-probe.c index afe8271..77cc4e7 100644 --- a/block/vpc-probe.c +++ b/block/vpc-probe.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 *bdrv_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 7ab3e7f..78ed40a 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 8f2c26c..b320b20 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 *bdrv_bochs_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *bdrv_cloop_probe(const uint8_t *buf, int buf_size, @@ -26,5 +25,7 @@ const char *bdrv_vhdx_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *bdrv_vmdk_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *bdrv_vpc_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif