From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKNvj-0006hk-SH for qemu-devel@nongnu.org; Tue, 05 Jul 2016 06:50:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKNvh-0003j3-SM for qemu-devel@nongnu.org; Tue, 05 Jul 2016 06:50:14 -0400 From: "Daniel P. Berrange" Date: Tue, 5 Jul 2016 11:50:00 +0100 Message-Id: <1467715800-20379-3-git-send-email-berrange@redhat.com> In-Reply-To: <1467715800-20379-1-git-send-email-berrange@redhat.com> References: <1467715800-20379-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v1 2/2] Revert "block: don't register quorum driver if SHA256 support is unavailable" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Alberto Garcia , Kevin Wolf , Fam Zheng , Max Reitz , "Daniel P. Berrange" The qcrypto hash APIs now guarantee that sha256 is available at compile time, so skipping registration is rarely needed. A check at time of open is kept to ensure good error reporting in the (unlikely) case sha256 is runtime disabled. This reverts commit e94867ed5f241008d0f53142b2704a075f9ed505. --- block/quorum.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/block/quorum.c b/block/quorum.c index 331b726..ed02cce 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -878,6 +878,12 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags, int i; int ret = 0; + if (!qcrypto_hash_supports(QCRYPTO_HASH_ALG_SHA256)) { + error_setg(errp, + "SHA256 hash support is required for quorum device"); + return -EINVAL; + } + qdict_flatten(options); /* count how many different children are present */ @@ -1113,10 +1119,6 @@ static BlockDriver bdrv_quorum = { static void bdrv_quorum_init(void) { - if (!qcrypto_hash_supports(QCRYPTO_HASH_ALG_SHA256)) { - /* SHA256 hash support is required for quorum device */ - return; - } bdrv_register(&bdrv_quorum); } -- 2.7.4