From nobody Sat Apr 20 12:25:42 2024 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=1619192436; cv=none; d=zohomail.com; s=zohoarc; b=BizzBMMdNZaaxqFss+2+QNiKR8r8m0qcixm2F6ty46mpQMDNXlfxGEaOCwTl1ne4cMy9AiuN5MbkY944GYDziibdPvBnTIPowlQClEsYyLR2PE2J/p/nf0XYFLMhKskjeJKFB5H/TRhrrO+SNMLyIvWwDSih1OxcFszNVSBt+hs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619192436; 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=T/WaPEm16NrVCGgAVSfTuvw538NsKOs7E1PMMufqQrk=; b=O2uEfmVg+sofOnjRM3fjt/klcYxZkXrpeBH/Gkpw/hI3HqJ66QPnDJiPIQqZC+bCy2VCFmv0zb2MiMuk2iOtrTgOkp39ouPcUWrr96g8+AXrpvBr9pFAArMP7J9KZV+0vT+uNzd0FRzaB6Qmph45Mbtdd7dTxE3aYY5/9QXAcqo= 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 1619192436415164.70390616869406; Fri, 23 Apr 2021 08:40:36 -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-498-yZ1waiZvN8e4zqY5Qc18yQ-1; Fri, 23 Apr 2021 11:39:47 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2F86D1006706; Fri, 23 Apr 2021 15:39:42 +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 01C6019714; Fri, 23 Apr 2021 15:39:42 +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 C311B180B617; Fri, 23 Apr 2021 15:39:41 +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 13NFddU0004277 for ; Fri, 23 Apr 2021 11:39:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E3EE60613; Fri, 23 Apr 2021 15:39:39 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CAB060854; Fri, 23 Apr 2021 15:39:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619192435; 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=T/WaPEm16NrVCGgAVSfTuvw538NsKOs7E1PMMufqQrk=; b=HFhn2QH79hKw37uXvong+RkiYiTBhaCemyTDIy/yjb9SbCyiTh7V62vt62DLFe+NHsYI0J OtcehLlOC2dSb6CKRKL16S/rlSQ4JDCb9diOw5bsURh6tw8TbTtYV3JVQ/Wde+Li3crNte gRpeUKmrZpZYXOlB4w9lAkGxyTtVAQw= X-MC-Unique: yZ1waiZvN8e4zqY5Qc18yQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/10] virDomainFeaturesDefParse: Use virXMLProp* Date: Fri, 23 Apr 2021 17:39:22 +0200 Message-Id: <20210423153923.339223-10-twiederh@redhat.com> In-Reply-To: <20210423153923.339223-1-twiederh@redhat.com> References: <20210423153923.339223-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.84 on 10.5.11.23 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 | 333 +++++++----------- .../qemuxml2argvdata/aarch64-gic-invalid.err | 2 +- 2 files changed, 119 insertions(+), 216 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 867a83a605..bff17057af 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17858,6 +17858,7 @@ virDomainFeaturesDefParse(virDomainDef *def, g_autofree xmlNodePtr *nodes =3D NULL; size_t i; int n; + int rc; =20 if ((n =3D virXPathNodeSet("./features/*", ctxt, &nodes)) < 0) return -1; @@ -17895,76 +17896,67 @@ virDomainFeaturesDefParse(virDomainDef *def, def->features[val] =3D VIR_TRISTATE_SWITCH_ON; break; =20 - case VIR_DOMAIN_FEATURE_CAPABILITIES: - if ((tmp =3D virXMLPropString(nodes[i], "policy"))) { - if ((def->features[val] =3D virDomainCapabilitiesPolicyTyp= eFromString(tmp)) =3D=3D -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown policy attribute '%s' of fea= ture '%s'"), - tmp, virDomainFeatureTypeToString(val)); - return -1; - } - } else { - def->features[val] =3D VIR_TRISTATE_SWITCH_ABSENT; - } + case VIR_DOMAIN_FEATURE_CAPABILITIES: { + virDomainCapabilitiesPolicy policy; + + def->features[val] =3D VIR_TRISTATE_SWITCH_ABSENT; + + if ((rc =3D virXMLPropEnum(nodes[i], "policy", + virDomainCapabilitiesPolicyTypeFromSt= ring, + VIR_XML_PROP_NONE, &policy)) < 0) + return -1; + + if (rc =3D=3D 1) + def->features[val] =3D policy; break; + } =20 case VIR_DOMAIN_FEATURE_VMCOREINFO: case VIR_DOMAIN_FEATURE_HAP: case VIR_DOMAIN_FEATURE_PMU: case VIR_DOMAIN_FEATURE_PVSPINLOCK: case VIR_DOMAIN_FEATURE_VMPORT: - case VIR_DOMAIN_FEATURE_SMM: - if ((tmp =3D virXMLPropString(nodes[i], "state"))) { - if ((def->features[val] =3D virTristateSwitchTypeFromStrin= g(tmp)) =3D=3D -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feat= ure '%s'"), - tmp, virDomainFeatureTypeToString(val)); - return -1; - } - } else { - def->features[val] =3D VIR_TRISTATE_SWITCH_ON; - } + case VIR_DOMAIN_FEATURE_SMM: { + virTristateSwitch state; + + def->features[val] =3D VIR_TRISTATE_SWITCH_ON; + + if ((rc =3D virXMLPropTristateSwitch(nodes[i], "state", + VIR_XML_PROP_NONE, &state))= < 0) + return -1; + + if (rc =3D=3D 1) + def->features[val] =3D state; break; + } =20 case VIR_DOMAIN_FEATURE_GIC: - if ((tmp =3D virXMLPropString(nodes[i], "version"))) { - int gic_version =3D virGICVersionTypeFromString(tmp); - if (gic_version < 0 || gic_version =3D=3D VIR_GIC_VERSION_= NONE) { - virReportError(VIR_ERR_XML_ERROR, - _("malformed gic version: %s"), tmp); - return -1; - } - def->gic_version =3D gic_version; - } def->features[val] =3D VIR_TRISTATE_SWITCH_ON; + + if (virXMLPropEnum(nodes[i], "version", + virGICVersionTypeFromString, + VIR_XML_PROP_NONZERO, &def->gic_version) < = 0) + return -1; break; =20 - case VIR_DOMAIN_FEATURE_IOAPIC: - tmp =3D virXMLPropString(nodes[i], "driver"); - if (tmp) { - int value =3D virDomainIOAPICTypeFromString(tmp); - if (value < 0 || value =3D=3D VIR_DOMAIN_IOAPIC_NONE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown driver mode: %s"), - tmp); - return -1; - } - def->features[val] =3D value; - } + case VIR_DOMAIN_FEATURE_IOAPIC: { + virDomainIOAPIC driver; + + if ((rc =3D virXMLPropEnum(nodes[i], "driver", + virDomainIOAPICTypeFromString, + VIR_XML_PROP_NONZERO, &driver)) < 0) + return -1; + + if (rc =3D=3D 1) + def->features[val] =3D driver; break; + } =20 case VIR_DOMAIN_FEATURE_HPT: - tmp =3D virXMLPropString(nodes[i], "resizing"); - if (tmp) { - int value =3D virDomainHPTResizingTypeFromString(tmp); - if (value < 0 || value =3D=3D VIR_DOMAIN_HPT_RESIZING_NONE= ) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown HPT resizing setting: %s"), - tmp); - return -1; - } - def->hpt_resizing =3D (virDomainHPTResizing) value; - } + if (virXMLPropEnum(nodes[i], "resizing", + virDomainHPTResizingTypeFromString, + VIR_XML_PROP_NONZERO, &def->hpt_resizing) <= 0) + return -1; =20 if (virParseScaledValue("./features/hpt/maxpagesize", NULL, @@ -17986,64 +17978,57 @@ virDomainFeaturesDefParse(virDomainDef *def, } break; =20 - case VIR_DOMAIN_FEATURE_CFPC: - tmp =3D virXMLPropString(nodes[i], "value"); - if (tmp) { - int value =3D virDomainCFPCTypeFromString(tmp); - if (value < 0 || value =3D=3D VIR_DOMAIN_CFPC_NONE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown value: %s"), - tmp); - return -1; - } + case VIR_DOMAIN_FEATURE_CFPC: { + virDomainCFPC value; + + if ((rc =3D virXMLPropEnum(nodes[i], "value", + virDomainCFPCTypeFromString, + VIR_XML_PROP_NONZERO, &value)) < 0) + return -1; + + if (rc =3D=3D 1) def->features[val] =3D value; - } break; + } =20 - case VIR_DOMAIN_FEATURE_SBBC: - tmp =3D virXMLPropString(nodes[i], "value"); - if (tmp) { - int value =3D virDomainSBBCTypeFromString(tmp); - if (value < 0 || value =3D=3D VIR_DOMAIN_SBBC_NONE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown value: %s"), - tmp); - return -1; - } + case VIR_DOMAIN_FEATURE_SBBC: { + virDomainSBBC value; + + if ((rc =3D virXMLPropEnum(nodes[i], "value", + virDomainSBBCTypeFromString, + VIR_XML_PROP_NONZERO, &value)) < 0) + return -1; + + if (rc =3D=3D 1) def->features[val] =3D value; - } break; + } =20 - case VIR_DOMAIN_FEATURE_IBS: - tmp =3D virXMLPropString(nodes[i], "value"); - if (tmp) { - int value =3D virDomainIBSTypeFromString(tmp); - if (value < 0 || value =3D=3D VIR_DOMAIN_IBS_NONE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown value: %s"), - tmp); - return -1; - } + case VIR_DOMAIN_FEATURE_IBS: { + virDomainIBS value; + + if ((rc =3D virXMLPropEnum(nodes[i], "value", + virDomainIBSTypeFromString, + VIR_XML_PROP_NONZERO, &value)) < 0) + return -1; + + if (rc =3D=3D 1) def->features[val] =3D value; - } break; + } =20 case VIR_DOMAIN_FEATURE_HTM: case VIR_DOMAIN_FEATURE_NESTED_HV: - case VIR_DOMAIN_FEATURE_CCF_ASSIST: - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing state attribute '%s' of feature = '%s'"), - tmp, virDomainFeatureTypeToString(val)); - return -1; - } - if ((def->features[val] =3D virTristateSwitchTypeFromString(tm= p)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature = '%s'"), - tmp, virDomainFeatureTypeToString(val)); + case VIR_DOMAIN_FEATURE_CCF_ASSIST: { + virTristateSwitch state; + + if (virXMLPropTristateSwitch(nodes[i], "state", + VIR_XML_PROP_REQUIRED, &state) < = 0) return -1; - } + + def->features[val] =3D state; break; + } =20 /* coverity[dead_error_begin] */ case VIR_DOMAIN_FEATURE_LAST: @@ -18054,13 +18039,12 @@ virDomainFeaturesDefParse(virDomainDef *def, =20 if (def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D=3D VIR_TRISTATE_SWITC= H_ON) { int feature; - int value; xmlNodePtr node =3D ctxt->node; if ((n =3D virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) <= 0) return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; + virTristateSwitch value; feature =3D virDomainHypervTypeFromString((const char *)nodes[= i]->name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -18071,21 +18055,9 @@ virDomainFeaturesDefParse(virDomainDef *def, =20 ctxt->node =3D nodes[i]; =20 - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "HyperV Enlightenment feature '%s'"), - nodes[i]->name); - return -1; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for HyperV Enlightenment feature '%s'"), - nodes[i]->name); + if (virXMLPropTristateSwitch(nodes[i], "state", + VIR_XML_PROP_REQUIRED, &value) < = 0) return -1; - } =20 def->hyperv_features[feature] =3D value; =20 @@ -18108,12 +18080,10 @@ virDomainFeaturesDefParse(virDomainDef *def, if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - if (virXPathUInt("string(./@retries)", ctxt, - &def->hyperv_spinlocks) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid HyperV spinlock retry count"= )); + if (virXMLPropUInt(nodes[i], "retries", 0, + VIR_XML_PROP_REQUIRED, + &def->hyperv_spinlocks) < 0) return -1; - } =20 if (def->hyperv_spinlocks < 0xFFF) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -18161,13 +18131,10 @@ virDomainFeaturesDefParse(virDomainDef *def, } =20 if (def->hyperv_features[VIR_DOMAIN_HYPERV_STIMER] =3D=3D VIR_TRISTATE= _SWITCH_ON) { - int value; if ((n =3D virXPathNodeSet("./features/hyperv/stimer/*", ctxt, &no= des)) < 0) return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; - if (STRNEQ((const char *)nodes[i]->name, "direct")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported Hyper-V stimer feature: %s"), @@ -18175,33 +18142,21 @@ virDomainFeaturesDefParse(virDomainDef *def, return -1; } =20 - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "Hyper-V stimer '%s' feature"), "direct"); - return -1; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for Hyper-V stimer '%s' feature"), "dire= ct"); + if (virXMLPropTristateSwitch(nodes[i], "state", + VIR_XML_PROP_REQUIRED, + &def->hyperv_stimer_direct) < 0) return -1; - } - - def->hyperv_stimer_direct =3D value; } VIR_FREE(nodes); } =20 if (def->features[VIR_DOMAIN_FEATURE_KVM] =3D=3D VIR_TRISTATE_SWITCH_O= N) { - int feature; - int value; if ((n =3D virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0) return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; + virTristateSwitch value; + int feature; =20 feature =3D virDomainKVMTypeFromString((const char *)nodes[i]-= >name); if (feature < 0) { @@ -18215,21 +18170,10 @@ virDomainFeaturesDefParse(virDomainDef *def, case VIR_DOMAIN_KVM_HIDDEN: case VIR_DOMAIN_KVM_DEDICATED: case VIR_DOMAIN_KVM_POLLCONTROL: - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "KVM feature '%s'"), - nodes[i]->name); + if (virXMLPropTristateSwitch(nodes[i], "state", + VIR_XML_PROP_REQUIRED, + &value) < 0) return -1; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for KVM feature '%s'"), - nodes[i]->name); - return -1; - } =20 def->kvm_features[feature] =3D value; break; @@ -18243,15 +18187,12 @@ virDomainFeaturesDefParse(virDomainDef *def, } =20 if (def->features[VIR_DOMAIN_FEATURE_XEN] =3D=3D VIR_TRISTATE_SWITCH_O= N) { - int feature; - int value; - g_autofree char *ptval =3D NULL; - if ((n =3D virXPathNodeSet("./features/xen/*", ctxt, &nodes)) < 0) return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; + virTristateSwitch value; + int feature; feature =3D virDomainXenTypeFromString((const char *)nodes[i]-= >name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -18260,21 +18201,9 @@ virDomainFeaturesDefParse(virDomainDef *def, return -1; } =20 - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "Xen feature '%s'"), - nodes[i]->name); - return -1; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for Xen feature '%s'"), - nodes[i]->name); + if (virXMLPropTristateSwitch(nodes[i], "state", + VIR_XML_PROP_REQUIRED, &value) < = 0) return -1; - } =20 def->xen_features[feature] =3D value; =20 @@ -18286,25 +18215,11 @@ virDomainFeaturesDefParse(virDomainDef *def, if (value !=3D VIR_TRISTATE_SWITCH_ON) break; =20 - if ((ptval =3D virXMLPropString(nodes[i], "mode"))) { - int mode =3D virDomainXenPassthroughModeTypeFromString= (ptval); - - if (mode < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported mode '%s' for Xen pa= ssthrough feature"), - ptval); - return -1; - } - - if (mode !=3D VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SYNC_PT = && - mode !=3D VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SHARE_PT= ) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("'mode' attribute for Xen feature= " - "'passthrough' must be 'sync_pt' = or 'share_pt'")); - return -1; - } - def->xen_passthrough_mode =3D mode; - } + if (virXMLPropEnum(nodes[i], "mode", + virDomainXenPassthroughModeTypeFromStri= ng, + VIR_XML_PROP_NONZERO, + &def->xen_passthrough_mode) < 0) + return -1; break; =20 /* coverity[dead_error_begin] */ @@ -18329,31 +18244,23 @@ virDomainFeaturesDefParse(virDomainDef *def, } =20 if (def->features[VIR_DOMAIN_FEATURE_MSRS] =3D=3D VIR_TRISTATE_SWITCH_= ON) { - g_autofree char *tmp =3D NULL; + virDomainMsrsUnknown unknown; xmlNodePtr node =3D NULL; if ((node =3D virXPathNode("./features/msrs", ctxt)) =3D=3D NULL) return -1; =20 - if (!(tmp =3D virXMLPropString(node, "unknown"))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing 'unknown' attribute for feature '%s'= "), - virDomainFeatureTypeToString(VIR_DOMAIN_FEATURE= _MSRS)); + if (virXMLPropEnum(node, "unknown", virDomainMsrsUnknownTypeFromSt= ring, + VIR_XML_PROP_REQUIRED, &unknown) < 0) return -1; - } =20 - if ((def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] =3D virDomainMsrs= UnknownTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown 'unknown' value '%s'"), - tmp); - return -1; - } + def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] =3D unknown; } =20 if ((n =3D virXPathNodeSet("./features/capabilities/*", ctxt, &nodes))= < 0) return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; + virTristateSwitch state =3D VIR_TRISTATE_SWITCH_ON; int val =3D virDomainProcessCapsFeatureTypeFromString((const char = *)nodes[i]->name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -18361,16 +18268,12 @@ virDomainFeaturesDefParse(virDomainDef *def, return -1; } =20 - if ((tmp =3D virXMLPropString(nodes[i], "state"))) { - if ((def->caps_features[val] =3D virTristateSwitchTypeFromStri= ng(tmp)) =3D=3D -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature = capability '%s'"), - tmp, virDomainProcessCapsFeatureTypeToStrin= g(val)); - return -1; - } - } else { - def->caps_features[val] =3D VIR_TRISTATE_SWITCH_ON; - } + + if (virXMLPropTristateSwitch(nodes[i], "state", VIR_XML_PROP_NONE, + &state) < 0) + return -1; + + def->caps_features[val] =3D state; } VIR_FREE(nodes); return 0; diff --git a/tests/qemuxml2argvdata/aarch64-gic-invalid.err b/tests/qemuxml= 2argvdata/aarch64-gic-invalid.err index c2e9f4aa3f..18de19f660 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-invalid.err +++ b/tests/qemuxml2argvdata/aarch64-gic-invalid.err @@ -1 +1 @@ -XML error: malformed gic version: none +XML error: Invalid value for attribute 'version' in element 'gic': 'none'. --=20 2.26.3