NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: quieten virSCSIHostGetUniqueId

Browse Source 
The only caller of this function ignores failure
and just sets the unique_id to -1.

Failing to read the file is likely to the device no longer
being present, not a real error.

Stop reporting errors in this function.

https://bugzilla.redhat.com/show_bug.cgi?id=1692100

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Ján Tomko 2020-11-04 12:29:07 +01:00
parent 843b709954
commit 4a56278e77
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virscsihost.c
View File

@ -41,6 +41,8 @@ VIR_LOG_INIT("util.scsi_host");
* Read the value of the "scsi_host" unique_id file. * Read the value of the "scsi_host" unique_id file.
* *
* Returns the value on success or -1 on failure. * Returns the value on success or -1 on failure.
*
* No errors are reported.
*/ */
int int
virSCSIHostGetUniqueId(const char *sysfs_prefix, virSCSIHostGetUniqueId(const char *sysfs_prefix,
@ -54,16 +56,14 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix,
sysfs_path = g_strdup_printf("%s/host%d/unique_id", sysfs_path = g_strdup_printf("%s/host%d/unique_id",
sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host); sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host);
if (virFileReadAll(sysfs_path, 1024, &buf) < 0) if (virFileReadAllQuiet(sysfs_path, 1024, &buf) < 0)
return -1; return -1;
if ((p = strchr(buf, '\n'))) if ((p = strchr(buf, '\n')))
*p = '\0'; *p = '\0';
if (virStrToLong_i(buf, NULL, 10, &unique_id) < 0) { if (virStrToLong_i(buf, NULL, 10, &unique_id) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, VIR_DEBUG("unable to parse unique_id: '%s'", buf);
_("unable to parse unique_id: %s"), buf);
return -1; return -1;
} }