[libvirt] [Libvirt-announce] ANNOUNCE: libvirt 0.9.11.6 maintenance release
Eric Blake
eblake at redhat.com
Tue Oct 9 15:54:46 UTC 2012
On 10/08/2012 06:49 AM, Justin Clift wrote:
> On 08/10/2012, at 10:52 AM, Cole Robinson wrote:
>> libvirt 0.9.11.6 maintenance release is now available. This is
>> libvirt 0.9.11 with additional bugfixes that have accumulated
>> upstream since the initial release.
>>
>> This release can be downloaded at:
>>
>> http://libvirt.org/sources/stable_updates/libvirt-0.9.11.6.tar.gz
>
> Compiling this one also fails on OSX:
>
> CC libvirt_util_la-virnetdev.lo
> CC libvirt_util_la-virnetdevbandwidth.lo
> util/virnetdev.c:932: error: expected ';', ',' or ')' before 'macaddr'
> util/virnetdev.c:1666: error: expected ';', ',' or ')' before 'macaddress'
> CC libvirt_util_la-virnetdevbridge.lo
> make[3]: *** [libvirt_util_la-virnetdev.lo] Error 1
> make[3]: *** Waiting for unfinished jobs....
> make[2]: *** [all] Error 2
> make[1]: *** [all-recursive] Error 1
> make: *** [all] Error 2
>
> Hoping it's just a missing patch that also needs pulling across?
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 at redhat.com>
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 at redhat.com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 617 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20121009/2e1a16b7/attachment-0001.sig>
More information about the libvir-list
mailing list