diff options
author | Pavel Hrdina <phrdina@redhat.com> | 2016-05-09 15:50:54 +0200 |
---|---|---|
committer | Pavel Hrdina <phrdina@redhat.com> | 2016-05-17 10:41:45 +0200 |
commit | b33c14b342e5c2abeeee91c852ef2032327cb355 (patch) | |
tree | 97ba3c9c11d1833dd396f23a465940cbe6cd8af4 /docs | |
parent | 38c9973f36ce962079fd2f717ad358fe82d246f4 (diff) | |
download | libvirt-b33c14b342e5c2abeeee91c852ef2032327cb355.tar.gz |
graphics: make address attribute for listen type='address' optional
We support omitting listen attribute of graphics element so we should
also support omitting address attribute of listen element. This patch
also updates libvirt to always add a listen element into domain XML
except for VNC graphics if socket attribute is specified.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/formatdomain.html.in | 32 | ||||
-rw-r--r-- | docs/schemas/domaincommon.rng | 8 |
2 files changed, 24 insertions, 16 deletions
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 58b8cb6077..fd2dd339c7 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5126,11 +5126,10 @@ qemu-kvm -net nic,model=? /dev/null the TCP port number (with -1 as legacy syntax indicating that it should be auto-allocated). The <code>autoport</code> attribute is the new preferred syntax for indicating auto-allocation of the TCP - port to use. The <code>listen</code> attribute is an IP address - for the server to listen on. The <code>passwd</code> attribute - provides a VNC password in clear text. The <code>keymap</code> - attribute specifies the keymap to use. It is possible to set - a limit on the validity of the password by giving an timestamp + port to use. The <code>passwd</code> attribute provides a VNC + password in clear text. The <code>keymap</code> attribute specifies + the keymap to use. It is possible to set a limit on the validity of + the password by giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be in UTC. The <code>connected</code> attribute allows control of connected client during password changes. VNC accepts @@ -5168,14 +5167,12 @@ qemu-kvm -net nic,model=? /dev/null should be auto-allocated), while <code>tlsPort</code> gives an alternative secure port number. The <code>autoport</code> attribute is the new preferred syntax for indicating - auto-allocation of needed port numbers. The <code>listen</code> - attribute is an IP address for the server to listen on. - The <code>passwd</code> attribute provides a SPICE password in - clear text. The <code>keymap</code> attribute specifies the keymap - to use. It is possible to set a limit on the validity of - the password by giving an timestamp - <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be in - UTC. + auto-allocation of needed port numbers. The <code>passwd</code> + attribute provides a SPICE password in clear text. The + <code>keymap</code> attribute specifies the keymap to use. It is + possible to set a limit on the validity of the password by giving + an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> + assumed to be in UTC. </p> <p> The <code>connected</code> attribute allows control of connected @@ -5312,6 +5309,15 @@ qemu-kvm -net nic,model=? /dev/null or hostname (which will be resolved to an IP address via a DNS query) to listen on. </p> + <p> + It is possible to omit the <code>address</code> attribute in order to + use an address from config files <span class="since">Since 1.3.5</span>. + </p> + <p> + The <code>address</code> attribute is duplicated as <code>listen</code> + attribute in <code>graphics</code> element for backward compatibility. + If both are provided they must be equal. + </p> </dd> <dt><code>network</code></dt> <dd> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8798001d7d..903fd7ebe6 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2952,9 +2952,11 @@ <attribute name="type"> <value>address</value> </attribute> - <attribute name="address"> - <ref name="addrIPorName"/> - </attribute> + <optional> + <attribute name="address"> + <ref name="addrIPorName"/> + </attribute> + </optional> </group> <group> <attribute name="type"> |