]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
util: Fix the conflict type for virIsCapableFCHost
authorOsier Yang <jyang@redhat.com>
Thu, 28 Mar 2013 12:17:05 +0000 (20:17 +0800)
committerOsier Yang <jyang@redhat.com>
Thu, 28 Mar 2013 12:17:05 +0000 (20:17 +0800)
---
Pushed under build-breaker rule.

src/util/virutil.c
src/util/virutil.h

index 557225cefdb2d8c47eb2816a095339d76daaf80c..d5f122f6c510c40eb9d84c364ff2a237068e861a 100644 (file)
@@ -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;
index 47357fad1f68dedd019706599b42d67974ab8325..2a797cb28e061c6d06a5506cdd22b13e9d925357 100644 (file)
@@ -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__ */