[PATCH 01/17] conf: change virDomainHostdevInsert() to return void

[Laine Stump <laine@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
 src/conf/domain_conf.c   | 15 +++++----------
 src/conf/domain_conf.h   |  2 +-
 src/libxl/libxl_domain.c |  5 +----
 src/libxl/libxl_driver.c |  3 +--
 src/lxc/lxc_driver.c     |  3 +--
 src/qemu/qemu_driver.c   |  3 +--
 src/qemu/qemu_process.c  |  3 +--
 7 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 45c2cd09f1..8751e1ef06 100644
--- 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 ba1a495764..db49567313 100644
--- 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 a049cdb30f..6805160923 100644
--- 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 494b1ad9bc..f2bb6893c4 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3590,8 +3590,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 4740aeed52..9301aedf58 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2992,8 +2992,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 d2eddbd9ae..0a7c3588e2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6745,8 +6745,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 6db48b0e7b..9cfd40993a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5909,8 +5909,7 @@ qemuProcessPrepareDomainNetwork(virDomainObj *vm)
             if (qemuDomainPrepareHostdev(hostdev, priv) < 0)
                 return -1;
 
-            if (virDomainHostdevInsert(def, hostdev) < 0)
-                return -1;
+            virDomainHostdevInsert(def, hostdev);
         }
     }
     return 0;
-- 
2.47.1