[PATCH 08/17] conf: stop checking for NULL return from virDomainControllerDefNew()

[Laine Stump <laine@xxxxxxxxxx>]

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

Signed-off-by: Laine Stump <laine@xxxxxxxxxx>
---
 src/conf/domain_conf.c     | 8 ++------
 src/hyperv/hyperv_driver.c | 6 +-----
 src/libxl/libxl_conf.c     | 4 +---
 src/libxl/libxl_driver.c   | 5 +----
 src/libxl/xen_xl.c         | 4 +---
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b14712997b..ce7501f2b3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8571,8 +8571,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xmlopt,
                        VIR_XML_PROP_NONE, &type) < 0)
         return NULL;
 
-    if (!(def = virDomainControllerDefNew(type)))
-        return NULL;
+    def = virDomainControllerDefNew(type);
 
     if ((model = virXMLPropString(node, "model"))) {
         if ((def->model = virDomainControllerModelTypeFromString(def, model)) < 0) {
@@ -16459,10 +16458,7 @@ virDomainDefAddController(virDomainDef *def,
                           int idx,
                           int model)
 {
-    virDomainControllerDef *cont;
-
-    if (!(cont = virDomainControllerDefNew(type)))
-        return NULL;
+    virDomainControllerDef *cont = virDomainControllerDefNew(type);
 
     if (idx < 0)
         idx = virDomainControllerFindUnusedIndex(def, type);
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 43ccb9cbd7..66286cc756 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -1174,13 +1174,9 @@ hypervDomainDefAppendController(virDomainDef *def,
                                 int idx,
                                 virDomainControllerType controllerType)
 {
-    virDomainControllerDef *controller = NULL;
-
-    if (!(controller = virDomainControllerDefNew(controllerType)))
-        return -1;
+    virDomainControllerDef *controller = virDomainControllerDefNew(controllerType);
 
     controller->idx = idx;
-
     VIR_APPEND_ELEMENT(def->controllers, def->ncontrollers, controller);
 
     return 0;
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index c404226e43..e06655605b 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -2102,9 +2102,7 @@ libxlMakeDefaultUSBControllers(virDomainDef *def,
     x_controllers = g_new0(libxl_device_usbctrl, ncontrollers);
 
     for (i = 0; i < ncontrollers; i++) {
-        if (!(l_controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB)))
-            goto error;
-
+        l_controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB);
         l_controller->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2;
         l_controller->idx = i;
         l_controller->opts.usbopts.ports = 8;
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 45d15df8b8..7d214a07d3 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3221,10 +3221,7 @@ libxlDomainAttachHostUSBDevice(libxlDriverPrivate *driver,
 
     if (ports <= usbdevs) {
         /* no free ports, we will create a new usb controller */
-        virDomainControllerDef *controller;
-
-        if (!(controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB)))
-            goto cleanup;
+        virDomainControllerDef *controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB);
 
         controller->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2;
         controller->idx = -1;
diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index 53f6871efc..30dffcac20 100644
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -861,9 +861,7 @@ xenParseXLUSBController(virConf *conf, virDomainDef *def)
             else
                 usbctrl_type = VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2;
 
-            if (!(controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB)))
-                return -1;
-
+            controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB);
             controller->type = VIR_DOMAIN_CONTROLLER_TYPE_USB;
             controller->model = usbctrl_type;
             controller->opts.usbopts.ports = usbctrl_ports;
-- 
2.47.1