Re: [libvirt] [Libvirt-announce] ANNOUNCE: libvirt 0.9.11.6 maintenance release

On 10/08/2012 06:49 AM, Justin Clift wrote: On the contrary, it is actually one too many patches pulled across. This should fix your build, now pushed to v0.9.11-maint: commit 997d97c34e6816f967664021747344f0f18f4540 Author: Eric Blake <eblake(a)redhat.com&gt; Date: Tue Oct 9 09:52:14 2012 -0600 Revert "build: fix compilation without struct ifreq" This reverts commit d4ffc36fbcefbc9365b84dc9a610180c5636b6d1. That commit cherry-picked from 68a97bd in isolation, but should really only be needed if we had also cherry-picked 387117ad. diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 06004ab..d53352f 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -929,7 +929,7 @@ int virNetDevValidateConfig(const char *ifname, } #else /* ! HAVE_STRUCT_IFREQ */ int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, - const virMacAddrPtr macaddr ATTRIBUTE_UNUSED, + const unsigned char *macaddr ATTRIBUTE_UNUSED, int ifindex ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", @@ -1663,7 +1663,7 @@ virNetDevLinkDump(const char *ifname ATTRIBUTE_UNUSED, int virNetDevReplaceNetConfig(char *linkdev ATTRIBUTE_UNUSED, int vf ATTRIBUTE_UNUSED, - const virMacAddrPtr macaddress ATTRIBUTE_UNUSED, + const unsigned char *macaddress ATTRIBUTE_UNUSED, int vlanid ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED) { diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 2772d9b..0e4d76b 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -672,7 +672,7 @@ int virNetlinkEventServiceLocalPid(void) int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB ATTRIBUTE_UNUSED, virNetlinkEventRemoveCallback removeCB ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED, - const virMacAddrPtr macaddr ATTRIBUTE_UNUSED) + const unsigned char *macaddr ATTRIBUTE_UNUSED) { netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; @@ -682,7 +682,7 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB ATTRIBUTE_UN * virNetlinkEventRemoveClient: unregister a callback from a netlink monitor */ int virNetlinkEventRemoveClient(int watch ATTRIBUTE_UNUSED, - const virMacAddrPtr macaddr ATTRIBUTE_UNUSED) + const unsigned char *macaddr ATTRIBUTE_UNUSED) { netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org