External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainFeaturesDefParse: Inline MSRS parsing

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-06-22 14:22:54 +02:00 committed by Michal Privoznik
parent eeb94215b0
commit 2c2fe23bef
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/conf/domain_conf.c
View File

@ -17518,10 +17518,21 @@ virDomainFeaturesDefParse(virDomainDef *def,
case VIR_DOMAIN_FEATURE_PAE:
case VIR_DOMAIN_FEATURE_VIRIDIAN:
case VIR_DOMAIN_FEATURE_PRIVNET:
case VIR_DOMAIN_FEATURE_MSRS:
def->features[val] = VIR_TRISTATE_SWITCH_ON;
break;
case VIR_DOMAIN_FEATURE_MSRS: {
virDomainMsrsUnknown unknown;
if (virXMLPropEnum(nodes[i], "unknown",
virDomainMsrsUnknownTypeFromString,
VIR_XML_PROP_REQUIRED, &unknown) < 0)
return -1;
def->features[val] = VIR_TRISTATE_SWITCH_ON;
def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] = unknown;
break;
}
case VIR_DOMAIN_FEATURE_HYPERV:
if (virDomainFeaturesHyperVDefParse(def, nodes[i]) < 0)
return -1;
@ -17694,19 +17705,6 @@ virDomainFeaturesDefParse(virDomainDef *def,
}
VIR_FREE(nodes);
if (def->features[VIR_DOMAIN_FEATURE_MSRS] == VIR_TRISTATE_SWITCH_ON) {
virDomainMsrsUnknown unknown;
xmlNodePtr node = NULL;
if ((node = virXPathNode("./features/msrs", ctxt)) == NULL)
return -1;
if (virXMLPropEnum(node, "unknown", virDomainMsrsUnknownTypeFromString,
VIR_XML_PROP_REQUIRED, &unknown) < 0)
return -1;
def->msrs_features[VIR_DOMAIN_MSRS_UNKNOWN] = unknown;
}
if ((n = virXPathNodeSet("./features/capabilities/*", ctxt, &nodes)) < 0)
return -1;