domain: conf: Better errors on bad os <type> values

If no <os><type> was specified:
  before: unknown OS type no OS type
  after : xml error: an os <type> must be specified

If an <os><type> is specified that's not in our capabiliities data:
  before: unknown OS type: $type
  after : unsupported configuration: no support found for os <type> '$type'

VIR_ERR_OS_TYPE is now unused (as it should be frankly) so drop its strings
as well to save our translators some effort.

(cherry picked from commit 3700c065cde30ff3f70cc3a029279c79c2337a54)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9b7ae3f2ae7f246a7acb3397dae93f239cb0bffe..d9435233f8364c4c8e2a3673a7ad4d586a4f7d9a 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13951,8 +13951,8 @@ virDomainDefParseXML(xmlDocPtr xml,
             if (VIR_STRDUP(def->os.type, "xen") < 0)
                 goto error;
         } else {
-            virReportError(VIR_ERR_OS_TYPE,
-                           "%s", _("no OS type"));
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("an os <type> must be specified"));
             goto error;
         }
     }
@@ -13969,8 +13969,9 @@ virDomainDefParseXML(xmlDocPtr xml,
     }
 
     if (!virCapabilitiesSupportsGuestOSType(caps, def->os.type)) {
-        virReportError(VIR_ERR_OS_TYPE,
-                       "%s", def->os.type);
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("no support found for os <type> '%s'"),
+                       def->os.type);
         goto error;
     }