[PATCH 13/17] conf: change virDomainDefMaybeAddHostdevSCSIcontroller() to return void

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



It can't fail.

Signed-off-by: Laine Stump <laine@xxxxxxxxxx>
---
 src/conf/domain_conf.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 611b6a44c8..d3e95a2f92 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17200,7 +17200,7 @@ virDomainFeaturesDefParse(virDomainDef *def,
 }
 
 
-static int
+static void
 virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDef *def)
 {
     /* Look for any hostdev scsi dev */
@@ -17227,12 +17227,10 @@ virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDef *def)
     }
 
     if (maxController == -1)
-        return 0;
+        return;
 
     for (i = 0; i <= maxController; i++)
         virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, i, newModel);
-
-    return 0;
 }
 
 
@@ -19497,8 +19495,7 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
          * post processing) because that will result in the failure to
          * load the controller during hostdev hotplug.
          */
-        if (virDomainDefMaybeAddHostdevSCSIcontroller(def) < 0)
-            return NULL;
+        virDomainDefMaybeAddHostdevSCSIcontroller(def);
     }
     VIR_FREE(nodes);
 
@@ -22379,8 +22376,7 @@ virDomainDefAddImplicitControllers(virDomainDef *def)
     if (virDomainDefMaybeAddSmartcardController(def) < 0)
         return -1;
 
-    if (virDomainDefMaybeAddHostdevSCSIcontroller(def) < 0)
-        return -1;
+    virDomainDefMaybeAddHostdevSCSIcontroller(def);
 
     return 0;
 }
-- 
2.47.1




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux