From patchwork Tue Jul 5 15:24:28 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: 9214687 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 07AAB6048F for ; Tue, 5 Jul 2016 15:57:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA43C264F4 for ; Tue, 5 Jul 2016 15:57:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDCCD2684F; Tue, 5 Jul 2016 15:57:00 +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 5E778264F4 for ; Tue, 5 Jul 2016 15:56:59 +0000 (UTC) Received: from localhost ([::1]:55983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSiY-0004VH-VG for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:56:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDe-0006Ex-2e 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-0000Ah-NM for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:25:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDW-00007u-TZ; 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 7CC853DF; Tue, 5 Jul 2016 15:24:54 +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 u65FOWuO006841; Tue, 5 Jul 2016 11:24:53 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:28 -0400 Message-Id: <1467732272-23368-29-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.29]); Tue, 05 Jul 2016 15:24:54 +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 28/32] blockdev: Separate vmdk 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 vmdk probe from the vmdk driver. The vmdk 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/vmdk.c | 23 +++++++++++++++-------- block/vmdk.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index cc48279..9b839df 100644 --- a/block.c +++ b/block.c @@ -72,6 +72,7 @@ static BdrvProbeFunc *format_probes[] = { raw_probe, vdi_probe, vhdx_probe, + vmdk_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/probe/vmdk.c b/block/probe/vmdk.c index cb9bd3d..305a95c 100644 --- a/block/probe/vmdk.c +++ b/block/probe/vmdk.c @@ -3,17 +3,22 @@ #include "block/probe.h" #include "block/driver/vmdk.h" -int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *vmdk_probe(const uint8_t *buf, int buf_size, const char *filename, + int *score) { + const char *format = "vmdk"; uint32_t magic; + assert(score); + *score = 0; if (buf_size < 4) { - return 0; + return format; } magic = be32_to_cpu(*(uint32_t *)buf); if (magic == VMDK3_MAGIC || magic == VMDK4_MAGIC) { - return 100; + *score = 100; + return format; } else { const char *p = (const char *)buf; const char *end = p + buf_size; @@ -36,7 +41,7 @@ int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename) } /* only accept blank lines before 'version=' line */ if (p == end || *p != '\n') { - return 0; + return format; } p++; continue; @@ -44,17 +49,19 @@ int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename) if (end - p >= strlen("version=X\n")) { if (strncmp("version=1\n", p, strlen("version=1\n")) == 0 || strncmp("version=2\n", p, strlen("version=2\n")) == 0) { - return 100; + *score = 100; + return format; } } if (end - p >= strlen("version=X\r\n")) { if (strncmp("version=1\r\n", p, strlen("version=1\r\n")) == 0 || strncmp("version=2\r\n", p, strlen("version=2\r\n")) == 0) { - return 100; + *score = 100; + return format; } } - return 0; + return format; } - return 0; + return format; } } diff --git a/block/vmdk.c b/block/vmdk.c index d22db95..1cf63b4 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -2335,7 +2335,6 @@ static QemuOptsList vmdk_create_opts = { static BlockDriver bdrv_vmdk = { .format_name = "vmdk", .instance_size = sizeof(BDRVVmdkState), - .bdrv_probe = vmdk_probe, .bdrv_open = vmdk_open, .bdrv_check = vmdk_check, .bdrv_reopen_prepare = vmdk_reopen_prepare, diff --git a/include/block/probe.h b/include/block/probe.h index 3e2e328..13df1d3 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -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 *bochs_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); @@ -25,5 +24,7 @@ const char *vdi_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); 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); #endif