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

conf: change virDomainDefMaybeAddSmartcardController() 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 64ec520589..e945a0740c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22307,7 +22307,7 @@ virDomainDefMaybeAddVirtioSerialController(virDomainDef *def)
 }
 
 
-static int
+static void
 virDomainDefMaybeAddSmartcardController(virDomainDef *def)
 {
     /* Look for any smartcard devs */
@@ -22338,8 +22338,6 @@ virDomainDefMaybeAddSmartcardController(virDomainDef *def)
 
         virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_CCID, idx, -1);
     }
-
-    return 0;
 }
 
 /*
@@ -22361,10 +22359,7 @@ virDomainDefAddImplicitControllers(virDomainDef *def)
                                           VIR_DOMAIN_DISK_BUS_SATA);
 
     virDomainDefMaybeAddVirtioSerialController(def);
-
-    if (virDomainDefMaybeAddSmartcardController(def) < 0)
-        return -1;
-
+    virDomainDefMaybeAddSmartcardController(def);
     virDomainDefMaybeAddHostdevSCSIcontroller(def);
 
     return 0;