conf: change virDomainHostdevInsert() to return void

We haven't checked for memalloc failure in many years, and that was
the only reason this function would have ever failed.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 87f87bbe56b25eaab7dc41a0f0f13e0d33ce6b42..50dc4a33a637a15f812fc416113091588fb92979 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14465,12 +14465,10 @@ virDomainChrTargetTypeToString(int deviceType,
     return type;
 }
 
-int
+void
 virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev)
 {
     VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev);
-
-    return 0;
 }
 
 virDomainHostdevDef *
@@ -14886,9 +14884,8 @@ virDomainDiskRemoveByName(virDomainDef *def, const char *name)
 int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net)
 {
     /* hostdev net devices must also exist in the hostdevs array */
-    if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV &&
-        virDomainHostdevInsert(def, &net->data.hostdev.def) < 0)
-        return -1;
+    if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)
+        virDomainHostdevInsert(def, &net->data.hostdev.def);
 
     VIR_APPEND_ELEMENT(def->nets, def->nnets, net);
     return 0;
@@ -19281,10 +19278,8 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
          * where the actual network type is already known to be
          * hostdev) must also be in the hostdevs array.
          */
-        if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV &&
-            virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net)) < 0) {
-            return NULL;
-        }
+        if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_HOSTDEV)
+            virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net));
     }
     VIR_FREE(nodes);
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index e51c74b6d18e1b811709eb9eb26f4e8879f8df55..9da6586e669ba71548c28ee85737943f2d7fe57c 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3994,7 +3994,7 @@ virDomainNetDef *virDomainNetRemove(virDomainDef *def, size_t i);
 virDomainNetDef *virDomainNetRemoveByObj(virDomainDef *def, virDomainNetDef *net);
 void virDomainNetRemoveHostdev(virDomainDef *def, virDomainNetDef *net);
 
-int virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev);
+void virDomainHostdevInsert(virDomainDef *def, virDomainHostdevDef *hostdev);
 virDomainHostdevDef *
 virDomainHostdevRemove(virDomainDef *def, size_t i);
 int virDomainHostdevFind(virDomainDef *def, virDomainHostdevDef *match,

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index a049cdb30f45d846d0b19ede6232bea533322ba7..680516092334cd38829f0246371df78c8fc489e1 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -1014,10 +1014,7 @@ libxlNetworkPrepareDevices(virDomainDef *def)
             /* Each type='hostdev' network device must also have a
              * corresponding entry in the hostdevs array.
              */
-            virDomainHostdevDef *hostdev = virDomainNetGetActualHostdev(net);
-
-            if (virDomainHostdevInsert(def, hostdev) < 0)
-                return -1;
+            virDomainHostdevInsert(def, virDomainNetGetActualHostdev(net));
         }
     }
 

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index bd858d8127793065b86e208271a53fb0f20aed70..edf7b3758175afca16c3c010ccf89b256cddc82f 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3574,8 +3574,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev)
                 return -1;
             }
 
-            if (virDomainHostdevInsert(vmdef, hostdev) < 0)
-                return -1;
+            virDomainHostdevInsert(vmdef, hostdev);
             dev->data.hostdev = NULL;
             break;
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index e63732dbea95fc0e2f3e8bf92ba581999e626c97..22266c1ab6407287ae8c518b1834e739cebdeecf 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2993,8 +2993,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef,
                            _("device is already in the domain configuration"));
             return -1;
         }
-        if (virDomainHostdevInsert(vmdef, hostdev) < 0)
-            return -1;
+        virDomainHostdevInsert(vmdef, hostdev);
         dev->data.hostdev = NULL;
         ret = 0;
         break;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 772cb405d69010b11b123568929407d99562aca1..1d0da1028ff009442448eedf70cbe9e9ac9875c8 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6732,8 +6732,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef,
                            _("device is already in the domain configuration"));
             return -1;
         }
-        if (virDomainHostdevInsert(vmdef, hostdev))
-            return -1;
+        virDomainHostdevInsert(vmdef, hostdev);
         dev->data.hostdev = NULL;
         break;
 

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d015285b0d01605efeeeea80942a3308ddce51dc..910229a61620ee994d07a0f16dd333338295b591 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5928,8 +5928,7 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm)
             if (qemuDomainPrepareHostdev(hostdev, priv) < 0)
                 return -1;
 
-            if (virDomainHostdevInsert(def, hostdev) < 0)
-                return -1;
+            virDomainHostdevInsert(def, hostdev);
         }
     }
     return 0;