From nobody Tue Feb 10 08:01:19 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=1619020341; cv=none; d=zohomail.com; s=zohoarc; b=Mgf/8eKWxSJJJVy73qA56OAxN9M28PJ+DmXFkE32/fZmhT1EBqY30U9P7AWN9GKrbHPO7ieO1uIubjNQKnxldbQ/dbrKCFZaTx0OTw6bHdh1e2+Atso2dkadhcnceU2m2wwHlWFZbm7YiT45G7Nrjbn1fieSoII0xH2/m7QDZBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619020341; 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=X4N3ko5mLtDjxuExbSSpX8dcOM6oUjQrQgoEh9hrGRE=; b=kblsmjeuQEoBtwoprF5VvGqsYscDELI5b+HHiEcZAzIw1U7FDgpuAv/n3ILqIS4W5VS76dJ5C4nxk3p5aD1OsCu/hPsC8QJFMKgx2oRhddJY60NWrJXwrxeIUIJuTKcPOGb5rlE2kZvs7ex8N+sK3ScX1qP2LH1yToju/QgKG9I= 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 1619020341469939.4281069813519; Wed, 21 Apr 2021 08:52:21 -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-161-I8Z4ZgQEMwuw-q3QISpQOA-1; Wed, 21 Apr 2021 11:52:08 -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 9999B805725; Wed, 21 Apr 2021 15:51:58 +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 76E40610A8; Wed, 21 Apr 2021 15:51: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 416FD8E1F; Wed, 21 Apr 2021 15:51:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13LFplN0006932 for ; Wed, 21 Apr 2021 11:51:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA8C81017CF5; Wed, 21 Apr 2021 15:51:47 +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 3F09610016DB; Wed, 21 Apr 2021 15:51:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619020340; 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=X4N3ko5mLtDjxuExbSSpX8dcOM6oUjQrQgoEh9hrGRE=; b=V+eJ11hyFANlf/3EZTOA0cXHxFZwbMdF/Mv1HMb+Mlfv9+nkZjCvca2OXpMWVmEjNJDmVp jQIhLaxB65hauojPHORDP0Bal3y1S1km7cbnog0EwQNynsc0ofdqAOCPRQEUjUrRyjBOhb /Yp3wgDAgpYxZyh41Qix6ULeNCOeF5E= X-MC-Unique: I8Z4ZgQEMwuw-q3QISpQOA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/10] virDomainDeviceInfoParseXML: Use virXMLProp* Date: Wed, 21 Apr 2021 17:51:31 +0200 Message-Id: <20210421155133.162030-9-twiederh@redhat.com> In-Reply-To: <20210421155133.162030-1-twiederh@redhat.com> References: <20210421155133.162030-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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 | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index eaa1398de1..367258bf7a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6622,15 +6622,13 @@ virDomainDeviceInfoParseXML(virDomainXMLOption *xml= opt, virDomainDeviceInfo *info, unsigned int flags) { + xmlNodePtr acpi =3D NULL; xmlNodePtr address =3D NULL; xmlNodePtr master =3D NULL; xmlNodePtr boot =3D NULL; xmlNodePtr rom =3D NULL; int ret =3D -1; - g_autofree char *romenabled =3D NULL; - g_autofree char *rombar =3D NULL; g_autofree char *aliasStr =3D NULL; - g_autofree char *acpiIndex =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 virDomainDeviceInfoClear(info); @@ -6657,24 +6655,14 @@ virDomainDeviceInfoParseXML(virDomainXMLOption *xml= opt, =20 if ((flags & VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) && (rom =3D virXPathNode("./rom", ctxt))) { - if ((romenabled =3D virXPathString("string(./rom/@enabled)", ctxt)= )) { - int value; - if ((value =3D virTristateBoolTypeFromString(romenabled)) <=3D= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown rom enabled value '%s'"), romena= bled); - goto cleanup; - } - info->romenabled =3D value; - } - if ((rombar =3D virXPathString("string(./rom/@bar)", ctxt))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(rombar)) <=3D 0= ) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown rom bar value '%s'"), rombar); - goto cleanup; - } - info->rombar =3D value; - } + if (virXMLPropTristateBool(rom, "enabled", VIR_XML_PROP_NONE, + &info->romenabled) < 0) + goto cleanup; + + if (virXMLPropTristateSwitch(rom, "bar", VIR_XML_PROP_NONE, + &info->rombar) < 0) + goto cleanup; + info->romfile =3D virXMLPropString(rom, "file"); =20 if (info->romenabled =3D=3D VIR_TRISTATE_BOOL_NO && @@ -6685,12 +6673,10 @@ virDomainDeviceInfoParseXML(virDomainXMLOption *xml= opt, } } =20 - acpiIndex =3D virXPathString("string(./acpi/@index)", ctxt); - if (acpiIndex && - virStrToLong_ui(acpiIndex, NULL, 10, &info->acpiIndex) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Cannot parse ACPI index value '%s'"), acpiIndex); - goto cleanup; + if ((acpi =3D virXPathNode("./acpi", ctxt))) { + if (virXMLPropUInt(acpi, "index", 10, VIR_XML_PROP_NONE, + &info->acpiIndex) < 0) + goto cleanup; } =20 if ((address =3D virXPathNode("./address", ctxt)) && --=20 2.26.3