Re: [libvirt] [PATCH] Remove macvtap dependancy on domain configuration

Files under src/util must not depend on src/conf Solve the macvtap problem by moving the definition of macvtap modes from domain_conf.h into macvtap.h * src/util/macvtap.c, src/util/macvtap.h: Add enum for macvtap modes * src/conf/domain_conf.c, src/conf/domain_conf.h: Remove enum for macvtap modes --- src/conf/domain_conf.c | 17 ++++++----------- src/conf/domain_conf.h | 15 +-------------- src/util/macvtap.c | 40 +++++++++++++++++----------------------- src/util/macvtap.h | 14 +++++++++++++- 4 files changed, 37 insertions(+), 49 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c @@ -1156,7 +1150,7 @@ static virDomainObjPtr virDomainObjNew(virCapsPtr caps) } if (caps->privateDataAllocFunc && - !(domain->privateData = (caps->privateDataAllocFunc)())) { + !(domain->privateData = (caps->privateDataAllocFunc)(caps->privateDataOpaque))) { virReportOOMError(); VIR_FREE(domain); return NULL;