From patchwork Thu Jul 14 19:03:15 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: 648556 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rr5G31Thzz9sCZ for ; Fri, 15 Jul 2016 05:23:23 +1000 (AEST) Received: from localhost ([::1]:56382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNmED-0001q3-3q for incoming@patchwork.ozlabs.org; Thu, 14 Jul 2016 15:23:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvL-00041R-0n for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNlvI-0002ke-U5 for qemu-devel@nongnu.org; Thu, 14 Jul 2016 15:03:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNlvF-0002iH-8J; Thu, 14 Jul 2016 15:03:45 -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 C659875F01; Thu, 14 Jul 2016 19:03:44 +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 u6EJ3T8g000405; Thu, 14 Jul 2016 15:03:44 -0400 From: Colin Lord To: qemu-devel@nongnu.org Date: Thu, 14 Jul 2016 15:03:15 -0400 Message-Id: <1468523008-30013-20-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.27]); Thu, 14 Jul 2016 19:03:44 +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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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-probe.c | 13 ++++++++----- block/crypto.c | 1 - include/block/probe.h | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index 8d21f87..6a144cc 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[] = { bdrv_bochs_probe, bdrv_cloop_probe, + bdrv_crypto_probe_luks, }; static QTAILQ_HEAD(, BlockDriverState) graph_bdrv_states = diff --git a/block/crypto-probe.c b/block/crypto-probe.c index 5c6427a..b372613 100644 --- a/block/crypto-probe.c +++ b/block/crypto-probe.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 *bdrv_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/block/crypto.c b/block/crypto.c index 5706ba6..bba350e 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -547,7 +547,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/include/block/probe.h b/include/block/probe.h index e434af5..b15dd91 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 *bdrv_bochs_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); const char *bdrv_cloop_probe(const uint8_t *buf, int buf_size, const char *filename, int *score); +const char *bdrv_crypto_probe_luks(const uint8_t *buf, int buf_size, + const char *filename, int *score); #endif