From 1d14b13f3b7b7222b44cfe403479d43355eb90bc Mon Sep 17 00:00:00 2001
From: Laine Stump
Date: Fri, 29 Apr 2016 11:36:38 -0400
Subject: [PATCH] Revert "libvirt domain xml allow to set peer address"
This reverts commit 690969af9ccdf9b2012b97af0462bae8e312c9c9, which
added the domain config parts to support a "peer" attribute in domain
interface elements.
It's being removed temporarily for the release of libvirt 1.3.4
because the feature doesn't work, and there are concerns that it may
need to be modified in an externally visible manner which could create
backward compatibility problems.
---
docs/formatdomain.html.in | 12 +-----------
docs/schemas/domaincommon.rng | 5 -----
src/conf/domain_conf.c | 14 +-------------
src/conf/domain_conf.h | 1 -
4 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index d2db53b418..0688616507 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -4836,7 +4836,6 @@ qemu-kvm -net nic,model=? /dev/null
<source network='default'/>
<target dev='vnet0'/>
<ip address='192.168.122.5' prefix='24'/>
- <ip address='192.168.122.5' prefix='24' peer='10.0.0.10'/>
<route family='ipv4' address='192.168.122.0' prefix='24' gateway='192.168.122.1'/>
<route family='ipv4' address='192.168.122.8' gateway='192.168.122.1'/>
</interface>
@@ -4869,16 +4868,7 @@ qemu-kvm -net nic,model=? /dev/null
to define the network routes to use for the network device. The attributes
of this element are described in the documentation for the route
element in network definitions.
- This is used by the LXC driver and Since 1.3.3 by the QEMU
- driver.
-
-
-
- Since 1.3.3 ip elements can hold peer attribute to assign
- a point-to-point address for the network device. The attributes of this element
- are described in the documentation for the ip
element in
- network definitions.
- This is only used by the LXC and QEMU drivers.
+ This is only used by the LXC driver.
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index f77bbcf598..f143bf05bb 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2410,11 +2410,6 @@
-
-
-
-
-
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d8bed670f2..d93d981836 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5744,7 +5744,7 @@ virDomainNetIpParseXML(xmlNodePtr node)
unsigned int prefixValue = 0;
char *familyStr = NULL;
int family = AF_UNSPEC;
- char *address = NULL, *peer = NULL;
+ char *address = NULL;
if (!(prefixStr = virXMLPropString(node, "prefix")) ||
(virStrToLong_ui(prefixStr, NULL, 10, &prefixValue) < 0)) {
@@ -5758,9 +5758,6 @@ virDomainNetIpParseXML(xmlNodePtr node)
goto cleanup;
}
- if ((peer = virXMLPropString(node, "peer")) == NULL)
- VIR_DEBUG("Peer is empty");
-
familyStr = virXMLPropString(node, "family");
if (familyStr && STREQ(familyStr, "ipv4"))
family = AF_INET;
@@ -5778,14 +5775,6 @@ virDomainNetIpParseXML(xmlNodePtr node)
address);
goto cleanup;
}
-
- if ((peer != NULL) && (virSocketAddrParse(&ip->peer, peer, family) < 0)) {
- virReportError(VIR_ERR_INVALID_ARG,
- _("Failed to parse IP address: '%s'"),
- peer);
- goto cleanup;
- }
-
ip->prefix = prefixValue;
ret = ip;
@@ -5795,7 +5784,6 @@ virDomainNetIpParseXML(xmlNodePtr node)
VIR_FREE(prefixStr);
VIR_FREE(familyStr);
VIR_FREE(address);
- VIR_FREE(peer);
VIR_FREE(ip);
return ret;
}
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 31e7a86d47..1433900462 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -514,7 +514,6 @@ typedef struct _virDomainNetIpDef virDomainNetIpDef;
typedef virDomainNetIpDef *virDomainNetIpDefPtr;
struct _virDomainNetIpDef {
virSocketAddr address; /* ipv4 or ipv6 address */
- virSocketAddr peer; /* ipv4 or ipv6 address of peer */
unsigned int prefix; /* number of 1 bits in the net mask */
};