From nobody Mon Feb 9 02:14:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1666075812; cv=none; d=zohomail.com; s=zohoarc; b=DLWQc2LltIpaBd3nNMUVXyVMZF2i8P9QzRO4fRpmaGmlkcgwyq52xx1bEkdVIOpXvmKrWFyokB73xsA81hg3e1dapj3ExHov20hYNWp/I8sCHp879ge0cLcI3UI0zjtcR7CiNatHIpf11SWx3WPdwJEChaAzBG7Q5uTIFjblRGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666075812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oMtVftS2fo3OZSvNZd5ws830B1BwQXfiNs87FTXENQU=; b=EndahdLPlZn8DC+KIBKw8KFfXFio95IJyTnFllL7y8PV3gXjQzmUV3AxiSJ96cCXEnV72wY6WaTquEKJIi05eImgKVT7HbKA5kXI+PqYfs6hi3YZtRBJV5SDt2/5V6vjG9wGKsHHyzHbmyi0FaL+F4T8QSH5ZtWfalPiLUzWPNE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1666075812058270.8301411382747; Mon, 17 Oct 2022 23:50:12 -0700 (PDT) Received: from localhost ([::1]:49226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okgQU-0007bP-Hh for importer@patchew.org; Tue, 18 Oct 2022 02:50:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okg6D-0005gY-3V for qemu-devel@nongnu.org; Tue, 18 Oct 2022 02:29:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:57615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okg64-0001FN-JE for qemu-devel@nongnu.org; Tue, 18 Oct 2022 02:29:09 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-657-i7thtupgNT-iSWfc_ao4Cg-1; Tue, 18 Oct 2022 02:28:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C96801C0879F; Tue, 18 Oct 2022 06:28:51 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A0054081B92; Tue, 18 Oct 2022 06:28:51 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 40D4121E668A; Tue, 18 Oct 2022 08:28:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666074535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oMtVftS2fo3OZSvNZd5ws830B1BwQXfiNs87FTXENQU=; b=hKVwyoRG4TssSOC6KJPV4/0hN8amDJd/Wdg8iiEfJf17lyXSvhCGRqf1gTD9LyTNBl/DW/ 1VLS1vWIlsMrOI5YQMTG6rZiGZAmlYZ7T1hCmn3eqSo9WZofeIXo6hOnn30w0zEConpbZa xCf8wScaPCEwZv6i0osSOCF3LjWaP18= X-MC-Unique: i7thtupgNT-iSWfc_ao4Cg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, jsnow@redhat.com, eblake@redhat.com, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 10/28] qapi crypto: Elide redundant has_FOO in generated C Date: Tue, 18 Oct 2022 08:28:31 +0200 Message-Id: <20221018062849.3420573-11-armbru@redhat.com> In-Reply-To: <20221018062849.3420573-1-armbru@redhat.com> References: <20221018062849.3420573-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666075813141100001 The has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/crypto.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: Daniel P. Berrang=C3=A9" Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- crypto/block-luks.c | 16 ++++++++-------- tests/unit/test-crypto-block.c | 6 ------ scripts/qapi/schema.py | 1 - 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/crypto/block-luks.c b/crypto/block-luks.c index f62be6836b..4205bc491e 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -1629,13 +1629,13 @@ qcrypto_block_luks_amend_add_keyslot(QCryptoBlock *= block, g_autofree char *new_password =3D NULL; g_autofree uint8_t *master_key =3D NULL; =20 - char *secret =3D opts_luks->has_secret ? opts_luks->secret : luks->sec= ret; + char *secret =3D opts_luks->secret ?: luks->secret; =20 - if (!opts_luks->has_new_secret) { + if (!opts_luks->new_secret) { error_setg(errp, "'new-secret' is required to activate a keyslot"); return -1; } - if (opts_luks->has_old_secret) { + if (opts_luks->old_secret) { error_setg(errp, "'old-secret' must not be given when activating keyslot= s"); return -1; @@ -1709,7 +1709,7 @@ qcrypto_block_luks_amend_erase_keyslots(QCryptoBlock = *block, g_autofree uint8_t *tmpkey =3D NULL; g_autofree char *old_password =3D NULL; =20 - if (opts_luks->has_new_secret) { + if (opts_luks->new_secret) { error_setg(errp, "'new-secret' must not be given when erasing keyslots"); return -1; @@ -1719,14 +1719,14 @@ qcrypto_block_luks_amend_erase_keyslots(QCryptoBloc= k *block, "'iter-time' must not be given when erasing keyslots"); return -1; } - if (opts_luks->has_secret) { + if (opts_luks->secret) { error_setg(errp, "'secret' must not be given when erasing keyslots"); return -1; } =20 /* Load the old password if given */ - if (opts_luks->has_old_secret) { + if (opts_luks->old_secret) { old_password =3D qcrypto_secret_lookup_as_utf8(opts_luks->old_secr= et, errp); if (!old_password) { @@ -1751,7 +1751,7 @@ qcrypto_block_luks_amend_erase_keyslots(QCryptoBlock = *block, return -1; } =20 - if (opts_luks->has_old_secret) { + if (opts_luks->old_secret) { int rv =3D qcrypto_block_luks_load_key(block, keyslot, old_password, @@ -1793,7 +1793,7 @@ qcrypto_block_luks_amend_erase_keyslots(QCryptoBlock = *block, } =20 /* Erase all keyslots that match the given old password */ - } else if (opts_luks->has_old_secret) { + } else if (opts_luks->old_secret) { =20 unsigned long slots_to_erase_bitmap =3D 0; size_t i; diff --git a/tests/unit/test-crypto-block.c b/tests/unit/test-crypto-block.c index 3417b67be5..6bef471afb 100644 --- a/tests/unit/test-crypto-block.c +++ b/tests/unit/test-crypto-block.c @@ -39,7 +39,6 @@ static QCryptoBlockCreateOptions qcow_create_opts =3D { .format =3D Q_CRYPTO_BLOCK_FORMAT_QCOW, .u.qcow =3D { - .has_key_secret =3D true, .key_secret =3D (char *)"sec0", }, }; @@ -47,7 +46,6 @@ static QCryptoBlockCreateOptions qcow_create_opts =3D { static QCryptoBlockOpenOptions qcow_open_opts =3D { .format =3D Q_CRYPTO_BLOCK_FORMAT_QCOW, .u.qcow =3D { - .has_key_secret =3D true, .key_secret =3D (char *)"sec0", }, }; @@ -57,7 +55,6 @@ static QCryptoBlockOpenOptions qcow_open_opts =3D { static QCryptoBlockOpenOptions luks_open_opts =3D { .format =3D Q_CRYPTO_BLOCK_FORMAT_LUKS, .u.luks =3D { - .has_key_secret =3D true, .key_secret =3D (char *)"sec0", }, }; @@ -67,7 +64,6 @@ static QCryptoBlockOpenOptions luks_open_opts =3D { static QCryptoBlockCreateOptions luks_create_opts_default =3D { .format =3D Q_CRYPTO_BLOCK_FORMAT_LUKS, .u.luks =3D { - .has_key_secret =3D true, .key_secret =3D (char *)"sec0", }, }; @@ -77,7 +73,6 @@ static QCryptoBlockCreateOptions luks_create_opts_default= =3D { static QCryptoBlockCreateOptions luks_create_opts_aes256_cbc_plain64 =3D { .format =3D Q_CRYPTO_BLOCK_FORMAT_LUKS, .u.luks =3D { - .has_key_secret =3D true, .key_secret =3D (char *)"sec0", .has_cipher_alg =3D true, .cipher_alg =3D QCRYPTO_CIPHER_ALG_AES_256, @@ -92,7 +87,6 @@ static QCryptoBlockCreateOptions luks_create_opts_aes256_= cbc_plain64 =3D { static QCryptoBlockCreateOptions luks_create_opts_aes256_cbc_essiv =3D { .format =3D Q_CRYPTO_BLOCK_FORMAT_LUKS, .u.luks =3D { - .has_key_secret =3D true, .key_secret =3D (char *)"sec0", .has_cipher_alg =3D true, .cipher_alg =3D QCRYPTO_CIPHER_ALG_AES_256, diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 707c671133..21d0b28790 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chu= nks opt_out =3D [ - 'qapi/crypto.json', 'qapi/dump.json', 'qapi/job.json', 'qapi/machine.json', --=20 2.37.2