From 789d302e8d70571030b1a8f5feb608e155bf8ab2 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 6 Oct 2022 12:30:26 +0200 Subject: [PATCH] conf: domain: Parse 'type' attribute via virXMLPropEnum in virSysinfoParseXML MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Rewrite the code to use the simple helper. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f32eeaa94f..2537aa808f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12395,8 +12395,6 @@ virSysinfoParseXML(xmlNodePtr node, { VIR_XPATH_NODE_AUTORESTORE(ctxt) virSysinfoDef *def; - g_autofree char *typeStr = NULL; - int type; ctxt->node = node; @@ -12408,18 +12406,9 @@ virSysinfoParseXML(xmlNodePtr node, def = g_new0(virSysinfoDef, 1); - typeStr = virXMLPropString(node, "type"); - if (typeStr == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("sysinfo must contain a type attribute")); - goto error; - } - if ((type = virSysinfoTypeFromString(typeStr)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown sysinfo type '%s'"), typeStr); + if (virXMLPropEnum(node, "type", virSysinfoTypeFromString, + VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - } - def->type = type; switch (def->type) { case VIR_SYSINFO_SMBIOS: -- 2.39.5