conf: change virDomainNetInsert() to return void

It can't fail.

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 04da31f2dd2b2a587f1462f640bf1e5c784b6a0e..dd9765b5793a291734c1b6bff5ff57d6c641217d 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -14894,14 +14894,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 1fcc3fdb98907eeeb5a1b7714b68dcf46be93125..1f1c609a54c610ac4734937adf4e832d50b71d3e 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3991,7 +3991,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 512b456bfeeabdb7df0b9578efde1e3c8cb9b384..585959de88ea6df68593625dc372854b498371d3 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3508,7 +3508,6 @@ static int
 libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev)
 {
     virDomainDiskDef *disk;
-    virDomainNetDef *net;
     virDomainHostdevDef *hostdev;
     virDomainControllerDef *controller;
     virDomainHostdevDef *found;
@@ -3542,16 +3541,13 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, virDomainDeviceDef *dev)
             break;
 
         case VIR_DOMAIN_DEVICE_NET:
-            net = dev->data.net;
-            if (virDomainHasNet(vmdef, net)) {
+            if (virDomainHasNet(vmdef, dev->data.net)) {
                 virReportError(VIR_ERR_INVALID_ARG,
                                _("network device with mac %1$s already exists"),
-                               virMacAddrFormat(&net->mac, mac));
+                               virMacAddrFormat(&dev->data.net->mac, mac));
                 return -1;
             }
-            if (virDomainNetInsert(vmdef, net))
-                return -1;
-            dev->data.net = NULL;
+            virDomainNetInsert(vmdef, g_steal_pointer(&dev->data.net));
             break;
 
         case VIR_DOMAIN_DEVICE_HOSTDEV:

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 22266c1ab6407287ae8c518b1834e739cebdeecf..80cf07d2e5ffca168c6cc16a7b3f5b7925ffbf61 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2961,7 +2961,6 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef,
 {
     int ret = -1;
     virDomainDiskDef *disk;
-    virDomainNetDef *net;
     virDomainHostdevDef *hostdev;
 
     switch (dev->type) {
@@ -2979,10 +2978,7 @@ lxcDomainAttachDeviceConfig(virDomainDef *vmdef,
         break;
 
     case VIR_DOMAIN_DEVICE_NET:
-        net = dev->data.net;
-        if (virDomainNetInsert(vmdef, net) < 0)
-            return -1;
-        dev->data.net = NULL;
+        virDomainNetInsert(vmdef, g_steal_pointer(&dev->data.net));
         ret = 0;
         break;
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 53bdae402a7dd85404c4193aca9632f21df1bb65..ee851500703999298c86212b6a8320164054933b 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6682,7 +6682,6 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef,
                              virDomainXMLOption *xmlopt)
 {
     virDomainDiskDef *disk;
-    virDomainNetDef *net;
     virDomainSoundDef *sound;
     virDomainHostdevDef *hostdev;
     virDomainLeaseDef *lease;
@@ -6709,10 +6708,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef,
         break;
 
     case VIR_DOMAIN_DEVICE_NET:
-        net = dev->data.net;
-        if (virDomainNetInsert(vmdef, net))
-            return -1;
-        dev->data.net = NULL;
+        virDomainNetInsert(vmdef, g_steal_pointer(&dev->data.net));
         break;
 
     case VIR_DOMAIN_DEVICE_SOUND: