10:29 p.m.
It can't fail, so the caller doesn't need to check the return.
Signed-off-by: Laine Stump <laine(a)redhat.com>
---
src/conf/domain_conf.c | 25 +++++++++----------------
src/libxl/libxl_domain.c | 3 +--
src/qemu/qemu_postparse.c | 12 ++++++------
src/vbox/vbox_common.c | 13 ++-----------
src/vmx/vmx.c | 12 ++++--------
5 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ce7501f2b3..837b306919 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16490,10 +16490,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;
@@ -16504,21 +16501,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;
@@ -16538,9 +16532,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;
}
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index c7ba5636c4..596503c09f 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -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;
}
diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c
index 0de48916f4..71d772bfa0 100644
--- a/src/qemu/qemu_postparse.c
+++ b/src/qemu/qemu_postparse.c
@@ -1354,9 +1354,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);
}
}
@@ -1375,9 +1375,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);
}
}
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index de3c9989a5..4387d706d6 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -3230,17 +3230,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;
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 23a8a35360..8d10b6e9e8 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -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) */
--
2.47.1