From patchwork Tue Jul 5 15:24:26 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: 9214635 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 AB1936048B for ; Tue, 5 Jul 2016 15:49:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D24926253 for ; Tue, 5 Jul 2016 15:49:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 91B2526538; Tue, 5 Jul 2016 15:49:37 +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 0F28426253 for ; Tue, 5 Jul 2016 15:49:37 +0000 (UTC) Received: from localhost ([::1]:55930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSbQ-0006gZ-4J for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:49:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDb-0006DK-RR for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDa-00009y-Gr for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDV-00006U-Cs; Tue, 05 Jul 2016 11:24:53 -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 0A1626315E; Tue, 5 Jul 2016 15:24:53 +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 u65FOWuM006841; Tue, 5 Jul 2016 11:24:52 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:26 -0400 Message-Id: <1467732272-23368-27-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.38]); Tue, 05 Jul 2016 15:24:53 +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 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/probe/vdi.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 a3d983f..fd97795 100644 --- a/block.c +++ b/block.c @@ -70,6 +70,7 @@ static BdrvProbeFunc *format_probes[] = { qcow2_probe, bdrv_qed_probe, raw_probe, + vdi_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/probe/vdi.c b/block/probe/vdi.c index 9adf5e5..1dcf7ab 100644 --- a/block/probe/vdi.c +++ b/block/probe/vdi.c @@ -3,24 +3,27 @@ #include "block/probe.h" #include "block/driver/vdi.h" -int vdi_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *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 e99ae92..445e2b8 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 b49663d..b19b586 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 *raw_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *vdi_probe(const uint8_t *buf, int buf_size, const char *filename, + int *score); #endif