On 03/27/2014 11:17 AM, Michal Privoznik wrote:
We allow users to use SLIRP stack. However, there are some knobs
which are not exposed to users, such as host network address, DNS
server, smb, and others.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
docs/formatdomain.html.in | 7 +-
docs/schemas/domaincommon.rng | 23 +++++-
src/conf/domain_conf.c | 88 ++++++++++++++++++++++
src/conf/domain_conf.h | 6 ++
src/qemu/qemu_command.c | 19 +++++
.../qemuxml2argvdata/qemuxml2argv-net-user-ip.args | 7 ++
.../qemuxml2argvdata/qemuxml2argv-net-user-ip.xml | 33 ++++++++
tests/qemuxml2argvtest.c | 1 +
8 files changed, 180 insertions(+), 4 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-ip.xml
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 7f90455..0a353ca 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -3225,7 +3225,11 @@
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. <span class="since">Since
1.2.3</span> the
We've already frozen for 1.2.3, and this feels like new features rather
than bug fix. Is it better to wait until after the release?
+ user network can have the <ip/> element to
override the default
+ network of <code>10.0.2.0/24</code>. For example it can be set to
+ <code>192.168.2.0/24</code>. The whole element and its attributes are
No mention of what those attributes are? Other than...
+ optional.
</p>
<pre>
@@ -3235,6 +3239,7 @@
...
<interface type='user'>
<mac address="00:11:22:33:44:55"/>
+ <ip address="192.168.2.0" prefix="24"
dns="192.168.2.3" dhcpstart="192.168.2.9"/>
...here in the example
+++ b/docs/schemas/domaincommon.rng
@@ -2152,9 +2152,26 @@
</optional>
<optional>
<element name="ip">
Needs an <interleave> around the optional sub-elements.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org