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: stop checking for NULL return from virDomainDefAddController()

Browse Source 
It can't fail, so the caller doesn't need to check the return.

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 21:31:09 -05:00
parent b62ce44a61
commit b0ef70aca9
5 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/conf/domain_conf.c
View File

@ -16503,10 +16503,7 @@ virDomainDefAddUSBController(virDomainDef *def, int idx, int model)
{
virDomainControllerDef *cont; /* this is a *copy* of the virDomainControllerDef */
cont = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB,
idx, model);
if (!cont)
return -1;
cont = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB, idx, model);
if (model != VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_EHCI1)
return 0;
@ -16517,21 +16514,18 @@ virDomainDefAddUSBController(virDomainDef *def, int idx, int model)
idx = cont->idx; /* in case original request was "-1" */
if (!(cont = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB,
idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI1)))
return -1;
cont = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB,
idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI1);
cont->info.mastertype = VIR_DOMAIN_CONTROLLER_MASTER_USB;
cont->info.master.usb.startport = 0;
if (!(cont = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB,
idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI2)))
return -1;
cont = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB,
idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI2);
cont->info.mastertype = VIR_DOMAIN_CONTROLLER_MASTER_USB;
cont->info.master.usb.startport = 2;
if (!(cont = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB,
idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3)))
return -1;
cont = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_USB,
idx, VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3);
cont->info.mastertype = VIR_DOMAIN_CONTROLLER_MASTER_USB;
cont->info.master.usb.startport = 4;
@ -16551,9 +16545,8 @@ virDomainDefMaybeAddController(virDomainDef *def,
if (idx >= 0 && virDomainControllerFind(def, type, idx) >= 0)
return 0;
if (virDomainDefAddController(def, type, idx, model))
return 1;
return -1;
virDomainDefAddController(def, type, idx, model);
return 1;
}

3
src/libxl/libxl_domain.c
View File

@ -291,8 +291,7 @@ libxlDomainDefPostParse(virDomainDef *def,
/* add implicit xenbus device */
if (virDomainControllerFindByType(def, VIR_DOMAIN_CONTROLLER_TYPE_XENBUS) == -1)
if (virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_XENBUS, -1, -1) == NULL)
return -1;
virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_XENBUS, -1, -1);
return 0;
}

12
src/qemu/qemu_postparse.c
View File

@ -1355,9 +1355,9 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
virDomainControllerModelPCITypeToString(def->controllers[pciRoot]->model));
return -1;
}
} else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0,
VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT)) {
return -1;
} else {
virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0,
VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT);
}
}
@ -1376,9 +1376,9 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
virDomainControllerModelPCITypeToString(def->controllers[pciRoot]->model));
return -1;
}
} else if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0,
VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT)) {
return -1;
} else {
virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0,
VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT);
}
}

13
src/vbox/vbox_common.c
View File

@ -3220,17 +3220,8 @@ vboxDumpStorageControllers(virDomainDef *def, IMachine *machine)
goto cleanup;
}
if (type != VIR_DOMAIN_CONTROLLER_TYPE_LAST) {
virDomainControllerDef *cont;
cont = virDomainDefAddController(def, type, -1, model);
if (!cont) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to add %1$s controller type definition"),
virDomainControllerTypeToString(type));
goto cleanup;
}
}
if (type != VIR_DOMAIN_CONTROLLER_TYPE_LAST)
virDomainDefAddController(def, type, -1, model);
}
ret = 0;

12
src/vmx/vmx.c
View File

@ -1756,9 +1756,8 @@ virVMXParseConfig(virVMXContext *ctx,
if (def->ndisks != 0) {
virDomainDeviceInfo *info = &def->disks[def->ndisks - 1]->info;
for (controller = 0; controller <= info->addr.drive.controller; controller++) {
if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI,
controller, scsi_virtualDev[controller]))
goto cleanup;
virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI,
controller, scsi_virtualDev[controller]);
}
saved_ndisks = def->ndisks;
}
@ -1799,11 +1798,8 @@ virVMXParseConfig(virVMXContext *ctx,
* currently used by a disk */
if (def->ndisks - saved_ndisks != 0) {
virDomainDeviceInfo *info = &def->disks[def->ndisks - 1]->info;
for (controller = 0; controller <= info->addr.drive.controller; controller++) {
if (!virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA,
controller, -1))
goto cleanup;
}
for (controller = 0; controller <= info->addr.drive.controller; controller++)
virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, controller, -1);
}
/* def:disks (ide) */