[PATCH 17/17] conf: change virDomainDefAddImplicitControllers() to return void
It can't fail.
Signed-off-by: Laine Stump <laine(a)redhat.com>
---
src/conf/domain_conf.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c4bdf58788..21fe1502db 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22341,7 +22341,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,
@@ -22356,8 +22356,6 @@ virDomainDefAddImplicitControllers(virDomainDef *def)
virDomainDefMaybeAddVirtioSerialController(def);
virDomainDefMaybeAddSmartcardController(def);
virDomainDefMaybeAddHostdevSCSIcontroller(def);
-
- return 0;
}
static int
@@ -22384,8 +22382,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;
--
2.47.1