This patch fixes some build error I've encountered, but would prefer an
ACK before pushing.
Thanks,
Jim
>From ff81637b66793fd4b2b46e8e04357e8d406dde31 Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfeh...@suse.com>
Date: Mon, 5 Mar 2012 12:08:54 -0700
Subject: [PATCH] Fix build after commit e3ba4025
Commit e3ba4025 introduced a few build errors with HAVE_LIBNL undefined.
---
src/util/virnetdevvportprofile.c | 2 +-
src/util/virnetlink.c | 10 ++++++----
src/util/virnetlink.h | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 00fd123..f6db292 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -1071,7 +1071,7 @@ int virNetDevVPortProfileAssociate(const char *macvtap_ifname ATTRIBUTE_UNUSED,
const char *linkdev ATTRIBUTE_UNUSED,
const unsigned char *vmuuid ATTRIBUTE_UNUSED,
enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED,
- bool setlink_only)
+ bool setlink_only ATTRIBUTE_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Virtual port profile association not supported on this platform"));
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 264fcdb..ffff63d 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -585,9 +585,10 @@ int virNetlinkEventServiceIsRunning(void)
* virNetlinkEventAddClient: register a callback for handling of
* netlink messages
*/
-int virNetlinkEventAddClient(virNetlinkEventHandleCallback cb,
- virNetlinkEventRemoveCallback cb,
- void *opaque, const unsigned char *macaddr)
+int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB ATTRIBUTE_UNUSED,
+ virNetlinkEventRemoveCallback removeCB ATTRIBUTE_UNUSED,
+ void *opaque ATTRIBUTE_UNUSED,
+ const unsigned char *macaddr ATTRIBUTE_UNUSED)
{
netlinkError(VIR_ERR_INTERNAL_ERROR,
"%s",
@@ -602,7 +603,8 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback cb,
/**
* virNetlinkEventRemoveClient: unregister a callback from a netlink monitor
*/
-int virNetlinkEventRemoveClient(int watch, const unsigned char *macaddr)
+int virNetlinkEventRemoveClient(int watch ATTRIBUTE_UNUSED,
+ const unsigned char *macaddr ATTRIBUTE_UNUSED)
{
netlinkError(VIR_ERR_INTERNAL_ERROR,
"%s",
diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h
index 75533a3..71c962e 100644
--- a/src/util/virnetlink.h
+++ b/src/util/virnetlink.h
@@ -55,7 +55,7 @@ int virNetlinkEventServiceStart(void);
/**
* virNetlinkEventServiceIsRunning: returns if the netlink event service is running.
*/
-bool virNetlinkEventServiceIsRunning(void);
+int virNetlinkEventServiceIsRunning(void);
/**
* virNetlinkEventAddClient: register a callback for handling of netlink messages
--
1.7.8.3
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
