From: Matt Coleman <mcoleman@datto.com>
Date: Fri, 6 Nov 2020 03:33:01 +0000 (-0500)
Subject: domain_conf: make virDomainLeaseInsert() void
X-Git-Tag: v6.10.0-rc1~233
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83959e6a30690dfeef24232fe95a215ba8f6d46e;p=thirdparty%2Flibvirt.git

domain_conf: make virDomainLeaseInsert() 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 4793a4dc4d..afd795bd1a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -18277,13 +18277,10 @@ void virDomainLeaseInsertPreAlloc(virDomainDefPtr def)
     def->leases = g_renew(virDomainLeaseDefPtr, def->leases, def->nleases + 1);
 }
 
-int virDomainLeaseInsert(virDomainDefPtr def,
-                         virDomainLeaseDefPtr lease)
+void virDomainLeaseInsert(virDomainDefPtr def, virDomainLeaseDefPtr lease)
 {
     virDomainLeaseInsertPreAlloc(def);
-
     virDomainLeaseInsertPreAlloced(def, lease);
-    return 0;
 }
 
 
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index e6a315aa22..77656c8ae3 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3432,8 +3432,7 @@ const char *virDomainControllerAliasFind(const virDomainDef *def,
 
 int virDomainLeaseIndex(virDomainDefPtr def,
                         virDomainLeaseDefPtr lease);
-int virDomainLeaseInsert(virDomainDefPtr def,
-                         virDomainLeaseDefPtr lease);
+void virDomainLeaseInsert(virDomainDefPtr def, virDomainLeaseDefPtr lease);
 void virDomainLeaseInsertPreAlloc(virDomainDefPtr def);
 void virDomainLeaseInsertPreAlloced(virDomainDefPtr def,
                                     virDomainLeaseDefPtr lease);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a2371ea13c..05f8eb2cb7 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7272,8 +7272,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
                            lease->key, NULLSTR(lease->lockspace));
             return -1;
         }
-        if (virDomainLeaseInsert(vmdef, lease) < 0)
-            return -1;
+        virDomainLeaseInsert(vmdef, lease);
 
         /* vmdef has the pointer. Generic codes for vmdef will do all jobs */
         dev->data.lease = NULL;