]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: Add return value to virDomainDefPostParseOs()
authorAndrea Bolognani <abologna@redhat.com>
Wed, 15 Jun 2022 09:34:12 +0000 (11:34 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Fri, 1 Jul 2022 13:10:29 +0000 (15:10 +0200)
There are currently no failure scenarios for the function, but
we're about to add one.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/domain_conf.c

index 3977b5040f67cbdb09fd900d5af611542d8d1201..d88d352fb6a757502ef5d603573fd1787e9eb518 100644 (file)
@@ -4873,7 +4873,7 @@ virDomainDefPostParseMemory(virDomainDef *def,
 }
 
 
-static void
+static int
 virDomainDefPostParseOs(virDomainDef *def)
 {
     if (def->os.firmwareFeatures &&
@@ -4887,13 +4887,15 @@ virDomainDefPostParseOs(virDomainDef *def)
     }
 
     if (!def->os.loader)
-        return;
+        return 0;
 
     if (def->os.loader->path &&
         def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_NONE) {
         /* By default, loader is type of 'rom' */
         def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_ROM;
     }
+
+    return 0;
 }
 
 
@@ -6214,7 +6216,8 @@ virDomainDefPostParseCommon(virDomainDef *def,
     if (virDomainDefPostParseMemory(def, data->parseFlags) < 0)
         return -1;
 
-    virDomainDefPostParseOs(def);
+    if (virDomainDefPostParseOs(def) < 0)
+        return -1;
 
     virDomainDefPostParseMemtune(def);