shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 06:50:22 +03:00
Code Releases Activity

conf: change virDomainDefAddDiskControllersForType() to return void

Browse Source 
It can't fail.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Laine Stump 2025-02-11 22:51:32 -05:00
parent 7cfcfcc403
commit 74e36dfce0
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/conf/domain_conf.c
View File

@ -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;