domain_conf: make virDomainDiskInsert() void

This function always returns zero, so it might as well be void.

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ec9e04d2bda4bc705e93eb215a4581372251df69..e33f19db93b3992dfb5a901b2571d4174a850ae4 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17682,14 +17682,11 @@ virDomainDiskByTarget(virDomainDefPtr def,
 }
 
 
-int virDomainDiskInsert(virDomainDefPtr def,
-                        virDomainDiskDefPtr disk)
+void virDomainDiskInsert(virDomainDefPtr def,
+                         virDomainDiskDefPtr disk)
 {
     def->disks = g_renew(virDomainDiskDefPtr, def->disks, def->ndisks + 1);
-
     virDomainDiskInsertPreAlloced(def, disk);
-
-    return 0;
 }
 
 void virDomainDiskInsertPreAlloced(virDomainDefPtr def,

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 12d21e36be769b58f4fbb57acc076491d63515bf..56a9819dbec48867d03aade6863bf5327af4fbee 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3354,9 +3354,7 @@ virDomainDiskDefPtr
 virDomainDiskByTarget(virDomainDefPtr def,
                       const char *dst);
 
-int virDomainDiskInsert(virDomainDefPtr def,
-                        virDomainDiskDefPtr disk)
-    G_GNUC_WARN_UNUSED_RESULT;
+void virDomainDiskInsert(virDomainDefPtr def, virDomainDiskDefPtr disk);
 void virDomainDiskInsertPreAlloced(virDomainDefPtr def,
                                    virDomainDiskDefPtr disk);
 int virDomainStorageNetworkParseHost(xmlNodePtr hostnode,

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 2195ecf47bd7f76adbd3cbd1d79f1a0472ca85e0..176516f5cb8df93e70c3c6cd1f73655aa9c67a24 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3548,8 +3548,7 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev)
                                _("target %s already exists."), disk->dst);
                 return -1;
             }
-            if (virDomainDiskInsert(vmdef, disk) < 0)
-                return -1;
+            virDomainDiskInsert(vmdef, disk);
             /* vmdef has the pointer. Generic codes for vmdef will do all jobs */
             dev->data.disk = NULL;
             break;

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index a6905b5a546ab40221675057a260b11da6ccfdd3..d0503ef2eae900455facca1df94f0f8493015b3e 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -3045,8 +3045,7 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef,
                            _("target %s already exists."), disk->dst);
             return -1;
         }
-        if (virDomainDiskInsert(vmdef, disk) < 0)
-            return -1;
+        virDomainDiskInsert(vmdef, disk);
         /* vmdef has the pointer. Generic codes for vmdef will do all jobs */
         dev->data.disk = NULL;
         ret = 0;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f5232bf866614d96fabc30704894455c27b944a2..7edb7d2e0a767d31bfe038d79ae71d54119cf96c 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7233,8 +7233,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
             return -1;
         if (qemuCheckDiskConfigAgainstDomain(vmdef, disk) < 0)
             return -1;
-        if (virDomainDiskInsert(vmdef, disk) < 0)
-            return -1;
+        virDomainDiskInsert(vmdef, disk);
         /* vmdef has the pointer. Generic codes for vmdef will do all jobs */
         dev->data.disk = NULL;
         break;

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index cdd3f61ee12305595cb4d84307d9172419f0cff3..00891dc16a0689b1d4726a9c188bca397d6cc3c7 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -833,8 +833,7 @@ prlsdkAddDomainHardDisksInfo(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomainDef
             if (prlsdkGetDiskInfo(driver, hdd, disk, false, IS_CT(def)) < 0)
                 goto error;
 
-            if (virDomainDiskInsert(def, disk) < 0)
-                goto error;
+            virDomainDiskInsert(def, disk);
 
             disk = NULL;
             PrlHandle_Free(hdd);
@@ -876,8 +875,7 @@ prlsdkAddDomainOpticalDisksInfo(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomain
         PrlHandle_Free(cdrom);
         cdrom = PRL_INVALID_HANDLE;
 
-        if (virDomainDiskInsert(def, disk) < 0)
-            goto error;
+        virDomainDiskInsert(def, disk);
     }
 
     return 0;

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 294915c59c0bdc609dd75843f446456ac48b52fa..f86e9fd55206e3e73e9f480878871a069ba7472a 100644 (file)
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -278,10 +278,11 @@ testQemuDiskXMLToProps(const void *opaque)
                                        VIR_DOMAIN_DEF_PARSE_STATUS)))
         return -1;
 
-    if (!(vmdef = virDomainDefNew()) ||
-        virDomainDiskInsert(vmdef, disk) < 0)
+    if (!(vmdef = virDomainDefNew()))
         return -1;
 
+    virDomainDiskInsert(vmdef, disk);
+
     if (qemuValidateDomainDeviceDefDisk(disk, vmdef, data->qemuCaps) < 0) {
         VIR_TEST_VERBOSE("invalid configuration for disk");
         return -1;