]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix build after commit e3ba4025
authorJim Fehlig <jfehlig@suse.com>
Mon, 5 Mar 2012 19:08:54 +0000 (12:08 -0700)
committerJim Fehlig <jfehlig@suse.com>
Mon, 5 Mar 2012 20:31:55 +0000 (13:31 -0700)
Commit e3ba4025 introduced a few build errors with HAVE_LIBNL undefined.

src/util/virnetdevvportprofile.c
src/util/virnetlink.c

index 00fd123b2439794d44f2ef5be30fdbb1f2975154..f6db29253ed7237c41501e358ed6fc5f2cdec735 100644 (file)
@@ -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"));
index 264fcdbeca92052cb99f6d0bf8aee750d1a2efe1..1575bade814931245847cdce84bb2498cb92e8bb 100644 (file)
@@ -571,7 +571,7 @@ int virNetlinkEventServiceStart(void)
  * virNetlinkEventServiceIsRunning: returns if the netlink event
  * service is running.
  */
-int virNetlinkEventServiceIsRunning(void)
+bool virNetlinkEventServiceIsRunning(void)
 {
 # if defined(__linux__) && !defined(HAVE_LIBNL)
     netlinkError(VIR_ERR_INTERNAL_ERROR,
@@ -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",