From 5eeb56fb2aff7fb1eeb56ef2ff2648fa1018a914 Mon Sep 17 00:00:00 2001
From: Osier Yang <jyang@redhat.com>
Date: Thu, 28 Mar 2013 20:17:05 +0800
Subject: [PATCH] util: Fix the conflict type for virIsCapableFCHost

---
Pushed under build-breaker rule.
---
 src/util/virutil.c | 3 ++-
 src/util/virutil.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 557225cef..d5f122f6c 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 47357fad1..2a797cb28 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__ */
-- 
2.39.5