From: Laine Stump <laine@redhat.com>
Date: Tue, 11 Feb 2025 21:52:45 +0000 (-0500)
Subject: conf: change virDomainFSInsert() to return void
X-Git-Tag: v11.2.0-rc1~285
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1456fe2c54664e1c2e57fecc8700d6c5660fa0cd;p=thirdparty%2Flibvirt.git

conf: change virDomainFSInsert() 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 dd9765b579..65d02bf92f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -29200,12 +29200,10 @@ virDiskNameToBusDeviceIndex(virDomainDiskDef *disk,
     return 0;
 }
 
-int
+void
 virDomainFSInsert(virDomainDef *def, virDomainFSDef *fs)
 {
     VIR_APPEND_ELEMENT(def->fss, def->nfss, fs);
-
-    return 0;
 }
 
 virDomainFSDef *
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 1f1c609a54..3d9f9c532e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -4130,7 +4130,7 @@ int virDiskNameToBusDeviceIndex(virDomainDiskDef *disk,
 
 virDomainFSDef *virDomainGetFilesystemForTarget(virDomainDef *def,
                                                   const char *target);
-int virDomainFSInsert(virDomainDef *def, virDomainFSDef *fs);
+void virDomainFSInsert(virDomainDef *def, virDomainFSDef *fs);
 int virDomainFSIndexByName(virDomainDef *def, const char *name);
 virDomainFSDef *virDomainFSRemove(virDomainDef *def, size_t i);
 ssize_t virDomainFSDefFind(virDomainDef *def,
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ee85150070..60ac5ecf10 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6772,8 +6772,7 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef,
             return -1;
         }
 
-        if (virDomainFSInsert(vmdef, fs) < 0)
-            return -1;
+        virDomainFSInsert(vmdef, fs);
         dev->data.fs = NULL;
         break;
 
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index b5a78d3668..cd99b4524b 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -801,8 +801,7 @@ prlsdkAddDomainHardDisksInfo(struct _vzDriver *driver, PRL_HANDLE sdkdom, virDom
             if (prlsdkGetFSInfo(hdd, fs) < 0)
                 goto error;
 
-            if (virDomainFSInsert(def, fs) < 0)
-                goto error;
+            virDomainFSInsert(def, fs);
 
             fs = NULL;
             PrlHandle_Free(hdd);