Fix build after commit e3ba4025

Commit e3ba4025 introduced a few build errors with HAVE_LIBNL undefined.
This commit is contained in:
Jim Fehlig 2012-03-05 12:08:54 -07:00
parent d2a9d55f45
commit 118cfc2535
2 changed files with 8 additions and 6 deletions

View File

@ -1071,7 +1071,7 @@ int virNetDevVPortProfileAssociate(const char *macvtap_ifname ATTRIBUTE_UNUSED,
const char *linkdev ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED,
const unsigned char *vmuuid ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED,
enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED, enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED,
bool setlink_only) bool setlink_only ATTRIBUTE_UNUSED)
{ {
virReportSystemError(ENOSYS, "%s", virReportSystemError(ENOSYS, "%s",
_("Virtual port profile association not supported on this platform")); _("Virtual port profile association not supported on this platform"));

View File

@ -571,7 +571,7 @@ int virNetlinkEventServiceStart(void)
* virNetlinkEventServiceIsRunning: returns if the netlink event * virNetlinkEventServiceIsRunning: returns if the netlink event
* service is running. * service is running.
*/ */
int virNetlinkEventServiceIsRunning(void) bool virNetlinkEventServiceIsRunning(void)
{ {
# if defined(__linux__) && !defined(HAVE_LIBNL) # if defined(__linux__) && !defined(HAVE_LIBNL)
netlinkError(VIR_ERR_INTERNAL_ERROR, netlinkError(VIR_ERR_INTERNAL_ERROR,
@ -585,9 +585,10 @@ int virNetlinkEventServiceIsRunning(void)
* virNetlinkEventAddClient: register a callback for handling of * virNetlinkEventAddClient: register a callback for handling of
* netlink messages * netlink messages
*/ */
int virNetlinkEventAddClient(virNetlinkEventHandleCallback cb, int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB ATTRIBUTE_UNUSED,
virNetlinkEventRemoveCallback cb, virNetlinkEventRemoveCallback removeCB ATTRIBUTE_UNUSED,
void *opaque, const unsigned char *macaddr) void *opaque ATTRIBUTE_UNUSED,
const unsigned char *macaddr ATTRIBUTE_UNUSED)
{ {
netlinkError(VIR_ERR_INTERNAL_ERROR, netlinkError(VIR_ERR_INTERNAL_ERROR,
"%s", "%s",
@ -602,7 +603,8 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback cb,
/** /**
* virNetlinkEventRemoveClient: unregister a callback from a netlink monitor * 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, netlinkError(VIR_ERR_INTERNAL_ERROR,
"%s", "%s",