From patchwork Thu Jul 14 19:03:19 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: 9230497 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 E87D860574 for ; Thu, 14 Jul 2016 19:30:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D491C27FBE for ; Thu, 14 Jul 2016 19:30:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C69BB282F5; Thu, 14 Jul 2016 19:30:26 +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 6AD1327FBE for ; Thu, 14 Jul 2016 19:30:26 +0000 (UTC) Received: from localhost ([::1]:56433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmL3-0003gp-IS for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Jul 2016 15:30:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvP-00047g-4z 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 1bNlvM-0002me-2Z for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvI-0002k4-9o; Thu, 14 Jul 2016 15:03:48 -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 B833EC05AA45; Thu, 14 Jul 2016 19:03:47 +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 u6EJ3T8k000405; Thu, 14 Jul 2016 15:03:47 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:19 -0400 Message-Id: <1468523008-30013-24-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.32]); Thu, 14 Jul 2016 19:03:47 +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 23/32] blockdev: Separate qcow2 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 qcow2 probe from the qcow2 driver. The qcow2 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/qcow2-probe.c | 16 +++++++++++----- block/qcow2.c | 1 - include/block/probe.h | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index f531ad0..145be9b 100644 --- a/block.c +++ b/block.c @@ -67,6 +67,7 @@ static BdrvProbeFunc *format_probes[] = { bdrv_dmg_probe, bdrv_parallels_probe, bdrv_qcow_probe, + bdrv_qcow2_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/qcow2-probe.c b/block/qcow2-probe.c index e5cd92c..b7a73c5 100644 --- a/block/qcow2-probe.c +++ b/block/qcow2-probe.c @@ -3,14 +3,20 @@ #include "block/probe.h" #include "qcow2.h" -int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *bdrv_qcow2_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score) { + const char *format = "qcow2"; const QCowHeader *cow_header = (const void *)buf; + assert(score); if (buf_size >= sizeof(QCowHeader) && be32_to_cpu(cow_header->magic) == QCOW_MAGIC && - be32_to_cpu(cow_header->version) >= 2) - return 100; - else - return 0; + be32_to_cpu(cow_header->version) >= 2) { + *score = 100; + return format; + } + + *score = 0; + return format; } diff --git a/block/qcow2.c b/block/qcow2.c index 17521f7..2f575d1 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3382,7 +3382,6 @@ static QemuOptsList qcow2_create_opts = { BlockDriver bdrv_qcow2 = { .format_name = "qcow2", .instance_size = sizeof(BDRVQcow2State), - .bdrv_probe = qcow2_probe, .bdrv_open = qcow2_open, .bdrv_close = qcow2_close, .bdrv_reopen_prepare = qcow2_reopen_prepare, diff --git a/include/block/probe.h b/include/block/probe.h index e670341..1a68cef 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,7 +1,6 @@ #ifndef PROBE_H #define PROBE_H -int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename); int bdrv_qed_probe(const uint8_t *buf, int buf_size, const char *filename); int raw_probe(const uint8_t *buf, int buf_size, const char *filename); int vdi_probe(const uint8_t *buf, int buf_size, const char *filename); @@ -20,5 +19,7 @@ const char *bdrv_parallels_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *bdrv_qcow_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *bdrv_qcow2_probe(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif