From 74e36dfce0b794985d17e7b67cbc78a97361ee06 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Tue, 11 Feb 2025 22:51:32 -0500 Subject: [PATCH] conf: change virDomainDefAddDiskControllersForType() to return void It can't fail. Signed-off-by: Laine Stump Reviewed-by: Martin Kletzander --- src/conf/domain_conf.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c0bb97d90b..ec72bb5117 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22248,7 +22248,7 @@ virDomainDefCheckABIStability(virDomainDef *src, } -static int +static void virDomainDefAddDiskControllersForType(virDomainDef *def, virDomainControllerType controllerType, int diskBus) @@ -22268,12 +22268,10 @@ virDomainDefAddDiskControllersForType(virDomainDef *def, } if (maxController == -1) - return 0; + return; for (i = 0; i <= maxController; i++) virDomainDefMaybeAddController(def, controllerType, i, -1); - - return 0; } @@ -22355,25 +22353,14 @@ virDomainDefMaybeAddSmartcardController(virDomainDef *def) static int virDomainDefAddImplicitControllers(virDomainDef *def) { - if (virDomainDefAddDiskControllersForType(def, - VIR_DOMAIN_CONTROLLER_TYPE_SCSI, - VIR_DOMAIN_DISK_BUS_SCSI) < 0) - return -1; - - if (virDomainDefAddDiskControllersForType(def, - VIR_DOMAIN_CONTROLLER_TYPE_FDC, - VIR_DOMAIN_DISK_BUS_FDC) < 0) - return -1; - - if (virDomainDefAddDiskControllersForType(def, - VIR_DOMAIN_CONTROLLER_TYPE_IDE, - VIR_DOMAIN_DISK_BUS_IDE) < 0) - return -1; - - if (virDomainDefAddDiskControllersForType(def, - VIR_DOMAIN_CONTROLLER_TYPE_SATA, - VIR_DOMAIN_DISK_BUS_SATA) < 0) - return -1; + virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, + VIR_DOMAIN_DISK_BUS_SCSI); + virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_FDC, + VIR_DOMAIN_DISK_BUS_FDC); + virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_IDE, + VIR_DOMAIN_DISK_BUS_IDE); + virDomainDefAddDiskControllersForType(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, + VIR_DOMAIN_DISK_BUS_SATA); if (virDomainDefMaybeAddVirtioSerialController(def) < 0) return -1; -- 2.47.3