mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-09 17:24:53 +00:00
virDomainFeaturesDefParse: Use virXMLPropEnum
Signed-off-by: Tim Wiederhake <twiederh@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
54635ea592
commit
4fc365934a
@ -17934,18 +17934,17 @@ virDomainFeaturesDefParse(virDomainDef *def,
|
|||||||
def->features[val] = VIR_TRISTATE_SWITCH_ON;
|
def->features[val] = VIR_TRISTATE_SWITCH_ON;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_FEATURE_CAPABILITIES:
|
case VIR_DOMAIN_FEATURE_CAPABILITIES: {
|
||||||
if ((tmp = virXMLPropString(nodes[i], "policy"))) {
|
virDomainCapabilitiesPolicy policy = VIR_DOMAIN_CAPABILITIES_POLICY_DEFAULT;
|
||||||
if ((def->features[val] = virDomainCapabilitiesPolicyTypeFromString(tmp)) == -1) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
if (virXMLPropEnum(nodes[i], "policy",
|
||||||
_("unknown policy attribute '%s' of feature '%s'"),
|
virDomainCapabilitiesPolicyTypeFromString,
|
||||||
tmp, virDomainFeatureTypeToString(val));
|
VIR_XML_PROP_NONE, &policy) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
|
||||||
} else {
|
def->features[val] = policy;
|
||||||
def->features[val] = VIR_TRISTATE_SWITCH_ABSENT;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case VIR_DOMAIN_FEATURE_VMCOREINFO:
|
case VIR_DOMAIN_FEATURE_VMCOREINFO:
|
||||||
case VIR_DOMAIN_FEATURE_HAP:
|
case VIR_DOMAIN_FEATURE_HAP:
|
||||||
@ -17964,44 +17963,29 @@ virDomainFeaturesDefParse(virDomainDef *def,
|
|||||||
}
|
}
|
||||||
|
|
||||||
case VIR_DOMAIN_FEATURE_GIC:
|
case VIR_DOMAIN_FEATURE_GIC:
|
||||||
if ((tmp = virXMLPropString(nodes[i], "version"))) {
|
if (virXMLPropEnum(nodes[i], "version", virGICVersionTypeFromString,
|
||||||
int gic_version = virGICVersionTypeFromString(tmp);
|
VIR_XML_PROP_NONZERO, &def->gic_version) < 0)
|
||||||
if (gic_version < 0 || gic_version == VIR_GIC_VERSION_NONE) {
|
|
||||||
virReportError(VIR_ERR_XML_ERROR,
|
|
||||||
_("malformed gic version: %s"), tmp);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
|
||||||
def->gic_version = gic_version;
|
|
||||||
}
|
|
||||||
def->features[val] = VIR_TRISTATE_SWITCH_ON;
|
def->features[val] = VIR_TRISTATE_SWITCH_ON;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_FEATURE_IOAPIC:
|
case VIR_DOMAIN_FEATURE_IOAPIC: {
|
||||||
tmp = virXMLPropString(nodes[i], "driver");
|
virDomainIOAPIC driver = VIR_DOMAIN_IOAPIC_NONE;
|
||||||
if (tmp) {
|
|
||||||
int value = virDomainIOAPICTypeFromString(tmp);
|
if (virXMLPropEnum(nodes[i], "driver", virDomainIOAPICTypeFromString,
|
||||||
if (value < 0 || value == VIR_DOMAIN_IOAPIC_NONE) {
|
VIR_XML_PROP_NONZERO, &driver) < 0)
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("Unknown driver mode: %s"),
|
|
||||||
tmp);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
|
||||||
def->features[val] = value;
|
def->features[val] = driver;
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case VIR_DOMAIN_FEATURE_HPT:
|
case VIR_DOMAIN_FEATURE_HPT:
|
||||||
tmp = virXMLPropString(nodes[i], "resizing");
|
if (virXMLPropEnum(nodes[i], "resizing",
|
||||||
if (tmp) {
|
virDomainHPTResizingTypeFromString,
|
||||||
int value = virDomainHPTResizingTypeFromString(tmp);
|
VIR_XML_PROP_NONZERO, &def->hpt_resizing) < 0)
|
||||||
if (value < 0 || value == VIR_DOMAIN_HPT_RESIZING_NONE) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("Unknown HPT resizing setting: %s"),
|
|
||||||
tmp);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
|
||||||
def->hpt_resizing = (virDomainHPTResizing) value;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (virParseScaledValue("./features/hpt/maxpagesize",
|
if (virParseScaledValue("./features/hpt/maxpagesize",
|
||||||
NULL,
|
NULL,
|
||||||
@ -18023,47 +18007,38 @@ virDomainFeaturesDefParse(virDomainDef *def,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_FEATURE_CFPC:
|
case VIR_DOMAIN_FEATURE_CFPC: {
|
||||||
tmp = virXMLPropString(nodes[i], "value");
|
virDomainCFPC value = VIR_DOMAIN_CFPC_NONE;
|
||||||
if (tmp) {
|
|
||||||
int value = virDomainCFPCTypeFromString(tmp);
|
|
||||||
if (value < 0 || value == VIR_DOMAIN_CFPC_NONE) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("Unknown value: %s"),
|
|
||||||
tmp);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
def->features[val] = value;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case VIR_DOMAIN_FEATURE_SBBC:
|
if (virXMLPropEnum(nodes[i], "value", virDomainCFPCTypeFromString,
|
||||||
tmp = virXMLPropString(nodes[i], "value");
|
VIR_XML_PROP_NONZERO, &value) < 0)
|
||||||
if (tmp) {
|
|
||||||
int value = virDomainSBBCTypeFromString(tmp);
|
|
||||||
if (value < 0 || value == VIR_DOMAIN_SBBC_NONE) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("Unknown value: %s"),
|
|
||||||
tmp);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
|
||||||
def->features[val] = value;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case VIR_DOMAIN_FEATURE_IBS:
|
|
||||||
tmp = virXMLPropString(nodes[i], "value");
|
|
||||||
if (tmp) {
|
|
||||||
int value = virDomainIBSTypeFromString(tmp);
|
|
||||||
if (value < 0 || value == VIR_DOMAIN_IBS_NONE) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("Unknown value: %s"),
|
|
||||||
tmp);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
def->features[val] = value;
|
def->features[val] = value;
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case VIR_DOMAIN_FEATURE_SBBC: {
|
||||||
|
virDomainSBBC value = VIR_DOMAIN_SBBC_NONE;
|
||||||
|
|
||||||
|
if (virXMLPropEnum(nodes[i], "value", virDomainSBBCTypeFromString,
|
||||||
|
VIR_XML_PROP_NONZERO, &value) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
def->features[val] = value;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case VIR_DOMAIN_FEATURE_IBS: {
|
||||||
|
virDomainIBS value = VIR_DOMAIN_IBS_NONE;
|
||||||
|
|
||||||
|
if (virXMLPropEnum(nodes[i], "value", virDomainIBSTypeFromString,
|
||||||
|
VIR_XML_PROP_NONZERO, &value) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
def->features[val] = value;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case VIR_DOMAIN_FEATURE_HTM:
|
case VIR_DOMAIN_FEATURE_HTM:
|
||||||
case VIR_DOMAIN_FEATURE_NESTED_HV:
|
case VIR_DOMAIN_FEATURE_NESTED_HV:
|
||||||
@ -18232,7 +18207,6 @@ virDomainFeaturesDefParse(virDomainDef *def,
|
|||||||
if (def->features[VIR_DOMAIN_FEATURE_XEN] == VIR_TRISTATE_SWITCH_ON) {
|
if (def->features[VIR_DOMAIN_FEATURE_XEN] == VIR_TRISTATE_SWITCH_ON) {
|
||||||
int feature;
|
int feature;
|
||||||
virTristateSwitch value;
|
virTristateSwitch value;
|
||||||
g_autofree char *ptval = NULL;
|
|
||||||
|
|
||||||
if ((n = virXPathNodeSet("./features/xen/*", ctxt, &nodes)) < 0)
|
if ((n = virXPathNodeSet("./features/xen/*", ctxt, &nodes)) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
@ -18260,25 +18234,11 @@ virDomainFeaturesDefParse(virDomainDef *def,
|
|||||||
if (value != VIR_TRISTATE_SWITCH_ON)
|
if (value != VIR_TRISTATE_SWITCH_ON)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if ((ptval = virXMLPropString(nodes[i], "mode"))) {
|
if (virXMLPropEnum(nodes[i], "mode",
|
||||||
int mode = virDomainXenPassthroughModeTypeFromString(ptval);
|
virDomainXenPassthroughModeTypeFromString,
|
||||||
|
VIR_XML_PROP_NONZERO,
|
||||||
if (mode < 0) {
|
&def->xen_passthrough_mode) < 0)
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("unsupported mode '%s' for Xen passthrough feature"),
|
|
||||||
ptval);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
|
||||||
|
|
||||||
if (mode != VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SYNC_PT &&
|
|
||||||
mode != 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 = mode;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* coverity[dead_error_begin] */
|
/* coverity[dead_error_begin] */
|
||||||
@ -18303,24 +18263,16 @@ virDomainFeaturesDefParse(virDomainDef *def,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (def->features[VIR_DOMAIN_FEATURE_MSRS] == VIR_TRISTATE_SWITCH_ON) {
|
if (def->features[VIR_DOMAIN_FEATURE_MSRS] == VIR_TRISTATE_SWITCH_ON) {
|
||||||
g_autofree char *tmp = NULL;
|
virDomainMsrsUnknown unknown;
|
||||||
xmlNodePtr node = NULL;
|
xmlNodePtr node = NULL;
|
||||||
if ((node = virXPathNode("./features/msrs", ctxt)) == NULL)
|
if ((node = virXPathNode("./features/msrs", ctxt)) == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (!(tmp = virXMLPropString(node, "unknown"))) {
|
if (virXMLPropEnum(node, "unknown", virDomainMsrsUnknownTypeFromString,
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
VIR_XML_PROP_REQUIRED, &unknown) < 0)
|
||||||
_("missing 'unknown' attribute for feature '%s'"),
|
|
||||||
virDomainFeatureTypeToString(VIR_DOMAIN_FEATURE_MSRS));
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
|
||||||
|
|
||||||
if ((def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] = virDomainMsrsUnknownTypeFromString(tmp)) < 0) {
|
def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] = unknown;
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("unknown 'unknown' value '%s'"),
|
|
||||||
tmp);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0)
|
if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0)
|
||||||
|
@ -1 +1 @@
|
|||||||
XML error: malformed gic version: none
|
XML error: Invalid value for attribute 'version' in element 'gic': 'none'.
|
||||||
|
Loading…
Reference in New Issue
Block a user