From 7cfcfcc403ac21146d2efda6790e5cce5fcb5df5 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Tue, 11 Feb 2025 22:48:07 -0500 Subject: [PATCH] conf: change virDomainDefMaybeAddHostdevSCSIcontroller() to return void It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- 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 6a2bbb1afa..c0bb97d90b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17211,7 +17211,7 @@ virDomainFeaturesDefParse(virDomainDef *def, } -static int +static void virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDef *def) { /* Look for any hostdev scsi dev */ @@ -17238,12 +17238,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; } @@ -19500,8 +19498,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); @@ -22384,8 +22381,7 @@ virDomainDefAddImplicitControllers(virDomainDef *def) if (virDomainDefMaybeAddSmartcardController(def) < 0) return -1; - if (virDomainDefMaybeAddHostdevSCSIcontroller(def) < 0) - return -1; + virDomainDefMaybeAddHostdevSCSIcontroller(def); return 0; } -- 2.47.3