[PATCH 02/17] conf: change virDomainNetInsert() to return void

[Laine Stump <laine@xxxxxxxxxx>]

It can't fail.

Signed-off-by: Laine Stump <laine@xxxxxxxxxx>
---
 src/conf/domain_conf.c   | 4 ++--
 src/conf/domain_conf.h   | 2 +-
 src/libxl/libxl_driver.c | 3 +--
 src/lxc/lxc_driver.c     | 3 +--
 src/qemu/qemu_driver.c   | 5 +----
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 8751e1ef06..1882054c7b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14881,14 +14881,14 @@ virDomainDiskRemoveByName(virDomainDef *def, const char *name)
     return virDomainDiskRemove(def, idx);
 }
 
-int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net)
+void
+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);
 
     VIR_APPEND_ELEMENT(def->nets, def->nnets, net);
-    return 0;
 }
 
 /**
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index db49567313..37298ca937 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3984,7 +3984,7 @@ int virDomainNetFindIdx(virDomainDef *def, virDomainNetDef *net);
 virDomainNetDef *virDomainNetFind(virDomainDef *def, const char *device);
 virDomainNetDef *virDomainNetFindByName(virDomainDef *def, const char *ifname);
 bool virDomainHasNet(virDomainDef *def, virDomainNetDef *net);
-int virDomainNetInsert(virDomainDef *def, virDomainNetDef *net);
+void virDomainNetInsert(virDomainDef *def, virDomainNetDef *net);
 void virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef *newnet);
 bool virDomainNetBackendIsEqual(virDomainNetBackend *src,
                                 virDomainNetBackend *dst);
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index f2bb6893c4..45d15df8b8 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3565,8 +3565,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev)
                                virMacAddrFormat(&net->mac, mac));
                 return -1;
             }
-            if (virDomainNetInsert(vmdef, net))
-                return -1;
+            virDomainNetInsert(vmdef, net);
             dev->data.net = NULL;
             break;
 
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 9301aedf58..5795293079 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2979,8 +2979,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef,
 
     case VIR_DOMAIN_DEVICE_NET:
         net = dev->data.net;
-        if (virDomainNetInsert(vmdef, net) < 0)
-            return -1;
+        virDomainNetInsert(vmdef, net);
         dev->data.net = NULL;
         ret = 0;
         break;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0a7c3588e2..4a248cbafe 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6699,7 +6699,6 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef,
                              virDomainXMLOption *xmlopt)
 {
     virDomainDiskDef *disk;
-    virDomainNetDef *net;
     virDomainSoundDef *sound;
     virDomainHostdevDef *hostdev;
     virDomainLeaseDef *lease;
@@ -6726,9 +6725,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef,
         break;
 
     case VIR_DOMAIN_DEVICE_NET:
-        net = dev->data.net;
-        if (virDomainNetInsert(vmdef, net))
-            return -1;
+        virDomainNetInsert(vmdef, dev->data.net);
         dev->data.net = NULL;
         break;
 
-- 
2.47.1