On Sun, May 23, 2010 at 12:51:50PM -0400, Stefan Berger wrote:
Index: libvirt-acl/src/util/macvtap.h =================================================================== --- libvirt-acl.orig/src/util/macvtap.h +++ libvirt-acl/src/util/macvtap.h @@ -27,15 +27,14 @@ # if defined(WITH_MACVTAP)
# include "internal.h" +# include "conf/domain_conf.h"
This isn't allowed. It is introducing a dependancy cycle between the util & conf directories. Code in util/ is not allowed to depend on any other code in the libvirt tree.
-int openMacvtapTap(const char *ifname, - const unsigned char *macaddress, - const char *linkdev, - int mode, +int openMacvtapTap(virDomainNetDefPtr net, char **res_ifname, - int vnet_hdr); + int vnet_hdr, + const unsigned char *vmuuid);
-void delMacvtap(const char *ifname); +void delMacvtap(virDomainNetDefPtr net);
# endif /* WITH_MACVTAP */
Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|