From nobody Sun Feb 8 21:56:52 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=1654850598; cv=none; d=zohomail.com; s=zohoarc; b=NRiFq0xy8T0V+W+lAz4lE4RqvynoExiywjp43ZzH1AJTtxSjywEEnOWvx3pTbS94SATooxH8cXpYeE7rbt//FlhlIAwpASsDyYZ3fD3zZcCf6HbjRtflmOlqdh+hy8NXJV5FTL9rCfcCUn0nTLDaRwjkbpUS7C9Wd5OO4RhXCzg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654850598; 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=hxrc86jXbVQgDkHASW2mS0geDNBpwA4k9kRjGXan3S0=; b=cO+pGYD5BnOPuDCCUVvaKO5Ei8EshTRorhX44SZ7vLdYPMWycUO+goYWF7uQKutTonspphwT6tcBk/Q6CQJiVLddXR1JT1mnjoSv7JrVqkG06V7WnlTUyLkfFbkmKQ3/QFDeZCOHQSwaow4IH3vjtOsmQMSjxEUE90kOM0G4ZvQ= 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 16548505985951005.9200474949517; Fri, 10 Jun 2022 01:43:18 -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-658-tD78WED7PL2vU4VWQUPmDg-1; Fri, 10 Jun 2022 04:43:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 73570101A54E; Fri, 10 Jun 2022 08:43:02 +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 7E84A1415100; Fri, 10 Jun 2022 08:43:00 +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 EB1C31947041; Fri, 10 Jun 2022 08:42:59 +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 E4A171947040 for ; Fri, 10 Jun 2022 08:42:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C996BC28117; Fri, 10 Jun 2022 08:42:58 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5A1D8C28112 for ; Fri, 10 Jun 2022 08:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654850597; 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=hxrc86jXbVQgDkHASW2mS0geDNBpwA4k9kRjGXan3S0=; b=DucCuICDVKAQbLuQ4cEpEw7x7lWl8Ir0EXgVt5lU0F4US+2b9XXIGrapF1LRaIoWVXtRrT mLB+vmNw2y8Q+R03VJVolDimeGxlOVGRcWGpuG5x4vErAQE3gU9zTKGvutOX43HKyfABuR SMIaD2qIsaS7w4L2FONcoNgkCtrqUoI= X-MC-Unique: tD78WED7PL2vU4VWQUPmDg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] vmx: Declare support for firmware autoselection Date: Fri, 10 Jun 2022 10:42:53 +0200 Message-Id: <20220610084255.764281-2-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.7 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: 1654850599670100001 Content-Type: text/plain; charset="utf-8" The feature was implemented in commits b4e34d1083bc and 9bb6e4e739fa but the corresponding feature flag was not set in the driver, so other parts of of libvirt wouldn't be able to know about it. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- src/vmx/vmx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c391caa910..57a1622445 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -639,6 +639,7 @@ static virDomainDefParserConfig virVMXDomainDefParserCo= nfig =3D { .domainPostParseCallback =3D virVMXDomainDefPostParse, .features =3D (VIR_DOMAIN_DEF_FEATURE_WIDE_SCSI | VIR_DOMAIN_DEF_FEATURE_NAME_SLASH | + VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT | VIR_DOMAIN_DEF_FEATURE_NO_BOOT_ORDER), .defArch =3D VIR_ARCH_I686, }; --=20 2.35.3 From nobody Sun Feb 8 21:56:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1654850601; cv=none; d=zohomail.com; s=zohoarc; b=H0Me3k3NRGuKgpgL0UpKXK988gMYMR6Wb7NsrAS5M3mPLcis426/uBQD3ahkQuEzY07gmh4mYKFDw1lMbyixI47RaiICGRaxH7/2sfaF6jxwCGQPqptTkr1Og23pzZ3QvlPVdPAOXdlz3nhS67fMAqEMCjVreJzK6arzxMUayK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654850601; 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=Ofih975QJav+red1fhse7lRcu/Xa//W07XAp1Xfg3rs=; b=ScTo69czDZCDi445CaQ16vDDo39l9LKEqnwC3Wj6JgAgNKARgewf2GAHrApJ1oupKl/Wgr0F9+OUP+BPLHkhjNTpXdhr93AR/HeW0GLLc032xuFKLYd5KwFkABOa2BnwheouEcc+TpK9bA3TxPo0TxOSFCktH9zj/uUo9+4wuhM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1654850601888313.0438604205557; Fri, 10 Jun 2022 01:43:21 -0700 (PDT) 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-658-AiaQUAK5OliHHsreWkYNtw-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 75CDA3801155; Fri, 10 Jun 2022 08:43:02 +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 05498C28112; 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 3B53119466DF; Fri, 10 Jun 2022 08:43:01 +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 A01911947041 for ; Fri, 10 Jun 2022 08:42:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8D61FC28117; Fri, 10 Jun 2022 08:42:59 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1E852C28112 for ; Fri, 10 Jun 2022 08:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654850600; 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=Ofih975QJav+red1fhse7lRcu/Xa//W07XAp1Xfg3rs=; b=UFX84Bznl8eIBvmwATwtqpfEY9/HZmnqrsMMU17joFth2fNVI+KYeR/YdJwYVix32kO4dq GVxQek2X7xMt/9praT/O3b8CEXX102v6dqbdx2XlZTGxlu5EHVFOg9USCH0DhiymFlMZMo UiVQN7lgbNAOBpY2fkoSY7B+Fbk08hA= X-MC-Unique: AiaQUAK5OliHHsreWkYNtw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] conf: Fix virDomainDefOSValidate() Date: Fri, 10 Jun 2022 10:42:54 +0200 Message-Id: <20220610084255.764281-3-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: 1654850603690100001 Content-Type: text/plain; charset="utf-8" Even when the os.loader element is absent, we still have to validate that the user is not attempting to use firmware autoselection with a driver that doesn't implement the feature. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_validate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index f3910f08a4..61d4586580 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1586,9 +1586,6 @@ static int virDomainDefOSValidate(const virDomainDef *def, virDomainXMLOption *xmlopt) { - if (!def->os.loader) - return 0; - if (def->os.firmware && !(xmlopt->config.features & VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT))= { virReportError(VIR_ERR_XML_DETAIL, "%s", @@ -1596,6 +1593,9 @@ virDomainDefOSValidate(const virDomainDef *def, return -1; } =20 + if (!def->os.loader) + return 0; + if (!def->os.loader->path && def->os.firmware =3D=3D VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) { virReportError(VIR_ERR_XML_DETAIL, "%s", --=20 2.35.3 From nobody Sun Feb 8 21:56:52 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 Reviewed-by: J=C3=A1n Tomko --- 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