From nobody Tue Feb 10 03:45:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654850590; cv=none; d=zohomail.com; s=zohoarc; b=eNA9QzPi2k/e/lTqvm6sE3cGtI8lifsykng5CVrWB50rNDt1cqjtyOK1K4BQMnWli7H0AtsIJo8gUj2gekR03AtHwyqFrMla0X0I3JkzG8YgAEf6gBDFfFgXAEZ3tTrkfkLHYiT8fDW0+vIS75UBtobUB8r+byYlXcExU96B84w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654850590; h=Content-Type:Content-Transfer-Encoding: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=6z5PisNQcjKc516fsO7bIO/rjxtazGtXUzvsjz8F+f4=; b=Ie1/YsUxagSvl8LY7KiFSgcYqq99uvsv7e2ficYJhDRBYeGVeZRnQ+vC1olB9pucqCkD4+oF+g40nuaK2ao5wrnbFmdnqKSIE1YxxhOEsX/qsa6XWykRZHPM41jQ3PqcHHBDE3A07BqSqDeQP+Uk06/gRjNzeRk9l/l8GTcgWiM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1654850590201261.32384321516804; Fri, 10 Jun 2022 01:43:10 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-654-DuyYAdnSNdKdQJAD8qDQFQ-1; Fri, 10 Jun 2022 04:43:05 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 00C4D94AF44; Fri, 10 Jun 2022 08:43:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0FC3C28117; Fri, 10 Jun 2022 08:43:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 62905194704C; Fri, 10 Jun 2022 08:43:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7E0E1194704D for ; Fri, 10 Jun 2022 08:43:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 51BA8C28112; Fri, 10 Jun 2022 08:43:00 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D658AC28117 for ; Fri, 10 Jun 2022 08:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654850588; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6z5PisNQcjKc516fsO7bIO/rjxtazGtXUzvsjz8F+f4=; b=Dc8wukCN1bOKEr7ycjPiO3Ze4OD1rKFK+C84Jf63FyixrxfclEraKK1Mm5udlFs8iplGhY TLYipx81ol8KuqoJUilqSyZTPwNeRKGkQh0Uf/nrCyZPaIW7m5hrim9bo4D4hFNZNc5ugl 460eMsO0DH2yz0TznYoxaNQYcP7YthI= X-MC-Unique: DuyYAdnSNdKdQJAD8qDQFQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] qemu: Simplify handling of virTristateBool values Date: Fri, 10 Jun 2022 10:42:55 +0200 Message-Id: <20220610084255.764281-4-abologna@redhat.com> In-Reply-To: <20220610084255.764281-1-abologna@redhat.com> References: <20220610084255.764281-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654850591640100001 Content-Type: text/plain; charset="utf-8" We explicitly check whether the value is YES or NO, which makes it unnecessary to make sure it's not ABSENT beforehand. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_firmware.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c index 51223faadf..e459ed9a6c 100644 --- a/src/qemu/qemu_firmware.c +++ b/src/qemu/qemu_firmware.c @@ -1081,31 +1081,25 @@ qemuFirmwareMatchDomain(const virDomainDef *def, =20 if (def->os.firmwareFeatures) { reqSecureBoot =3D def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIRMW= ARE_FEATURE_SECURE_BOOT]; - if (reqSecureBoot !=3D VIR_TRISTATE_BOOL_ABSENT) { - if (reqSecureBoot =3D=3D VIR_TRISTATE_BOOL_YES && !supportsSec= ureBoot) { - VIR_DEBUG("User requested Secure Boot, firmware '%s' doesn= 't support it", - path); - return false; - } - - if (reqSecureBoot =3D=3D VIR_TRISTATE_BOOL_NO && supportsSecur= eBoot) { - VIR_DEBUG("User refused Secure Boot, firmware '%s' support= s it", path); - return false; - } + if (reqSecureBoot =3D=3D VIR_TRISTATE_BOOL_YES && !supportsSecureB= oot) { + VIR_DEBUG("User requested Secure Boot, firmware '%s' doesn't s= upport it", + path); + return false; + } + if (reqSecureBoot =3D=3D VIR_TRISTATE_BOOL_NO && supportsSecureBoo= t) { + VIR_DEBUG("User refused Secure Boot, firmware '%s' supports it= ", path); + return false; } =20 reqEnrolledKeys =3D def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIR= MWARE_FEATURE_ENROLLED_KEYS]; - if (reqEnrolledKeys !=3D VIR_TRISTATE_BOOL_ABSENT) { - if (reqEnrolledKeys =3D=3D VIR_TRISTATE_BOOL_YES && !hasEnroll= edKeys) { - VIR_DEBUG("User requested Enrolled keys, firmware '%s' doe= sn't have them", - path); - return false; - } - - if (reqEnrolledKeys =3D=3D VIR_TRISTATE_BOOL_NO && hasEnrolled= Keys) { - VIR_DEBUG("User refused Enrolled keys, firmware '%s' has t= hem", path); - return false; - } + if (reqEnrolledKeys =3D=3D VIR_TRISTATE_BOOL_YES && !hasEnrolledKe= ys) { + VIR_DEBUG("User requested Enrolled keys, firmware '%s' doesn't= have them", + path); + return false; + } + if (reqEnrolledKeys =3D=3D VIR_TRISTATE_BOOL_NO && hasEnrolledKeys= ) { + VIR_DEBUG("User refused Enrolled keys, firmware '%s' has them"= , path); + return false; } } =20 --=20 2.35.3