Some elements are offset just one space compared to their parent, some are misaligned completely, and so on. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- docs/schemas/capability.rng | 28 +++++++++--------- docs/schemas/domaincommon.rng | 66 +++++++++++++++++++++---------------------- docs/schemas/network.rng | 2 +- docs/schemas/nodedev.rng | 4 +-- docs/schemas/nwfilter.rng | 54 +++++++++++++++++------------------ docs/schemas/storagepool.rng | 4 +-- 6 files changed, 79 insertions(+), 79 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 071090c2d..e1ab5c224 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -57,21 +57,21 @@ <define name='secmodel'> <element name='secmodel'> <interleave> - <element name='model'> - <text/> - </element> - <element name='doi'> - <text/> - </element> - <zeroOrMore> - <element name='baselabel'> - <attribute name='type'> - <text/> - </attribute> + <element name='model'> + <text/> + </element> + <element name='doi'> + <text/> + </element> + <zeroOrMore> + <element name='baselabel'> + <attribute name='type'> <text/> - </element> - </zeroOrMore> - </interleave> + </attribute> + <text/> + </element> + </zeroOrMore> + </interleave> </element> </define> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a8e32014b..c9a4f7a9a 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -532,7 +532,7 @@ <attribute name="count"> <ref name="unsignedInt"/> </attribute> - <empty/> + <empty/> </element> </zeroOrMore> </interleave> @@ -1866,7 +1866,7 @@ <attribute name='copy_on_read'> <ref name="virOnOff"/> </attribute> - </define> + </define> <define name="discard"> <attribute name='discard'> <choice> @@ -2362,21 +2362,21 @@ <value>vhostuser</value> </attribute> <interleave> - <element name="source"> - <attribute name="type"> - <value>unix</value> - </attribute> - <attribute name="path"> - <ref name="absFilePath"/> - </attribute> - <attribute name="mode"> - <choice> - <value>server</value> - <value>client</value> - </choice> - </attribute> - <empty/> - </element> + <element name="source"> + <attribute name="type"> + <value>unix</value> + </attribute> + <attribute name="path"> + <ref name="absFilePath"/> + </attribute> + <attribute name="mode"> + <choice> + <value>server</value> + <value>client</value> + </choice> + </attribute> + <empty/> + </element> <ref name="interface-options"/> </interleave> </group> @@ -2660,14 +2660,14 @@ <optional> <element name="backend"> <optional> - <attribute name='tap'> - <ref name='absFilePath'/> - </attribute> + <attribute name='tap'> + <ref name='absFilePath'/> + </attribute> </optional> <optional> - <attribute name='vhost'> - <ref name='absFilePath'/> - </attribute> + <attribute name='vhost'> + <ref name='absFilePath'/> + </attribute> </optional> </element> </optional> @@ -3981,14 +3981,14 @@ <define name="tpm-backend"> <element name="backend"> - <choice> - <group> - <attribute name="type"> - <value>passthrough</value> - </attribute> - <ref name="tpm-passthrough-device"/> - </group> - </choice> + <choice> + <group> + <attribute name="type"> + <value>passthrough</value> + </attribute> + <ref name="tpm-passthrough-device"/> + </group> + </choice> </element> </define> @@ -4001,7 +4001,7 @@ </attribute> </optional> </element> - </optional> + </optional> </define> <define name="iommu"> @@ -4254,7 +4254,7 @@ <value>scsi</value> </attribute> <optional> - <ref name="sgIO"/> + <ref name="sgIO"/> </optional> <optional> <ref name="rawIO"/> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 1048dabf3..f37c422bf 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -324,7 +324,7 @@ <ref name="bandwidth"/> </optional> <optional> - <ref name="vlan"/> + <ref name="vlan"/> </optional> <!-- <ip> element --> diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index 2704eeb25..6b063cc22 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -228,7 +228,7 @@ </element> </oneOrMore> </element> - </optional> + </optional> <optional> <element name='iommuGroup'> @@ -531,7 +531,7 @@ <optional> <element name='model'> <text/> - </element> + </element> </optional> <optional> <element name='vendor'> diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng index dbe6af76c..7cfc05fa2 100644 --- a/docs/schemas/nwfilter.rng +++ b/docs/schemas/nwfilter.rng @@ -18,7 +18,7 @@ <ref name="filterref-node-attributes"/> </element> <element name="rule"> - <ref name="rule-node-attributes"/> + <ref name="rule-node-attributes"/> <optional> <zeroOrMore> <element name="mac"> @@ -360,7 +360,7 @@ <ref name='action-type'/> </attribute> <attribute name="direction"> - <ref name='direction-type'/> + <ref name='direction-type'/> </attribute> <optional> <attribute name="priority"> @@ -377,9 +377,9 @@ <define name="match-attribute"> <interleave> <optional> - <attribute name="match"> - <ref name="virYesNo"/> - </attribute> + <attribute name="match"> + <ref name="virYesNo"/> + </attribute> </optional> </interleave> </define> @@ -387,9 +387,9 @@ <define name="srcmac-attribute"> <interleave> <optional> - <attribute name="srcmacaddr"> - <ref name="addrMAC"/> - </attribute> + <attribute name="srcmacaddr"> + <ref name="addrMAC"/> + </attribute> </optional> </interleave> </define> @@ -398,9 +398,9 @@ <interleave> <ref name="srcmac-attribute"/> <optional> - <attribute name="srcmacmask"> - <ref name="addrMAC"/> - </attribute> + <attribute name="srcmacmask"> + <ref name="addrMAC"/> + </attribute> </optional> </interleave> </define> @@ -409,14 +409,14 @@ <interleave> <ref name="srcmacandmask-attributes"/> <optional> - <attribute name="dstmacaddr"> - <ref name="addrMAC"/> - </attribute> + <attribute name="dstmacaddr"> + <ref name="addrMAC"/> + </attribute> </optional> <optional> - <attribute name="dstmacmask"> - <ref name="addrMAC"/> - </attribute> + <attribute name="dstmacmask"> + <ref name="addrMAC"/> + </attribute> </optional> </interleave> </define> @@ -794,13 +794,13 @@ <ref name="boolean"/> </attribute> </optional> - </interleave> + </interleave> </define> <define name="ip-attributes"> <optional> <attribute name="protocol"> - <ref name="ipProtocolType"/> + <ref name="ipProtocolType"/> </attribute> </optional> </define> @@ -854,7 +854,7 @@ <data type="string"> <param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> </data> - </choice> + </choice> </define> <define name="addrIPv6"> @@ -864,7 +864,7 @@ <data type="string"> <param name="pattern">([a-fA-F0-9]{0,4}:){2,7}([a-fA-F0-9]*)(([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9])?</param> </data> - </choice> + </choice> </define> <define name="addrMask"> @@ -879,7 +879,7 @@ <data type="string"> <param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> </data> - </choice> + </choice> </define> <define name="addrMaskv6"> @@ -894,7 +894,7 @@ <data type="string"> <param name="pattern">([a-fA-F0-9]{0,4}:){2,7}([a-fA-F0-9]*)</param> </data> - </choice> + </choice> </define> <define name="sixbitrange"> @@ -1062,10 +1062,10 @@ </define> <define name='priority-type'> - <data type="int"> - <param name="minInclusive">-1000</param> - <param name="maxInclusive">1000</param> - </data> + <data type="int"> + <param name="minInclusive">-1000</param> + <param name="maxInclusive">1000</param> + </data> </define> <define name='statematch-type'> <data type="string"> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 8386f29aa..f0117bd69 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -521,7 +521,7 @@ <ref name='sourceinfodir'/> <ref name='sourcefmtnetfs'/> <optional> - <ref name='sourceinfovendor'/> + <ref name='sourceinfovendor'/> </optional> </interleave> </group> @@ -538,7 +538,7 @@ </attribute> </element> <optional> - <ref name='sourceinfovendor'/> + <ref name='sourceinfovendor'/> </optional> </interleave> </group> -- 2.13.5

https://bugzilla.redhat.com/show_bug.cgi?id=1075520 Currently, all that users can specify for an interface type of 'user' is the common attributes: PCI address, NIC model (and that's basically it). However, some need to configure other address range than the default one. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- Notes: Frankly, I'm not that convinced about this one. I mean, this puts IP addresses into net->hostIP while we are configuring guest side of the SLIRP. However, it just feels better to have the IP addresses under <source/> than under <interface/>. Which actually is the other option. So it's either: <interface type='user'> <source> <ip address='1.2.2.4'/> </source> </interface> for net->hostIP, or it's: <interface type='user'> <ip address='1.2.2.4'/> </interface> for net->guestIP. I went for the former one, but I don't have a strong opinion on that. docs/formatdomain.html.in | 13 ++++++- docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 5 +-- .../qemuxml2argv-net-user-addr.xml | 42 ++++++++++++++++++++++ .../qemuxml2xmlout-net-user-addr.xml | 1 + tests/qemuxml2xmltest.c | 1 + 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8ca7637a4..65a8886ee 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4701,7 +4701,14 @@ starting from <code>10.0.2.15</code>. The default router will be <code>10.0.2.2</code> and the DNS server will be <code>10.0.2.3</code>. This networking is the only option for unprivileged users who need their - VMs to have outgoing access. + VMs to have outgoing access. However, <span class="since">since + 3.8.0</span>, it is possible to override the default network by + including <code>source</code> element. The element can have <code>ip</code> + element for each IPv4 and IPv6. The element has <code>family</code> + attribute which accepts <code>ipv4</code> and <code>ipv6</code> values. + Then there's <code>address</code> attribute for specifying IP address + corresponding to the family. Optionally, the default prefix length can be + overridden via <code>prefix</code> attribute. </p> <pre> @@ -4711,6 +4718,10 @@ ... &lt;interface type='user'&gt; &lt;mac address="00:11:22:33:44:55"/&gt; + &lt;source&gt; + &lt;ip family='ipv4' address='172.17.2.0' prefix='24'/&gt; + &lt;ip family='ipv6' address='2001:db8:ac10:fd01::' prefix='64'/&gt; + &lt;/source&gt; &lt;/interface&gt; &lt;/devices&gt; ...</pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index c9a4f7a9a..7b5292bd3 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2428,6 +2428,11 @@ <value>user</value> </attribute> <interleave> + <optional> + <element name="source"> + <ref name="interface-ip-info"/> + </element> + </optional> <ref name="interface-options"/> </interleave> </group> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 676fc0f34..ef236757a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5214,12 +5214,13 @@ static int virDomainNetDefValidate(const virDomainNetDef *net) { if ((net->hostIP.nroutes || net->hostIP.nips) && - net->type != VIR_DOMAIN_NET_TYPE_ETHERNET) { + net->type != VIR_DOMAIN_NET_TYPE_ETHERNET && + net->type != VIR_DOMAIN_NET_TYPE_USER) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid attempt to set network interface " "host-side IP route and/or address info on " "interface of type '%s'. This is only supported " - "on interfaces of type 'ethernet'"), + "on interfaces of type 'ethernet' and 'user'"), virDomainNetTypeToString(net->type)); return -1; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml new file mode 100644 index 000000000..65362d8aa --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml @@ -0,0 +1,42 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <interface type='user'> + <mac address='00:11:22:33:44:55'/> + <source> + <ip address='172.17.2.0' family='ipv4' prefix='24'/> + </source> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml new file mode 120000 index 000000000..fd909ec24 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/qemuxml2argv-net-user-addr.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0a87cedf2..99b15ad0c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -531,6 +531,7 @@ mymain(void) DO_TEST("misc-uuid", NONE); DO_TEST("net-vhostuser", NONE); DO_TEST("net-user", NONE); + DO_TEST("net-user-addr", NONE); DO_TEST("net-virtio", NONE); DO_TEST("net-virtio-device", NONE); DO_TEST("net-virtio-disable-offloads", NONE); -- 2.13.5

On 09/12/2017 05:53 AM, Martin Kletzander wrote: In order to be consistent between all different hypervisors and interface connection types, any ip addresses and routes that are set to be visible on the host side of the interface "apparatus" must be under <source>, and those that are set to be visible on the guest side must be directly under the top level of <interface>. Since the IP you're configuring in this patch will be seen in the guest, it needs to be at the toplevel (i.e. it will be parsed into net->guestIP). When I dropped into this code to add support for specifying the IP address and routes on the *host* side of a tap device/veth device (see commit 98fa8f3ef) for QEMU and LXC (along with the "peer IP" for the other end of a tap/veth, which is *not* the same thing!), I *wished* that we had added the new <ip> and <route> elements for specifying guest-side <ip> and <route> under <target> as you suggest, since <target> is intended to contain items configuring how the device appears on the guest side[*]. Unfortunately, the decision on the location of guest-side <ip> was made *long* ago (at least prior to July of 2008, I didn't feel like spelunking any further), when <ip> was added directly under <interface> to support setting the guest-side IP address on Xen. Many years later (2014), when cbossdonnat added support for setting the guest-side IP of  an LXC veth pair, he also used the same element in order to provide consistency. So, we are unable to put it under <target>, and that decision was made sometime befor 2008, [*] Of course, the <target> element is used inconsistently within <interface> when compared to other uses - <target dev='blah'/> is used to specify the name of the tap/macvtap device *as it is known on the host side*. <target> has been described to me as a place to configure what things look like to the guest (e.g. the intended name for a disk device on the guest)(which is anyway ignored everywhere except Xen, but that's a different topic!), so using it to configure a name that's visible only to the host seems wrong, but it's been that way since sometime long before even I was involved with libvirt, so there is no changing it now :-P I think it *would* have been good under <target>, if anyone had foreseen the need for a <target> grouping (and consistently used it) from the beginning. But that train sailed into space long ago, so in order to be backward compatible and consistent, the guest-side IP/routes need to be directly under <interface> (just like the guest-side PCI address for PCI devices is), and the host-side IP/routes need to go under <source> (just as host-side PCI addresses of <hostdev> devices are). That's good, because I *do*! :-P This will of course need to be rewritten (and grammar cleaned up). You realize now that you've added support for setting the IP address, inevitably someone will expect you to write patches to support setting of the DHCP server, DNS server, default route, DHCP range, hostname, NMBD server, domain name, tftp directory and bootfile,.... :-O) Or maybe just check for presence of <route> during parsing and issue an ENOTSUPP log if it's found (that will be needed anyway in case XML validation is turned off). There's a certain point of detail when we stop caring about the exactness of the RNG. Eventually it becomes more difficult to read the RNG than it's worth, and the error messages provided when validation fails. Yeah, this should be separated. It was previously combined for brevity, only because the two were both only supported in exactly the same cases. Also, it looks like qemu only supports a single IPv4 and single IPv6 address on each interface, so you need to validate there is at most one of each type.

On 09/12/2017 07:35 PM, Laine Stump wrote: Okay, I'll move it up so that it's under <interface/> directly. For that I have already an answer prepared: Patches are welcome :-P Agreed. There's a lot of places where our schema is looser than our parser. And I don't think that's a problem. The only way we could have 1:1 correspondence is if we generated the parser from RNG schema. And even then there are per driver nuances (what's allowed in driver X is forbidden/not yet implemented in driver Y). Yep. I'm doing that in the next patch. Since this patch aims on config only, I wanted to keep it generic enough and check only obviously wrong values, e.g. IP addresses from movies like 218.108.149.373 (Mr Robot ftw! But apart from that I was surprised how quite accurate it was). Then, if a driver poses stricter limits those should be checked there now that we have per driver per device validation callbacks. One exception to this rule is, if all drivers forbid certain value/combination, it can go to the generic src/conf/ callback instead of copying the same lines all over the place. Michal

On Tue, Sep 12, 2017 at 11:32:53AM +0200, Michal Privoznik wrote: Oh, here it is, I'd just say that routes are not supported. But probably omit the previous message for other devices. Join them nicely together, please. I'm afraid this error message is pointless to a random observer. No matter how funny I find it, this could be better... This could fail if you have: <ip family='ipv6' prefix='119'/> <ip family='ipv4' prefix='24'/> I hope you see why ;)

On 09/12/2017 09:16 PM, Laine Stump wrote: Do I? If the prefix allows sufficiently enough room for them then the defaults shouldn't clash. Or you mean checking against host's IPs? The defaults according to the qemu docs are as follows: host = x.x.x.2 dhcpstart = x.x.x.15 - x.x.x.30 dns = x.x.x.3 smb = x.x.x.4 Michal