On 06/22/2011 09:45 AM, Daniel P. Berrange wrote: In the subject: s/dependancy/dependency/
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 ---
@@ -6737,12 +6731,13 @@ static virDomainObjPtr virDomainObjParseXML(virCapsPtr caps, char *str = virXMLPropString(nodes[i], "flag"); if (str) { int flag = virDomainTaintTypeFromString(str); - VIR_FREE(str); if (flag < 0) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown taint flag %s"), str); + VIR_FREE(str);
This use-after-free bug fix is worth an independent fix, or at the very minimum worth a mention in your commit message. ACK to the rest of the patch. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org