From nobody Mon Feb 9 12:09:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1617796155; cv=none; d=zohomail.com; s=zohoarc; b=Oja7dltdBJjqiBx7AdaA1IYvwZeYRC+nVFgdMQchVSjlgj5WhhFFXHIDa3/+ZYxVZ1fIdcWpzfh/s5RYRd7d1fmBX5pg+vBhMicr/6WfzQSI1ZaxBJa31Jz4RonIycNz7G/elUBehJcQ0e0xNOissnncCzwF4wzHRoyAFiP6Xtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617796155; 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=IQyuotpFnvx3a4m9KtsiXd6VCS7IHM1WN4xLTpog1vI=; b=Jsj+AxTjfq/sXiZ8wSZq7Jq5Dt3kzYJbjGLmf7niYWjZ5C6wVGTLB+laotEHXD5HHT9ieiKSQXJHQCOtqqbpFZJmnzRDfzrSZ6pO8HNfJoZSJHWfHzPnv0OCz9JjsNlgm6xZJguUAqAq7uSnx47dhhNo5DJaUVg/Vn5SRNYgCec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1617796155721604.7280452080903; Wed, 7 Apr 2021 04:49:15 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-351-i7WG4pMROQyCYGBEBADs_g-1; Wed, 07 Apr 2021 07:49:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 134AA10168CE; Wed, 7 Apr 2021 11:49:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A68AF5FCB5; Wed, 7 Apr 2021 11:49:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5D1FC55344; Wed, 7 Apr 2021 11:49:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 137Bmr1l006802 for ; Wed, 7 Apr 2021 07:48:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEF8A14108; Wed, 7 Apr 2021 11:48:53 +0000 (UTC) Received: from work.redhat.com (ovpn-113-23.ams2.redhat.com [10.36.113.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0032B608BA; Wed, 7 Apr 2021 11:48:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617796154; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IQyuotpFnvx3a4m9KtsiXd6VCS7IHM1WN4xLTpog1vI=; b=QxmCo+lf+b0Wu6PR/soa3Z8RcCwHh8TiDrBgdL03Xnwu2qI5AePyAbUsDD4fmW6E9S5S2n ytnNzyDfxqja4pC82bmJ0J3ZNvpxl6zAWKO0BECfeBvCeQeWWH4qZrb6ktQbFfaFmHhyqo g12dZcTSYd/QlMCQgAlX+B2+WxHq9jo= X-MC-Unique: i7WG4pMROQyCYGBEBADs_g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/14] conf: Use virTristateXXX in virDomainLoaderDef Date: Wed, 7 Apr 2021 13:48:37 +0200 Message-Id: <20210407114841.85009-11-twiederh@redhat.com> In-Reply-To: <20210407114841.85009-1-twiederh@redhat.com> References: <20210407114841.85009-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 26 ++++++++++++++++---------- src/conf/domain_conf.h | 4 ++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 313d7fd291..24d124158e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19209,18 +19209,24 @@ virDomainLoaderDefParseXML(xmlNodePtr node, VIR_FREE(loader->path); } =20 - if (readonly_str && - (loader->readonly =3D virTristateBoolTypeFromString(readonly_str))= <=3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("unknown readonly value: %s"), readonly_str); - return -1; + if (readonly_str) { + int value; + if ((value =3D virTristateBoolTypeFromString(readonly_str)) <=3D 0= ) { + virReportError(VIR_ERR_XML_DETAIL, + _("unknown readonly value: %s"), readonly_str); + return -1; + } + loader->readonly =3D value; } =20 - if (secure_str && - (loader->secure =3D virTristateBoolTypeFromString(secure_str)) <= =3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("unknown secure value: %s"), secure_str); - return -1; + if (secure_str) { + int value; + if ((value =3D virTristateBoolTypeFromString(secure_str)) <=3D 0) { + virReportError(VIR_ERR_XML_DETAIL, + _("unknown secure value: %s"), secure_str); + return -1; + } + loader->secure =3D value; } =20 if (type_str) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cdf3e2ed8e..b2e14ba2e1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2153,9 +2153,9 @@ VIR_ENUM_DECL(virDomainLoader); =20 struct _virDomainLoaderDef { char *path; - int readonly; /* enum virTristateBool */ + virTristateBool readonly; virDomainLoader type; - int secure; /* enum virTristateBool */ + virTristateBool secure; char *nvram; /* path to non-volatile RAM */ char *templt; /* user override of path to master nvram */ }; --=20 2.26.2