conf: stop checking for NULL return from virDomainControllerDefNew()

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 5edf326574deaa5551c7eb5a1c693b79571889a5..381ee283956bb559784a2ba9c03aae8d8fe3aa36 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8581,8 +8581,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) {
@@ -16472,10 +16471,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 43ccb9cbd7981679dd8cdbce2a7e0164b92a9f88..66286cc756534920bebe042038f10c946d79c440 100644 (file)
--- 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 c404226e436da30bbd267a26ac4f672ba39c121e..e06655605bc2df1dfdfbad7c08444e5ad83184d8 100644 (file)
--- 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 585959de88ea6df68593625dc372854b498371d3..0fb256e5c06df04f9c3ad102e7618756eed83c66 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3205,10 +3205,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 482b1516661e7308827ff47f34d8785f1d710112..c8371fac02ebfa267c8b358d9e0acec4889e89ad 100644 (file)
--- 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;