On 06/27/2016 07:01 AM, Ján Tomko wrote:
This series was accidentally pushed in the feature freeze.
Revert the last six commits adding the new functionality.
The rest are either bugfixes or preparation for the bugfixes.
Now that 2.0.0 is released, I adjusted the docs additions to say
"2.1.0", added a note about the original commit ID and later revert
commit ID for each, and re-pushed. So we should now be able to set the
IP address (and peer address) of the host side of a type='ethernet'
interface's tap device for both qemu and lxc.
Ján Tomko (6):
Revert "qemu: support setting host-side IP addresses/routes"
Revert "lxc: support setting host-side IP addresses/routes"
Revert "util: support setting peer for virNetDevIPInfo addresses"
Revert "conf: support host-side IP/route information in <interface>"
Revert "conf: allow setting peer address in <ip> element of
<interface>"
Revert "util: new function virNetDevIPInfoAddToDev"
docs/formatdomain.html.in | 60 +++--------
docs/schemas/domaincommon.rng | 8 +-
src/conf/domain_conf.c | 117 ++++-----------------
src/conf/domain_conf.h | 3 +-
src/libvirt_private.syms | 1 -
src/lxc/lxc_container.c | 47 +++++++--
src/lxc/lxc_process.c | 8 --
src/qemu/qemu_interface.c | 6 +-
src/util/virnetdevip.c | 60 -----------
src/util/virnetdevip.h | 7 +-
tests/lxcxml2xmldata/lxc-ethernet-hostip.xml | 44 --------
tests/lxcxml2xmltest.c | 1 -
.../qemuxml2argv-net-eth-hostip.args | 23 ----
.../qemuxml2argv-net-eth-hostip.xml | 39 -------
tests/qemuxml2argvtest.c | 1 -
.../qemuxml2xmlout-net-eth-hostip.xml | 44 --------
tests/qemuxml2xmltest.c | 1 -
17 files changed, 75 insertions(+), 395 deletions(-)
delete mode 100644 tests/lxcxml2xmldata/lxc-ethernet-hostip.xml
delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args
delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.xml
delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-hostip.xml