[PATCH 16/17] conf: change virDomainDefMaybeAddSmartcardController() to return void
It can't fail.
Signed-off-by: Laine Stump <laine(a)redhat.com>
---
src/conf/domain_conf.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fe816dfd6d..c4bdf58788 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22302,7 +22302,7 @@ virDomainDefMaybeAddVirtioSerialController(virDomainDef *def)
}
-static int
+static void
virDomainDefMaybeAddSmartcardController(virDomainDef *def)
{
/* Look for any smartcard devs */
@@ -22333,8 +22333,6 @@ virDomainDefMaybeAddSmartcardController(virDomainDef *def)
virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_CCID, idx, -1);
}
-
- return 0;
}
/*
@@ -22356,10 +22354,7 @@ virDomainDefAddImplicitControllers(virDomainDef *def)
VIR_DOMAIN_DISK_BUS_SATA);
virDomainDefMaybeAddVirtioSerialController(def);
-
- if (virDomainDefMaybeAddSmartcardController(def) < 0)
- return -1;
-
+ virDomainDefMaybeAddSmartcardController(def);
virDomainDefMaybeAddHostdevSCSIcontroller(def);
return 0;
--
2.47.1