From patchwork Thu Jul 14 19:03:23 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: 9230467 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 91F106075D for ; Thu, 14 Jul 2016 19:14:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8113024B5E for ; Thu, 14 Jul 2016 19:14:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7599C26D08; Thu, 14 Jul 2016 19:14:39 +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 1337A24B5E for ; Thu, 14 Jul 2016 19:14:39 +0000 (UTC) Received: from localhost ([::1]:56326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNm5l-0000Sc-Qm for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:14:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvY-0004FF-20 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 1bNlvS-0002qK-V4 for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:04:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52240) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvL-0002lu-24; Thu, 14 Jul 2016 15:03:51 -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 A67E3C049D52; 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 u6EJ3T8o000405; Thu, 14 Jul 2016 15:03:50 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:23 -0400 Message-Id: <1468523008-30013-28-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.31]); 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 27/32] blockdev: Separate vhdx 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 vhdx probe from the vhdx driver. The vhdx 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/vhdx-probe.c | 12 +++++++++--- block/vhdx.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index a1a0b50..941e208 100644 --- a/block.c +++ b/block.c @@ -71,6 +71,7 @@ static BdrvProbeFunc *format_probes[] = { bdrv_qed_probe, bdrv_raw_probe, bdrv_vdi_probe, + bdrv_vhdx_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/vhdx-probe.c b/block/vhdx-probe.c index 6c38aac..d907d6b 100644 --- a/block/vhdx-probe.c +++ b/block/vhdx-probe.c @@ -12,10 +12,16 @@ * * Therefore, we probe by looking for the vhdxfile signature "vhdxfile" */ -int vhdx_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *bdrv_vhdx_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score) { + const char *format = "vhdx"; + assert(score); + if (buf_size >= 8 && !memcmp(buf, "vhdxfile", 8)) { - return 100; + *score = 100; + return format; } - return 0; + *score = 0; + return format; } diff --git a/block/vhdx.c b/block/vhdx.c index 2f13c61..852ef5c 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -1951,7 +1951,6 @@ static QemuOptsList vhdx_create_opts = { static BlockDriver bdrv_vhdx = { .format_name = "vhdx", .instance_size = sizeof(BDRVVHDXState), - .bdrv_probe = vhdx_probe, .bdrv_open = vhdx_open, .bdrv_close = vhdx_close, .bdrv_reopen_prepare = vhdx_reopen_prepare, diff --git a/include/block/probe.h b/include/block/probe.h index 86d48e2..b7eb00e 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -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); const char *bdrv_bochs_probe(const uint8_t *buf, int buf_size, @@ -24,5 +23,7 @@ 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); +const char *bdrv_vhdx_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif