From nobody Thu May 2 18:29:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1587488455; cv=none; d=zohomail.com; s=zohoarc; b=TU3dr/5a+Wmnj5Ap+L6TD/gdpd+IC6TKhxp1qdFPjP/O/v+pqEYAZlWdRDVLpeN+5nGIbkURJTQhacd14cCWTHvbrWI+7LQgC9Qh2ECpjClDDaoV2wNDGaLC1Q0Ku6oxLcw+mt1TXAXJS2b7VyCB4Fn77sPc9Fz4B4eWvHDs9XI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587488455; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=cS/ighUQkFxV1S+9zd4ybj292SS3Y1yZ8DxemC6k3JQ=; b=PSJ53RagyYXn5+YSk5N+1I/wCJOq2be4y2ySptsBOqu/VgP5+GmV4jTA0X2vcd4QVHcsp4/UacYU37IAIukF70nqZ9Pv+HZccjHJHssE8tAB8jmvEpcX29+JMyWlZ/P3cJcwYr9HyOJXPQqr9QsiVa0dZehpfZmrVGubliYKhrQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1587488455612389.63090879662855; Tue, 21 Apr 2020 10:00:55 -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-207-DFdGsMoFPtCjMrZ802EWHA-1; Tue, 21 Apr 2020 13:00:50 -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 B65F6107B26F; Tue, 21 Apr 2020 17:00: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 0FB92B3A7A; Tue, 21 Apr 2020 17:00: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 E4E6718089CD; Tue, 21 Apr 2020 17:00:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03LH0cZa019565 for ; Tue, 21 Apr 2020 13:00:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 79DB119925; Tue, 21 Apr 2020 17:00:38 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A56D19C70 for ; Tue, 21 Apr 2020 17:00:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587488453; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=cS/ighUQkFxV1S+9zd4ybj292SS3Y1yZ8DxemC6k3JQ=; b=Woo8V20YRhQAHhCi38tGtjQMv+vbE1qRhwklb+tymIrFhB/q2CUY4T6ZFShIW6KE3CvtxL wxwbxXLoPAy/zquSprbneXTzVU34IF8QfV0ebScX7nJiXOGPbdiM52QE2d/AcI1myQpXXm Mhijea9m3V9VX+fdZOmTWzOVabuClCE= X-MC-Unique: DFdGsMoFPtCjMrZ802EWHA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH] conf: split out virDomainFeaturesDefParse Date: Tue, 21 Apr 2020 19:00:31 +0200 Message-Id: <481d52c2109ae53f8d5615836641c969b103909f.1587488347.git.jtomko@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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 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" The virDomainDefParseXML function has grown so large it broke the build: ../../src/conf/domain_conf.c:20362:1: error: stack frame size of 4168 bytes in function 'virDomainDefParseXML' [-Werror,-Wframe-larger-than=3D] Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- Technically a build breaker fix. I'm sure I will regret not having it pushed as such tomorrow. Formatted with patience. src/conf/domain_conf.c | 965 +++++++++++++++++++++-------------------- 1 file changed, 492 insertions(+), 473 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f3362c934..d9c4b487a8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19181,6 +19181,496 @@ virDomainResourceDefParse(xmlNodePtr node, return NULL; } =20 + +static int virDomainFeaturesDefParse(virDomainDefPtr def, + xmlXPathContextPtr ctxt) +{ + g_autofree xmlNodePtr *nodes =3D NULL; + g_autofree char *tmp =3D NULL; + xmlNodePtr node =3D NULL; + int n, gic_version; + size_t i; + + if ((n =3D virXPathNodeSet("./features/*", ctxt, &nodes)) < 0) + goto error; + + for (i =3D 0; i < n; i++) { + int val =3D virDomainFeatureTypeFromString((const char *)nodes[i]-= >name); + if (val < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unexpected feature '%s'"), nodes[i]->name); + goto error; + } + + switch ((virDomainFeature) val) { + case VIR_DOMAIN_FEATURE_APIC: + if ((tmp =3D virXPathString("string(./features/apic/@eoi)", ct= xt))) { + int eoi; + if ((eoi =3D virTristateSwitchTypeFromString(tmp)) <=3D 0)= { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown value for attribute eoi: '%s= '"), + tmp); + goto error; + } + def->apic_eoi =3D eoi; + VIR_FREE(tmp); + } + G_GNUC_FALLTHROUGH; + case VIR_DOMAIN_FEATURE_ACPI: + case VIR_DOMAIN_FEATURE_PAE: + case VIR_DOMAIN_FEATURE_VIRIDIAN: + case VIR_DOMAIN_FEATURE_PRIVNET: + case VIR_DOMAIN_FEATURE_HYPERV: + case VIR_DOMAIN_FEATURE_KVM: + case VIR_DOMAIN_FEATURE_MSRS: + case VIR_DOMAIN_FEATURE_XEN: + def->features[val] =3D VIR_TRISTATE_SWITCH_ON; + break; + + 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)); + goto error; + } + VIR_FREE(tmp); + } else { + def->features[val] =3D VIR_TRISTATE_SWITCH_ABSENT; + } + break; + + 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)); + goto error; + } + VIR_FREE(tmp); + } else { + def->features[val] =3D VIR_TRISTATE_SWITCH_ON; + } + break; + + case VIR_DOMAIN_FEATURE_GIC: + if ((tmp =3D virXMLPropString(nodes[i], "version"))) { + 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); + goto error; + } + def->gic_version =3D gic_version; + VIR_FREE(tmp); + } + def->features[val] =3D VIR_TRISTATE_SWITCH_ON; + break; + + 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); + goto error; + } + def->features[val] =3D value; + VIR_FREE(tmp); + } + break; + + 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); + goto error; + } + def->hpt_resizing =3D (virDomainHPTResizing) value; + VIR_FREE(tmp); + } + + if (virDomainParseScaledValue("./features/hpt/maxpagesize", + NULL, + ctxt, + &def->hpt_maxpagesize, + 1024, + ULLONG_MAX, + false) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", + _("Unable to parse HPT maxpagesize setting"= )); + goto error; + } + def->hpt_maxpagesize =3D VIR_DIV_UP(def->hpt_maxpagesize, 1024= ); + + if (def->hpt_resizing !=3D VIR_DOMAIN_HPT_RESIZING_NONE || + def->hpt_maxpagesize > 0) { + def->features[val] =3D VIR_TRISTATE_SWITCH_ON; + } + break; + + 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)); + goto error; + } + if ((def->features[val] =3D virTristateSwitchTypeFromString(tm= p)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown state attribute '%s' of feature = '%s'"), + tmp, virDomainFeatureTypeToString(val)); + goto error; + } + VIR_FREE(tmp); + break; + + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_FEATURE_LAST: + break; + } + } + VIR_FREE(nodes); + + if (def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D=3D VIR_TRISTATE_SWITC= H_ON) { + int feature; + int value; + node =3D ctxt->node; + if ((n =3D virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) <= 0) + goto error; + + for (i =3D 0; i < n; i++) { + feature =3D virDomainHypervTypeFromString((const char *)nodes[= i]->name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported HyperV Enlightenment feature= : %s"), + nodes[i]->name); + goto error; + } + + ctxt->node =3D nodes[i]; + + if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "HyperV Enlightenment feature '%s'"), + nodes[i]->name); + goto error; + } + + if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value of state argument " + "for HyperV Enlightenment feature '%s'"), + nodes[i]->name); + goto error; + } + + VIR_FREE(tmp); + def->hyperv_features[feature] =3D value; + + switch ((virDomainHyperv) feature) { + case VIR_DOMAIN_HYPERV_RELAXED: + case VIR_DOMAIN_HYPERV_VAPIC: + case VIR_DOMAIN_HYPERV_VPINDEX: + case VIR_DOMAIN_HYPERV_RUNTIME: + case VIR_DOMAIN_HYPERV_SYNIC: + case VIR_DOMAIN_HYPERV_STIMER: + case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: + case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: + case VIR_DOMAIN_HYPERV_TLBFLUSH: + case VIR_DOMAIN_HYPERV_IPI: + case VIR_DOMAIN_HYPERV_EVMCS: + break; + + case VIR_DOMAIN_HYPERV_SPINLOCKS: + if (value !=3D VIR_TRISTATE_SWITCH_ON) + break; + + if (virXPathUInt("string(./@retries)", ctxt, + &def->hyperv_spinlocks) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid HyperV spinlock retry count"= )); + goto error; + } + + if (def->hyperv_spinlocks < 0xFFF) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("HyperV spinlock retry count must be " + "at least 4095")); + goto error; + } + break; + + case VIR_DOMAIN_HYPERV_VENDOR_ID: + if (value !=3D VIR_TRISTATE_SWITCH_ON) + break; + + if (!(def->hyperv_vendor_id =3D virXMLPropString(nodes[i], + "value"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing 'value' attribute for " + "HyperV feature 'vendor_id'")); + goto error; + } + + if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VEND= OR_ID_MAX) { + virReportError(VIR_ERR_XML_ERROR, + _("HyperV vendor_id value must not be m= ore " + "than %d characters."), + VIR_DOMAIN_HYPERV_VENDOR_ID_MAX); + goto error; + } + + /* ensure that the string can be passed to qemu */ + if (strchr(def->hyperv_vendor_id, ',')) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("HyperV vendor_id value is invalid")); + goto error; + } + + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_HYPERV_LAST: + break; + } + } + VIR_FREE(nodes); + ctxt->node =3D node; + } + + if (def->features[VIR_DOMAIN_HYPERV_STIMER] =3D=3D VIR_TRISTATE_SWITCH= _ON) { + int value; + if ((n =3D virXPathNodeSet("./features/hyperv/stimer/*", ctxt, &no= des)) < 0) + goto error; + + for (i =3D 0; i < n; i++) { + if (STRNEQ((const char *)nodes[i]->name, "direct")) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported Hyper-V stimer feature: %s"), + nodes[i]->name); + goto error; + } + + if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "Hyper-V stimer '%s' feature"), "direct"); + goto error; + } + + if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value of state argument " + "for Hyper-V stimer '%s' feature"), "dire= ct"); + goto error; + } + + VIR_FREE(tmp); + def->hyperv_stimer_direct =3D value; + } + VIR_FREE(nodes); + } + + 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) + goto error; + + for (i =3D 0; i < n; i++) { + feature =3D virDomainKVMTypeFromString((const char *)nodes[i]-= >name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported KVM feature: %s"), + nodes[i]->name); + goto error; + } + + switch ((virDomainKVM) feature) { + case VIR_DOMAIN_KVM_HIDDEN: + case VIR_DOMAIN_KVM_DEDICATED: + if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "KVM feature '%s'"), + nodes[i]->name); + goto error; + } + + if ((value =3D virTristateSwitchTypeFromString(tmp)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value of state argument " + "for KVM feature '%s'"), + nodes[i]->name); + goto error; + } + + VIR_FREE(tmp); + def->kvm_features[feature] =3D value; + break; + + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_KVM_LAST: + break; + } + } + VIR_FREE(nodes); + } + + 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) + goto error; + + for (i =3D 0; i < n; i++) { + feature =3D virDomainXenTypeFromString((const char *)nodes[i]-= >name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported Xen feature: %s"), + nodes[i]->name); + goto error; + } + + if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { + virReportError(VIR_ERR_XML_ERROR, + _("missing 'state' attribute for " + "Xen feature '%s'"), + nodes[i]->name); + goto error; + } + + if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value of state argument " + "for Xen feature '%s'"), + nodes[i]->name); + goto error; + } + + VIR_FREE(tmp); + def->xen_features[feature] =3D value; + + switch ((virDomainXen) feature) { + case VIR_DOMAIN_XEN_E820_HOST: + break; + + case VIR_DOMAIN_XEN_PASSTHROUGH: + if (value !=3D VIR_TRISTATE_SWITCH_ON) + break; + + 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); + goto error; + } + + 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'")); + goto error; + } + def->xen_passthrough_mode =3D mode; + } + break; + + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_XEN_LAST: + break; + } + } + VIR_FREE(nodes); + } + + if (def->features[VIR_DOMAIN_FEATURE_SMM] =3D=3D VIR_TRISTATE_SWITCH_O= N) { + int rv =3D virDomainParseScaledValue("string(./features/smm/tseg)", + "string(./features/smm/tseg/@un= it)", + ctxt, + &def->tseg_size, + 1024 * 1024, /* Defaults to meb= ibytes */ + ULLONG_MAX, + false); + if (rv < 0) + goto error; + def->tseg_specified =3D rv; + } + + if (def->features[VIR_DOMAIN_FEATURE_MSRS] =3D=3D VIR_TRISTATE_SWITCH_= ON) { + if ((node =3D virXPathNode("./features/msrs", ctxt)) =3D=3D NULL) + goto error; + + if (!(tmp =3D virXMLPropString(node, "unknown"))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("missing 'unknown' attribute for feature '%s'= "), + virDomainFeatureTypeToString(VIR_DOMAIN_FEATURE= _MSRS)); + goto error; + } + + if ((def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] =3D virDomainMsrs= UnknownTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown 'unknown' value '%s'"), + tmp); + goto error; + } + VIR_FREE(tmp); + } + + if ((n =3D virXPathNodeSet("./features/capabilities/*", ctxt, &nodes))= < 0) + goto error; + + for (i =3D 0; i < n; i++) { + int val =3D virDomainProcessCapsFeatureTypeFromString((const char = *)nodes[i]->name); + if (val < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unexpected capability feature '%s'"), nodes[= i]->name); + goto error; + } + + 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)); + goto error; + } + VIR_FREE(tmp); + } else { + def->caps_features[val] =3D VIR_TRISTATE_SWITCH_ON; + } + } + VIR_FREE(nodes); + return 0; + + error: + return -1; +} + + static int virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def) { @@ -20366,7 +20856,7 @@ virDomainDefParseXML(xmlDocPtr xml, { xmlNodePtr node =3D NULL; size_t i, j; - int n, gic_version; + int n; long id =3D -1; virDomainDefPtr def; bool uuid_generated =3D false; @@ -20844,480 +21334,9 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; VIR_FREE(nodes); =20 - if ((n =3D virXPathNodeSet("./features/*", ctxt, &nodes)) < 0) + if (virDomainFeaturesDefParse(def, ctxt) < 0) goto error; =20 - for (i =3D 0; i < n; i++) { - int val =3D virDomainFeatureTypeFromString((const char *)nodes[i]-= >name); - if (val < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected feature '%s'"), nodes[i]->name); - goto error; - } - - switch ((virDomainFeature) val) { - case VIR_DOMAIN_FEATURE_APIC: - if ((tmp =3D virXPathString("string(./features/apic/@eoi)", ct= xt))) { - int eoi; - if ((eoi =3D virTristateSwitchTypeFromString(tmp)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown value for attribute eoi: '%s= '"), - tmp); - goto error; - } - def->apic_eoi =3D eoi; - VIR_FREE(tmp); - } - G_GNUC_FALLTHROUGH; - case VIR_DOMAIN_FEATURE_ACPI: - case VIR_DOMAIN_FEATURE_PAE: - case VIR_DOMAIN_FEATURE_VIRIDIAN: - case VIR_DOMAIN_FEATURE_PRIVNET: - case VIR_DOMAIN_FEATURE_HYPERV: - case VIR_DOMAIN_FEATURE_KVM: - case VIR_DOMAIN_FEATURE_MSRS: - case VIR_DOMAIN_FEATURE_XEN: - def->features[val] =3D VIR_TRISTATE_SWITCH_ON; - break; - - 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)); - goto error; - } - VIR_FREE(tmp); - } else { - def->features[val] =3D VIR_TRISTATE_SWITCH_ABSENT; - } - break; - - 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)); - goto error; - } - VIR_FREE(tmp); - } else { - def->features[val] =3D VIR_TRISTATE_SWITCH_ON; - } - break; - - case VIR_DOMAIN_FEATURE_GIC: - if ((tmp =3D virXMLPropString(nodes[i], "version"))) { - 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); - goto error; - } - def->gic_version =3D gic_version; - VIR_FREE(tmp); - } - def->features[val] =3D VIR_TRISTATE_SWITCH_ON; - break; - - 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); - goto error; - } - def->features[val] =3D value; - VIR_FREE(tmp); - } - break; - - 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); - goto error; - } - def->hpt_resizing =3D (virDomainHPTResizing) value; - VIR_FREE(tmp); - } - - if (virDomainParseScaledValue("./features/hpt/maxpagesize", - NULL, - ctxt, - &def->hpt_maxpagesize, - 1024, - ULLONG_MAX, - false) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", - _("Unable to parse HPT maxpagesize setting"= )); - goto error; - } - def->hpt_maxpagesize =3D VIR_DIV_UP(def->hpt_maxpagesize, 1024= ); - - if (def->hpt_resizing !=3D VIR_DOMAIN_HPT_RESIZING_NONE || - def->hpt_maxpagesize > 0) { - def->features[val] =3D VIR_TRISTATE_SWITCH_ON; - } - break; - - 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)); - goto error; - } - if ((def->features[val] =3D virTristateSwitchTypeFromString(tm= p)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature = '%s'"), - tmp, virDomainFeatureTypeToString(val)); - goto error; - } - VIR_FREE(tmp); - break; - - /* coverity[dead_error_begin] */ - case VIR_DOMAIN_FEATURE_LAST: - break; - } - } - VIR_FREE(nodes); - - if (def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D=3D VIR_TRISTATE_SWITC= H_ON) { - int feature; - int value; - node =3D ctxt->node; - if ((n =3D virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) <= 0) - goto error; - - for (i =3D 0; i < n; i++) { - feature =3D virDomainHypervTypeFromString((const char *)nodes[= i]->name); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported HyperV Enlightenment feature= : %s"), - nodes[i]->name); - goto error; - } - - ctxt->node =3D nodes[i]; - - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "HyperV Enlightenment feature '%s'"), - nodes[i]->name); - goto error; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for HyperV Enlightenment feature '%s'"), - nodes[i]->name); - goto error; - } - - VIR_FREE(tmp); - def->hyperv_features[feature] =3D value; - - switch ((virDomainHyperv) feature) { - case VIR_DOMAIN_HYPERV_RELAXED: - case VIR_DOMAIN_HYPERV_VAPIC: - case VIR_DOMAIN_HYPERV_VPINDEX: - case VIR_DOMAIN_HYPERV_RUNTIME: - case VIR_DOMAIN_HYPERV_SYNIC: - case VIR_DOMAIN_HYPERV_STIMER: - case VIR_DOMAIN_HYPERV_RESET: - case VIR_DOMAIN_HYPERV_FREQUENCIES: - case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: - case VIR_DOMAIN_HYPERV_TLBFLUSH: - case VIR_DOMAIN_HYPERV_IPI: - case VIR_DOMAIN_HYPERV_EVMCS: - break; - - case VIR_DOMAIN_HYPERV_SPINLOCKS: - if (value !=3D VIR_TRISTATE_SWITCH_ON) - break; - - if (virXPathUInt("string(./@retries)", ctxt, - &def->hyperv_spinlocks) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid HyperV spinlock retry count"= )); - goto error; - } - - if (def->hyperv_spinlocks < 0xFFF) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("HyperV spinlock retry count must be " - "at least 4095")); - goto error; - } - break; - - case VIR_DOMAIN_HYPERV_VENDOR_ID: - if (value !=3D VIR_TRISTATE_SWITCH_ON) - break; - - if (!(def->hyperv_vendor_id =3D virXMLPropString(nodes[i], - "value"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing 'value' attribute for " - "HyperV feature 'vendor_id'")); - goto error; - } - - if (strlen(def->hyperv_vendor_id) > VIR_DOMAIN_HYPERV_VEND= OR_ID_MAX) { - virReportError(VIR_ERR_XML_ERROR, - _("HyperV vendor_id value must not be m= ore " - "than %d characters."), - VIR_DOMAIN_HYPERV_VENDOR_ID_MAX); - goto error; - } - - /* ensure that the string can be passed to qemu */ - if (strchr(def->hyperv_vendor_id, ',')) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("HyperV vendor_id value is invalid")); - goto error; - } - - /* coverity[dead_error_begin] */ - case VIR_DOMAIN_HYPERV_LAST: - break; - } - } - VIR_FREE(nodes); - ctxt->node =3D node; - } - - if (def->features[VIR_DOMAIN_HYPERV_STIMER] =3D=3D VIR_TRISTATE_SWITCH= _ON) { - int value; - if ((n =3D virXPathNodeSet("./features/hyperv/stimer/*", ctxt, &no= des)) < 0) - goto error; - - for (i =3D 0; i < n; i++) { - if (STRNEQ((const char *)nodes[i]->name, "direct")) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported Hyper-V stimer feature: %s"), - nodes[i]->name); - goto error; - } - - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "Hyper-V stimer '%s' feature"), "direct"); - goto error; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for Hyper-V stimer '%s' feature"), "dire= ct"); - goto error; - } - - VIR_FREE(tmp); - def->hyperv_stimer_direct =3D value; - } - VIR_FREE(nodes); - } - - 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) - goto error; - - for (i =3D 0; i < n; i++) { - feature =3D virDomainKVMTypeFromString((const char *)nodes[i]-= >name); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported KVM feature: %s"), - nodes[i]->name); - goto error; - } - - switch ((virDomainKVM) feature) { - case VIR_DOMAIN_KVM_HIDDEN: - case VIR_DOMAIN_KVM_DEDICATED: - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "KVM feature '%s'"), - nodes[i]->name); - goto error; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for KVM feature '%s'"), - nodes[i]->name); - goto error; - } - - VIR_FREE(tmp); - def->kvm_features[feature] =3D value; - break; - - /* coverity[dead_error_begin] */ - case VIR_DOMAIN_KVM_LAST: - break; - } - } - VIR_FREE(nodes); - } - - 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) - goto error; - - for (i =3D 0; i < n; i++) { - feature =3D virDomainXenTypeFromString((const char *)nodes[i]-= >name); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported Xen feature: %s"), - nodes[i]->name); - goto error; - } - - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "Xen feature '%s'"), - nodes[i]->name); - goto error; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for Xen feature '%s'"), - nodes[i]->name); - goto error; - } - - VIR_FREE(tmp); - def->xen_features[feature] =3D value; - - switch ((virDomainXen) feature) { - case VIR_DOMAIN_XEN_E820_HOST: - break; - - case VIR_DOMAIN_XEN_PASSTHROUGH: - if (value !=3D VIR_TRISTATE_SWITCH_ON) - break; - - 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); - goto error; - } - - 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'")); - goto error; - } - def->xen_passthrough_mode =3D mode; - } - break; - - /* coverity[dead_error_begin] */ - case VIR_DOMAIN_XEN_LAST: - break; - } - } - VIR_FREE(nodes); - } - - if (def->features[VIR_DOMAIN_FEATURE_SMM] =3D=3D VIR_TRISTATE_SWITCH_O= N) { - int rv =3D virDomainParseScaledValue("string(./features/smm/tseg)", - "string(./features/smm/tseg/@un= it)", - ctxt, - &def->tseg_size, - 1024 * 1024, /* Defaults to meb= ibytes */ - ULLONG_MAX, - false); - if (rv < 0) - goto error; - def->tseg_specified =3D rv; - } - - if (def->features[VIR_DOMAIN_FEATURE_MSRS] =3D=3D VIR_TRISTATE_SWITCH_= ON) { - if ((node =3D virXPathNode("./features/msrs", ctxt)) =3D=3D NULL) - goto error; - - if (!(tmp =3D virXMLPropString(node, "unknown"))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing 'unknown' attribute for feature '%s'= "), - virDomainFeatureTypeToString(VIR_DOMAIN_FEATURE= _MSRS)); - goto error; - } - - if ((def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] =3D virDomainMsrs= UnknownTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown 'unknown' value '%s'"), - tmp); - goto error; - } - VIR_FREE(tmp); - } - - if ((n =3D virXPathNodeSet("./features/capabilities/*", ctxt, &nodes))= < 0) - goto error; - - for (i =3D 0; i < n; i++) { - int val =3D virDomainProcessCapsFeatureTypeFromString((const char = *)nodes[i]->name); - if (val < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unexpected capability feature '%s'"), nodes[= i]->name); - goto error; - } - - 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)); - goto error; - } - VIR_FREE(tmp); - } else { - def->caps_features[val] =3D VIR_TRISTATE_SWITCH_ON; - } - } - VIR_FREE(nodes); - if (virDomainEventActionParseXML(ctxt, "on_reboot", "string(./on_reboot[1])", &def->onReboot, --=20 2.25.1