From: Laine Stump <laine@redhat.com>
Date: Wed, 12 Feb 2025 03:51:32 +0000 (-0500)
Subject: conf: change virDomainDefAddDiskControllersForType() to return void
X-Git-Tag: v11.2.0-rc1~274
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74e36dfce0b794985d17e7b67cbc78a97361ee06;p=thirdparty%2Flibvirt.git

conf: change virDomainDefAddDiskControllersForType() to return void

It can't fail.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c0bb97d90b..ec72bb5117 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22248,7 +22248,7 @@ virDomainDefCheckABIStability(virDomainDef *src,
 }
 
 
-static int
+static void
 virDomainDefAddDiskControllersForType(virDomainDef *def,
                                       virDomainControllerType controllerType,
                                       int diskBus)
@@ -22268,12 +22268,10 @@ virDomainDefAddDiskControllersForType(virDomainDef *def,
     }
 
     if (maxController == -1)
-        return 0;
+        return;
 
     for (i = 0; i <= maxController; i++)
         virDomainDefMaybeAddController(def, controllerType, i, -1);
-
-    return 0;
 }
 
 
@@ -22355,25 +22353,14 @@ virDomainDefMaybeAddSmartcardController(virDomainDef *def)
 static int
 virDomainDefAddImplicitControllers(virDomainDef *def)
 {
-    if (virDomainDefAddDiskControllersForType(def,
-                                              VIR_DOMAIN_CONTROLLER_TYPE_SCSI,
-                                              VIR_DOMAIN_DISK_BUS_SCSI) < 0)
-        return -1;
-
-    if (virDomainDefAddDiskControllersForType(def,
-                                              VIR_DOMAIN_CONTROLLER_TYPE_FDC,
-                                              VIR_DOMAIN_DISK_BUS_FDC) < 0)
-        return -1;
-
-    if (virDomainDefAddDiskControllersForType(def,
-                                              VIR_DOMAIN_CONTROLLER_TYPE_IDE,
-                                              VIR_DOMAIN_DISK_BUS_IDE) < 0)
-        return -1;
-
-    if (virDomainDefAddDiskControllersForType(def,
-                                              VIR_DOMAIN_CONTROLLER_TYPE_SATA,
-                                              VIR_DOMAIN_DISK_BUS_SATA) < 0)
-        return -1;
+    virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI,
+                                          VIR_DOMAIN_DISK_BUS_SCSI);
+    virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_FDC,
+                                          VIR_DOMAIN_DISK_BUS_FDC);
+    virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_IDE,
+                                          VIR_DOMAIN_DISK_BUS_IDE);
+    virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA,
+                                          VIR_DOMAIN_DISK_BUS_SATA);
 
     if (virDomainDefMaybeAddVirtioSerialController(def) < 0)
         return -1;