From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Mon, 21 Jul 2014 17:26:00 +0000 (+0400)
Subject: Fix build on non-Linux platforms
X-Git-Tag: v1.2.7-rc1~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5f57be2a2e9741b57d064bfaee92d9726bf9856;p=thirdparty%2Flibvirt.git

Fix build on non-Linux platforms

Commit ef48a1b introduced virFindSCSIHostByPCI for Linux and
a stub for other platforms that returns -1 while the function
should return 'char *', so use 'return NULL' instead.

Commit fbd91d4 introduced virReadSCSIUniqueId with the third
argument 'int *result', however the stub for non-Linux patform
uses 'unsigned int *result', so change it to 'int *result'.

Pushed under the build breaker rule.
---

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 1c6d261fbb..20e9f0ebe9 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -2176,7 +2176,7 @@ virFindFCHostCapableVport(const char *sysfs_prefix)
 int
 virReadSCSIUniqueId(const char *sysfs_prefix ATTRIBUTE_UNUSED,
                     int host ATTRIBUTE_UNUSED,
-                    unsigned int *result ATTRIBUTE_UNUSED)
+                    int *result ATTRIBUTE_UNUSED)
 {
     virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
     return -1;
@@ -2188,7 +2188,7 @@ virFindSCSIHostByPCI(const char *sysfs_prefix ATTRIBUTE_UNUSED,
                      unsigned int unique_id ATTRIBUTE_UNUSED)
 {
     virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
-    return -1;
+    return NULL;
 }
 
 int