From patchwork Thu Jul 14 19:03:22 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: 9230519 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 DDD7D60572 for ; Thu, 14 Jul 2016 19:39:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA8EE27FBE for ; Thu, 14 Jul 2016 19:39:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE2C72818E; Thu, 14 Jul 2016 19:39:21 +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 6265E27FBE for ; Thu, 14 Jul 2016 19:39:21 +0000 (UTC) Received: from localhost ([::1]:56488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmTg-0006ZP-H5 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:39:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvQ-00049f-Jn 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-0002ok-9z for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvK-0002lW-F2; Thu, 14 Jul 2016 15:03:50 -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 0523775F00; Thu, 14 Jul 2016 19:03:50 +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 u6EJ3T8n000405; Thu, 14 Jul 2016 15:03:49 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:22 -0400 Message-Id: <1468523008-30013-27-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.27]); Thu, 14 Jul 2016 19:03:50 +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 26/32] blockdev: Separate vdi 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 vdi probe from the vdi driver. The vdi 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/vdi-probe.c | 13 ++++++++----- block/vdi.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index f37161d..a1a0b50 100644 --- a/block.c +++ b/block.c @@ -70,6 +70,7 @@ static BdrvProbeFunc *format_probes[] = { bdrv_qcow2_probe, bdrv_qed_probe, bdrv_raw_probe, + bdrv_vdi_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/vdi-probe.c b/block/vdi-probe.c index 42b2cc8..9c57194 100644 --- a/block/vdi-probe.c +++ b/block/vdi-probe.c @@ -3,24 +3,27 @@ #include "block/probe.h" #include "vdi.h" -int vdi_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *bdrv_vdi_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score) { + const char *format = "vdi"; const VdiHeader *header = (const VdiHeader *)buf; - int ret = 0; + assert(score); + *score = 0; logout("\n"); if (buf_size < sizeof(*header)) { /* Header too small, no VDI. */ } else if (le32_to_cpu(header->signature) == VDI_SIGNATURE) { - ret = 100; + *score = 100; } - if (ret == 0) { + if (*score == 0) { logout("no vdi image\n"); } else { logout("%s", header->text); } - return ret; + return format; } diff --git a/block/vdi.c b/block/vdi.c index b6db1c6..27cc5c3 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -849,7 +849,6 @@ static QemuOptsList vdi_create_opts = { static BlockDriver bdrv_vdi = { .format_name = "vdi", .instance_size = sizeof(BDRVVdiState), - .bdrv_probe = vdi_probe, .bdrv_open = vdi_open, .bdrv_close = vdi_close, .bdrv_reopen_prepare = vdi_reopen_prepare, diff --git a/include/block/probe.h b/include/block/probe.h index 662d5d7..86d48e2 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -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); @@ -23,5 +22,7 @@ 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); +const char *bdrv_vdi_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif