[libvirt] [PATCH 0/2] network: add force attribute for dhcp options

[Laine Stump]

The firs patch just fixes unexpected behavior in
virNetworkDHCPOptionDefParseXML found when testing the second patch.

The second patch adds the "force" attribute I mentioned in the review
of the patch that added support for specifying dhcp options in network
config. While documenting this new attribute, I noticed that I'd
neglected to see that original patch didn't include documentation, so
I added full documentation for <option> in order to have a place to
add the documentation for "force='yes'".

I'm also working on a way to allow specification of option names
rather than numbers, but didn't know if I could get it in before the
freeze, so I'm sending this patch now.

Laine Stump (2):
  conf: use VIR_EXPAND instead of VIR_REALLOC in
    virNetworkDHCPDefParseXML
  network: add force attribute for dhcp options

 docs/formatnetwork.html.in                 | 21 ++++++++++++++++++++
 src/conf/network_conf.c                    | 32 +++++++++++++++++++++---------
 src/conf/network_conf.h                    |  3 ++-
 src/network/bridge_driver.c                |  3 ++-
 tests/networkxml2confdata/nat-network.conf |  2 +-
 tests/networkxml2confdata/nat-network.xml  |  2 +-
 6 files changed, 50 insertions(+), 13 deletions(-)

-- 
1.7.11.7