conf: stop checking for NULL return from virDomainDefAddController()

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>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 381ee283956bb559784a2ba9c03aae8d8fe3aa36..0721a4712a3151acd9472099f23602e07dbb1c42 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -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;
 }
 
 

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index c7ba5636c417b7cab0590b33c106a3a862aad17f..596503c09fdb49f4278eb1e0caf20b899d864db0 100644 (file)
--- 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 ce74d0365fc218fa8c08b8dbf5f7d0351de03c06..2999aa01c8ed0cebacf8529f0730f35c113484f6 100644 (file)
--- a/src/qemu/qemu_postparse.c
+++ b/src/qemu/qemu_postparse.c
@@ -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);
         }
     }
 

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 2121d7e2d1cf96b0fdbb8176e8bbb84e7a66a78e..7d157e065e6ba6b3efd9bcfaabbc36954bec4a58 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -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;

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 23a8a353604a48f72a7099b781d99e0def713533..8d10b6e9e8abd72eaae66bb8272ec33f0f1c6b07 100644 (file)
--- 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) */