On 15.01.2015 10:25, Cédric Bosdonnat wrote: > Hi guys, > > Here are a few patches to have common route definitions for domains and networks. > What has changed since v1: > * Split into several patches for backportability as suggested by Laine > * Moved the virNetworkRouteDef struct definition in the c file to make sure all > routes are created with the virNetworkRouteDefCreate (or Parse) function. This > way we can get rid of the redundant checks in the format function. > * Moved the prefix computing code into a new virNetworkRouteDefGetPrefix function. > * Applied and tweaked John's patches. > * Fix the virSocketAddrGetIpPrefix 0.0.0.0 special case as suggested by Laine. > > Cédric Bosdonnat (5): > Fix ipv6 regex in RNG schemas to match '::' > Move network route definition to networkcommon.rng > Move code related to network routes to networkcommon_conf.[ch] > Use the network route definitions for domains > virSocketAddrGetIpPrefix 0.0.0.0 special case > > John Ferlan (2): > domain_conf: Resolve Coverity RESOURCE_LEAK > domain_conf: Check errors from virSocketAddrFormat > > docs/formatdomain.html.in | 9 +- > docs/schemas/basictypes.rng | 2 +- > docs/schemas/domaincommon.rng | 29 +- > docs/schemas/network.rng | 20 +- > docs/schemas/networkcommon.rng | 22 ++ > po/POTFILES.in | 1 + > src/Makefile.am | 3 +- > src/conf/domain_conf.c | 136 ++----- > src/conf/domain_conf.h | 14 +- > src/conf/network_conf.c | 297 +--------------- > src/conf/network_conf.h | 22 +- > src/conf/networkcommon_conf.c | 414 ++++++++++++++++++++++ > src/conf/networkcommon_conf.h | 72 ++++ > src/libvirt_private.syms | 11 + > src/lxc/lxc_container.c | 22 +- > src/lxc/lxc_native.c | 20 +- > src/network/bridge_driver.c | 44 +-- > src/util/virsocketaddr.c | 6 + > tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 4 +- > tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 4 +- > tests/lxcxml2xmldata/lxc-hostdev.xml | 4 +- > tests/lxcxml2xmldata/lxc-idmap.xml | 4 +- > 22 files changed, 633 insertions(+), 527 deletions(-) > create mode 100644 src/conf/networkcommon_conf.c > create mode 100644 src/conf/networkcommon_conf.h > ACK series. Good job! Michal -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list