From patchwork Tue Jul 5 15:24: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: 9214617 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 6C46D6048B for ; Tue, 5 Jul 2016 15:41:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BBF22624C for ; Tue, 5 Jul 2016 15:41:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E02F262F2; Tue, 5 Jul 2016 15:41:03 +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 E60F72624C for ; Tue, 5 Jul 2016 15:41:02 +0000 (UTC) Received: from localhost ([::1]:55885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKST8-0007ZL-2K for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Jul 2016 11:41:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDX-00065m-AH for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKSDU-00006G-U6 for qemu-devel@nongnu.org; Tue, 05 Jul 2016 11:24:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46040) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKSDQ-0008TP-9T; Tue, 05 Jul 2016 11:24:48 -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 E3F46C049E1B; Tue, 5 Jul 2016 15:24:47 +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 u65FOWuF006841; Tue, 5 Jul 2016 11:24:47 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Tue, 5 Jul 2016 11:24:19 -0400 Message-Id: <1467732272-23368-20-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.31]); Tue, 05 Jul 2016 15:24: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 v3 19/32] blockdev: Separate luks 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 luks probe from the crypto driver. The luks 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/crypto.c | 1 - block/probe/luks.c | 13 ++++++++----- include/block/probe.h | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index baef612..d936da1 100644 --- a/block.c +++ b/block.c @@ -63,6 +63,7 @@ typedef const char *BdrvProbeFunc(const uint8_t *buf, int buf_size, static BdrvProbeFunc *format_probes[] = { bochs_probe, cloop_probe, + block_crypto_probe_luks, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/crypto.c b/block/crypto.c index 493dd69..6f37aec 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -549,7 +549,6 @@ static int block_crypto_create_luks(const char *filename, BlockDriver bdrv_crypto_luks = { .format_name = "luks", .instance_size = sizeof(BlockCrypto), - .bdrv_probe = block_crypto_probe_luks, .bdrv_open = block_crypto_open_luks, .bdrv_close = block_crypto_close, .bdrv_create = block_crypto_create_luks, diff --git a/block/probe/luks.c b/block/probe/luks.c index 5c6427a..4c58586 100644 --- a/block/probe/luks.c +++ b/block/probe/luks.c @@ -15,9 +15,12 @@ static int block_crypto_probe_generic(QCryptoBlockFormat format, } } -int block_crypto_probe_luks(const uint8_t *buf, - int buf_size, - const char *filename) { - return block_crypto_probe_generic(Q_CRYPTO_BLOCK_FORMAT_LUKS, - buf, buf_size, filename); +const char *block_crypto_probe_luks(const uint8_t *buf, int buf_size, + const char *filename, int *score) +{ + const char *format = "luks"; + assert(score); + *score = block_crypto_probe_generic(Q_CRYPTO_BLOCK_FORMAT_LUKS, + buf, buf_size, filename); + return format; } diff --git a/include/block/probe.h b/include/block/probe.h index 804f77c..e3bf04e 100644 --- a/include/block/probe.h +++ b/include/block/probe.h @@ -1,8 +1,6 @@ #ifndef PROBE_H #define PROBE_H -int block_crypto_probe_luks(const uint8_t *buf, int buf_size, - const char *filename); int dmg_probe(const uint8_t *buf, int buf_size, const char *filename); int parallels_probe(const uint8_t *buf, int buf_size, const char *filename); int qcow_probe(const uint8_t *buf, int buf_size, const char *filename); @@ -17,5 +15,7 @@ const char *bochs_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *cloop_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *block_crypto_probe_luks(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif