From nobody Sat Feb 7 07:12:06 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=1619012050; cv=none; d=zohomail.com; s=zohoarc; b=cKUk5RSYEZPKVubq/a0+xeUfwylo+PK6s0YrUwPNyQ/L1gMYeMFVf0lPZtsLA+7XWgHq2k8mivMep8ThN3xV22UK0taoLRbrtp70j1TfNF81AbaKZ67IqU1EtJmCPdNNaIIVmDyZRyBqLtrBCmLGvynHi8lnR/X976EhuoalIW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619012050; 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=s3oVEqh/OCQqbjBRdu8YosnNoFoNhu1qeacOWn0UZk8=; b=QAR01J9mOlj5alzFcMXT9QdOPhCdRAXBTDtyIUWWZNMwBV3mJCyoA6fT3xy0nlBBAQ18+xBxRCykRkm+ZmLQ9kvjTbBlTnwoxy4F2FbmxVorpoXp6jSRoyAHx00x7u5YdLTazFwJVYOXYbpsA8W1zampJE92WoPT+4Hst3m3H9w= 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 1619012050573365.10650020953847; Wed, 21 Apr 2021 06:34:10 -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-121-hyrbxrlkMp-B99xmo7KpkQ-1; Wed, 21 Apr 2021 09:34:05 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CF5A107ACE8; Wed, 21 Apr 2021 13:33:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6051439A65; Wed, 21 Apr 2021 13:33:58 +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 28B171806D1D; Wed, 21 Apr 2021 13:33:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13LDXnd6019841 for ; Wed, 21 Apr 2021 09:33:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC573629C0; Wed, 21 Apr 2021 13:33:49 +0000 (UTC) Received: from work.redhat.com (ovpn-112-172.ams2.redhat.com [10.36.112.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id F37BF669ED; Wed, 21 Apr 2021 13:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619012049; 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=s3oVEqh/OCQqbjBRdu8YosnNoFoNhu1qeacOWn0UZk8=; b=CyhwlfBbvd+XHZNefU/yhR6A6khYrug7WLTTys58mclxbSSv3tb/uem2iJ6te1ukFZnhTT C9XlhmjFIvOG7k3892suKsS2W/ZNyq/sT0UfBX6vthlkogoV2V1tPUGVbehkCvpAT4aPrV oudd21imwODGN7/8ZA/UabSs5oCP2Fg= X-MC-Unique: hyrbxrlkMp-B99xmo7KpkQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/10] virDomainLoaderDefParseXML: Use virXMLProp* Date: Wed, 21 Apr 2021 15:33:32 +0200 Message-Id: <20210421133332.59662-11-twiederh@redhat.com> In-Reply-To: <20210421133332.59662-1-twiederh@redhat.com> References: <20210421133332.59662-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.11 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 | 47 ++++++++++-------------------------------- 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1878d9ed9d..4c88a124bc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18837,15 +18837,16 @@ virDomainLoaderDefParseXML(xmlNodePtr node, virDomainLoaderDef *loader, bool fwAutoSelect) { - g_autofree char *readonly_str =3D NULL; - g_autofree char *secure_str =3D NULL; - g_autofree char *type_str =3D NULL; + if (!fwAutoSelect) { + if (virXMLPropTristateBool(node, "readonly", VIR_XML_PROP_NONE, + &loader->readonly) < 0) + return -1; =20 - secure_str =3D virXMLPropString(node, "secure"); + if (virXMLPropEnum(node, "type", virDomainLoaderTypeFromString, + VIR_XML_PROP_NONE | VIR_XML_PROP_NONZERO, + &loader->type) < 0) + return -1; =20 - if (!fwAutoSelect) { - readonly_str =3D virXMLPropString(node, "readonly"); - type_str =3D virXMLPropString(node, "type"); if (!(loader->path =3D virXMLNodeContentString(node))) return -1; =20 @@ -18853,35 +18854,9 @@ virDomainLoaderDefParseXML(xmlNodePtr node, VIR_FREE(loader->path); } =20 - 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; - } - - 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; - } - - if (type_str) { - int type; - if ((type =3D virDomainLoaderTypeFromString(type_str)) <=3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("unknown type value: %s"), type_str); - return -1; - } - loader->type =3D type; - } + if (virXMLPropTristateBool(node, "secure", VIR_XML_PROP_NONE, + &loader->secure) < 0) + return -1; =20 return 0; } --=20 2.26.3