[libvirt] [PATCH] Fix build on non-Linux platforms
John Ferlan
jferlan at redhat.com
Mon Jul 21 18:08:07 UTC 2014
On 07/21/2014 01:32 PM, Roman Bogorodskiy wrote:
> 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.
> ---
> src/util/virutil.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/util/virutil.c b/src/util/virutil.c
> index 1c6d261..20e9f0e 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
>
Sorry about that. It's been such a long time since I updated/wrote the
code I cannot remember why the arguments changed.
John
More information about the libvir-list
mailing list