From nobody Mon Feb 9 15:11:21 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=1616161385; cv=none; d=zohomail.com; s=zohoarc; b=nVdl+AgK6vpKvdL4VztES7sxNUz4wYMCTQyft9/Eqen8ZU3C0XM6YJmvuqkmdLvzEf7ci7cbvLnezPt7W4RG8xcXM2FmpMNmjG1liSQwdXEsMT8YircSeW9ixLa/z3CVztJ/+7RzeoNHsQGw9BrFk+dIMgjKUGNeXrQkpQwQ+aQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161385; 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=9/SjquvNsQh+39dddFA/3MYsm/3PnlETqfBsqYEnB2E=; b=AknXQ/da0GJNsrkh6U9w5PAu0Q/doRjZh1IUZEyyapDs2Fb0fhonXNRbSgfSo4dTA+jANpGUO+FkooTx6giv2EPs9cM5+xemOtLvsJ0ntZrtAf9aSjECeilFM3Pde2nza0OyJfC91+AngPjYggFZtBU1L3OzkYuH0CDIwEFasLs= 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) header.from= 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 1616161385791355.19016246200033; Fri, 19 Mar 2021 06:43:05 -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-120-T78HBsiMNTe5L5KZ9tP6pQ-1; Fri, 19 Mar 2021 09:42:57 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46F75881287; Fri, 19 Mar 2021 13:42:51 +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 1EB8B5D6D5; Fri, 19 Mar 2021 13:42:51 +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 CB75F5005D; Fri, 19 Mar 2021 13:42:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgkFg020710 for ; Fri, 19 Mar 2021 09:42:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 67ECC2BFE2; Fri, 19 Mar 2021 13:42:46 +0000 (UTC) Received: from work.redhat.com (ovpn-112-175.ams2.redhat.com [10.36.112.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADE7259448; Fri, 19 Mar 2021 13:42:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161384; 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=9/SjquvNsQh+39dddFA/3MYsm/3PnlETqfBsqYEnB2E=; b=FRd4XSGiUSLEXLlSiYEvxY0j3PMhl0Z6noZLFLenWqz8rNRZg8JuC/35D9ZekSV1TIBLZ8 euigGrT9zt0jzVlw3JQwizi9Q4bxkUU1xsdPgeaxAobY0pai0lN7lA6tSAawqqIgWqPZ7z kMEyzoVffxJ6VlfoZENN5Ai83lRmPNY= X-MC-Unique: T78HBsiMNTe5L5KZ9tP6pQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 43/51] domain_conf: Use virXMLPropTristateXXX in virDomainLoaderDefParseXML Date: Fri, 19 Mar 2021 14:40:57 +0100 Message-Id: <20210319134105.442774-44-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.15 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 | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 83fc12c41b..6c4595fd20 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18713,14 +18713,12 @@ virDomainLoaderDefParseXML(xmlNodePtr node, virDomainLoaderDefPtr loader, bool fwAutoSelect) { - g_autofree char *readonly_str =3D NULL; - g_autofree char *secure_str =3D NULL; g_autofree char *type_str =3D NULL; =20 - secure_str =3D virXMLPropString(node, "secure"); - if (!fwAutoSelect) { - readonly_str =3D virXMLPropString(node, "readonly"); + if (virXMLPropTristateBool(node, "readonly", false, &loader->reado= nly) < 0) + return -1; + type_str =3D virXMLPropString(node, "type"); if (!(loader->path =3D virXMLNodeContentString(node))) return -1; @@ -18729,19 +18727,8 @@ 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); + if (virXMLPropTristateBool(node, "secure", false, &loader->secure) < 0) return -1; - } - - if (secure_str && - (loader->secure =3D virTristateBoolTypeFromString(secure_str)) <= =3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("unknown secure value: %s"), secure_str); - return -1; - } =20 if (type_str) { int type; --=20 2.26.2