From: Laine Stump <laine@redhat.com>
Date: Wed, 12 Feb 2025 03:59:46 +0000 (-0500)
Subject: conf: change virDomainDefAddImplicitControllers() to return void
X-Git-Tag: v11.2.0-rc1~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25270737d357258a7a336daea5a7995a8e799196;p=thirdparty%2Flibvirt.git

conf: change virDomainDefAddImplicitControllers() 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 e945a0740c..f42b7075ad 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22346,7 +22346,7 @@ virDomainDefMaybeAddSmartcardController(virDomainDef *def)
  * in the XML. This is for compat with existing apps which will
  * not know/care about <controller> info in the XML
  */
-static int
+static void
 virDomainDefAddImplicitControllers(virDomainDef *def)
 {
     virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI,
@@ -22361,8 +22361,6 @@ virDomainDefAddImplicitControllers(virDomainDef *def)
     virDomainDefMaybeAddVirtioSerialController(def);
     virDomainDefMaybeAddSmartcardController(def);
     virDomainDefMaybeAddHostdevSCSIcontroller(def);
-
-    return 0;
 }
 
 static int
@@ -22389,8 +22387,7 @@ virDomainDefAddImplicitDevices(virDomainDef *def, virDomainXMLOption *xmlopt)
         if (virDomainDefAddConsoleCompat(def) < 0)
             return -1;
     }
-    if (virDomainDefAddImplicitControllers(def) < 0)
-        return -1;
+    virDomainDefAddImplicitControllers(def);
 
     if (virDomainDefAddImplicitVideo(def, xmlopt) < 0)
         return -1;