[PATCH 03/17] conf: change virDomainFSInsert() to return void
It can't fail.
Signed-off-by: Laine Stump <laine(a)redhat.com>
---
src/conf/domain_conf.c | 4 +---
src/conf/domain_conf.h | 2 +-
src/qemu/qemu_driver.c | 3 +--
src/vz/vz_sdk.c | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1882054c7b..b5b15b7768 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -29205,12 +29205,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 37298ca937..cb19f0fb29 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -4123,7 +4123,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 4a248cbafe..d295f24cb3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6790,8 +6790,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 b20d454fb8..688c9d1ebc 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);
--
2.47.1