From: Osier Yang <jyang@redhat.com>
Date: Thu, 28 Mar 2013 12:17:05 +0000 (+0800)
Subject: util: Fix the conflict type for virIsCapableFCHost
X-Git-Tag: v1.0.4~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eeb56fb2aff7fb1eeb56ef2ff2648fa1018a914;p=thirdparty%2Flibvirt.git

util: Fix the conflict type for virIsCapableFCHost

---
Pushed under build-breaker rule.
---

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 557225cefd..d5f122f6c5 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -3582,7 +3582,8 @@ virReadFCHost(const char *sysfs_prefix ATTRIBUTE_UNUSED,
 }
 
 int
-virIsCapableFCHost(int host ATTRIBUTE_UNUSED)
+virIsCapableFCHost(const char *sysfs_prefix ATTRIBUTE_UNUSED,
+                   int host ATTRIBUTE_UNUSED)
 {
     virReportSystemError(ENOSYS, "%s", _("Not supported on this platform"));
     return -1;
diff --git a/src/util/virutil.h b/src/util/virutil.h
index 47357fad1f..2a797cb28e 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -314,7 +314,7 @@ enum {
 int virManageVport(const int parent_host,
                    const char *wwpn,
                    const char *wwnn,
-                  int operation)
+                   int operation)
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
 #endif /* __VIR_UTIL_H__ */