diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d2db53b41823ecd266a3bd0d5da0b335c222bef8..0688616507aafd42b22f96e5f1e51f873f2b028b 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.

vhost-user interface
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f77bbcf5982886897155524354cede191fd8cd36..f143bf05bbf679bc4a5d6e968b38d00e74132c6c 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 d8bed670f2438eb0d826d1405cb687ded8241af7..d93d981836a772ae453acd292fd1cf1fc9843eab 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 31e7a86d47461f618507b93ccf51d6e3ebe26d40..14339004621f9ed7e362787b929dbb4a189e7f27 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 */ };