[PATCH 04/21] domain_conf.c: move boot related timeouts check to post parse

[Daniel Henrique Barboza]

This patch creates a new function, virDomainDefBootPostParse(),
to host the validation of boot menu timeout and rebootTimeout
to post parse time. The checks in virDomainDefParseBootXML()
were changed to throw VIR_ERR_XML_ERROR in case of parse
error of those values.

Signed-off-by: Daniel Henrique Barboza <danielhb413 at gmail.com>
---
 src/conf/domain_conf.c | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f0300b870d..c2e5ed5680 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5847,6 +5847,28 @@ virDomainDefBootOrderPostParse(virDomainDefPtr def)
 }
 
 
+static int
+virDomainDefBootPostParse(virDomainDefPtr def)
+{
+    if (def->os.bm_timeout_set && def->os.bm_timeout > 65535) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("invalid value for boot menu timeout, "
+                         "must be in range [0,65535]"));
+        return -1;
+    }
+
+    if (def->os.bios.rt_set &&
+        (def->os.bios.rt_delay < -1 || def->os.bios.rt_delay > 65535)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("invalid value for rebootTimeout, "
+                         "must be in range [-1,65535]"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
 static int
 virDomainDefPostParseVideo(virDomainDefPtr def,
                            void *opaque)
@@ -5917,6 +5939,9 @@ virDomainDefPostParseCommon(virDomainDefPtr def,
     if (virDomainDefRejectDuplicatePanics(def) < 0)
         return -1;
 
+    if (virDomainDefBootPostParse(def) < 0)
+        return -1;
+
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM &&
         !(data->xmlopt->config.features & VIR_DOMAIN_DEF_FEATURE_NO_BOOT_ORDER) &&
         virDomainDefBootOrderPostParse(def) < 0)
@@ -18935,11 +18960,9 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt,
 
         tmp = virXMLPropString(node, "timeout");
         if (tmp && def->os.bootmenu == VIR_TRISTATE_BOOL_YES) {
-            if (virStrToLong_uip(tmp, NULL, 0, &def->os.bm_timeout) < 0 ||
-                def->os.bm_timeout > 65535) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("invalid value for boot menu timeout, "
-                                 "must be in range [0,65535]"));
+            if (virStrToLong_uip(tmp, NULL, 0, &def->os.bm_timeout) < 0) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("invalid value for boot menu timeout"));
                 return -1;
             }
             def->os.bm_timeout_set = true;
@@ -18960,11 +18983,9 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt,
         if (tmp) {
             /* that was really just for the check if it is there */
 
-            if (virStrToLong_i(tmp, NULL, 0, &def->os.bios.rt_delay) < 0 ||
-                def->os.bios.rt_delay < -1 || def->os.bios.rt_delay > 65535) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("invalid value for rebootTimeout, "
-                                 "must be in range [-1,65535]"));
+            if (virStrToLong_i(tmp, NULL, 0, &def->os.bios.rt_delay) < 0) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("invalid value for rebootTimeout"));
                 return -1;
             }
             def->os.bios.rt_set = true;
-- 
2.26.2