[libvirt PATCH 19/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainAudioCommonParse
Tim Wiederhake
twiederh at redhat.com
Thu Mar 18 08:00:58 UTC 2021
Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
src/conf/domain_conf.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 360528ef1e..4e7f5031e7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13772,8 +13772,6 @@ virDomainAudioCommonParse(virDomainAudioIOCommonPtr def,
xmlNodePtr node,
xmlXPathContextPtr ctxt)
{
- g_autofree char *mixingEngine = virXMLPropString(node, "mixingEngine");
- g_autofree char *fixedSettings = virXMLPropString(node, "fixedSettings");
g_autofree char *voices = virXMLPropString(node, "voices");
g_autofree char *bufferLength = virXMLPropString(node, "bufferLength");
xmlNodePtr settings;
@@ -13782,21 +13780,11 @@ virDomainAudioCommonParse(virDomainAudioIOCommonPtr def,
ctxt->node = node;
settings = virXPathNode("./settings", ctxt);
- if (mixingEngine &&
- ((def->mixingEngine =
- virTristateBoolTypeFromString(mixingEngine)) <= 0)) {
- virReportError(VIR_ERR_XML_ERROR,
- _("unknown 'mixingEngine' value '%s'"), mixingEngine);
+ if (virXMLPropYesNo(node, "mixingEngine", &def->mixingEngine) < 0)
return -1;
- }
- if (fixedSettings &&
- ((def->fixedSettings =
- virTristateBoolTypeFromString(fixedSettings)) <= 0)) {
- virReportError(VIR_ERR_XML_ERROR,
- _("unknown 'fixedSettings' value '%s'"), fixedSettings);
+ if (virXMLPropYesNo(node, "fixedSettings", &def->fixedSettings) < 0)
return -1;
- }
if (def->fixedSettings == VIR_TRISTATE_BOOL_YES &&
def->mixingEngine != VIR_TRISTATE_BOOL_YES) {
--
2.26.2
More information about the libvir-list
mailing list