The three patches are submitted with "one" because there is a dependency between them. That is, patch 2 (DHCPv6) assumes that patch 1 (guest-to-guest IPV6) has been applied and patch 3 (dnsmasq conf-file) assumes that patch 2 has been applied. While other files are also changed, most of the changes occur in src/network/bridge_driver.c and result in the conflicts. Yes, patch 1 was previously submitted as a stand-alone patch but it became obvious that it was not really standalone. This submittal is a "re-do" of my previous submittal which involved similar changes. Specifically, the order of the patches have been changed so that the conf-file changes are after the DHCPv6 changes. In addition, some code has been cleaned up. For example, there is no need to modify the radvd configuration since both DHCPv6 and dnsmasq's handling of RA are both keyed to dnsmasq version 2.64 or later. Gene Czarcinski (3): v1: allow guest to guest IPv6 without gateway definition v7.1 add support for DHCPv6 v7.2: put dnsmasq parameters into conf-file docs/formatnetwork.html.in | 126 +++++- src/conf/network_conf.c | 100 +++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 461 +++++++++++++++------ src/network/bridge_driver.h | 7 +- src/util/dnsmasq.c | 9 +- tests/networkxml2argvdata/dhcp6-network.argv | 17 + tests/networkxml2argvdata/dhcp6-network.xml | 16 + tests/networkxml2argvdata/isolated-network.argv | 25 +- tests/networkxml2argvdata/nat-network-dhcp6.argv | 20 + tests/networkxml2argvdata/nat-network-dhcp6.xml | 26 ++ .../networkxml2argvdata/nat-network-dns-hosts.argv | 15 +- .../nat-network-dns-srv-record-minimal.argv | 37 +- .../nat-network-dns-srv-record.argv | 37 +- .../nat-network-dns-txt-record.argv | 31 +- tests/networkxml2argvdata/nat-network.argv | 29 +- tests/networkxml2argvdata/netboot-network.argv | 29 +- .../networkxml2argvdata/netboot-proxy-network.argv | 26 +- .../routed-network-dhcphost.argv | 15 + .../routed-network-dhcphost.xml | 19 + tests/networkxml2argvdata/routed-network.argv | 13 +- tests/networkxml2argvtest.c | 46 +- 22 files changed, 790 insertions(+), 315 deletions(-) create mode 100644 tests/networkxml2argvdata/dhcp6-network.argv create mode 100644 tests/networkxml2argvdata/dhcp6-network.xml create mode 100644 tests/networkxml2argvdata/nat-network-dhcp6.argv create mode 100644 tests/networkxml2argvdata/nat-network-dhcp6.xml create mode 100644 tests/networkxml2argvdata/routed-network-dhcphost.argv create mode 100644 tests/networkxml2argvdata/routed-network-dhcphost.xml -- 1.7.11.7 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list