From patchwork Tue Jul 5 15:24: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: 9214653 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 D608F6048B for ; Tue, 5 Jul 2016 15:52:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7AB5265F9 for ; Tue, 5 Jul 2016 15:52:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC41826785; Tue, 5 Jul 2016 15:52:56 +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 63AC6265F9 for ; Tue, 5 Jul 2016 15:52:56 +0000 (UTC) Received: from localhost ([::1]:55958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSec-00027h-Fx for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:52:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDb-0006Cn-He 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-00009q-FV for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDT-0008WR-7b; Tue, 05 Jul 2016 11:24:51 -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 D624B3B71B; Tue, 5 Jul 2016 15:24:50 +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 u65FOWuJ006841; Tue, 5 Jul 2016 11:24:50 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:23 -0400 Message-Id: <1467732272-23368-24-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.30]); Tue, 05 Jul 2016 15:24: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 v3 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/probe/qcow2.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 236e562..b4e347a 100644 --- a/block.c +++ b/block.c @@ -67,6 +67,7 @@ static BdrvProbeFunc *format_probes[] = { dmg_probe, parallels_probe, qcow_probe, + qcow2_probe, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/probe/qcow2.c b/block/probe/qcow2.c index 56f4e82..bd351e0 100644 --- a/block/probe/qcow2.c +++ b/block/probe/qcow2.c @@ -3,14 +3,20 @@ #include "block/probe.h" #include "block/qcow2.h" -int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename) +const char *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 55639eb..bc2da36 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3336,7 +3336,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 3aeab2d..222185b 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 *parallels_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *qcow_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *qcow2_probe(const uint8_t *buf, int buf_size, const char *filename, + int *score); #endif