shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

graphics: make address attribute for listen type='address' optional

Browse Source 
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>
This commit is contained in:
Pavel Hrdina 2016-05-09 15:50:54 +02:00
parent 38c9973f36
commit b33c14b342
48 changed files with 168 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
docs/formatdomain.html.in
View File

@ -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>

8
docs/schemas/domaincommon.rng
View File

@ -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">

3
src/conf/domain_conf.c
View File

@ -10800,8 +10800,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def,
if (STREQ_NULLABLE(newListen.address, ""))
VIR_FREE(newListen.address);
if (newListen.address &&
VIR_APPEND_ELEMENT(def->listens, def->nListens, newListen) < 0)
if (VIR_APPEND_ELEMENT(def->listens, def->nListens, newListen) < 0)
goto error;
}

16
src/qemu/qemu_process.c
View File

@ -4394,7 +4394,7 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver,
{
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
bool allocate = !(flags & VIR_QEMU_PROCESS_START_PRETEND);
size_t i;
size_t i, j;
int ret = -1;
if (allocate && qemuProcessGraphicsReservePorts(driver, vm) < 0)
@ -4426,12 +4426,16 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver,
break;
}
if (graphics->nListens == 0 && listenAddr) {
if (virDomainGraphicsListenAppendAddress(graphics,
listenAddr) < 0)
goto cleanup;
for (j = 0; j < graphics->nListens; j++) {
virDomainGraphicsListenDefPtr glisten = &graphics->listens[j];
graphics->listens[0].fromConfig = true;
if (glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS &&
!glisten->address && listenAddr) {
if (VIR_STRDUP(glisten->address, listenAddr) < 0)
goto cleanup;
glisten->fromConfig = true;
}
}
}

6
src/vbox/vbox_common.c
View File

@ -3385,8 +3385,10 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
VBOX_UTF16_FREE(netAddressUtf16);
}
if (STRNEQ_NULLABLE(netAddressUtf8, "") &&
virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8) < 0)
if (netAddressUtf8 && STREQ(netAddressUtf8, ""))
VBOX_UTF8_FREE(netAddressUtf8);
if (virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8) < 0)
goto cleanup;
gVBoxAPI.UIVRDxServer.GetAllowMultiConnection(VRDxServer, &allowMultiConnection);

8
src/vmx/vmx.c
View File

@ -1875,11 +1875,9 @@ virVMXParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def)
goto failure;
}
if (listenAddr) {
if (virDomainGraphicsListenAppendAddress(*def, listenAddr) < 0)
goto failure;
VIR_FREE(listenAddr);
}
if (virDomainGraphicsListenAppendAddress(*def, listenAddr) < 0)
goto failure;
VIR_FREE(listenAddr);
if (port < 0) {
VIR_WARN("VNC is enabled but VMX entry 'RemoteDisplay.vnc.port' "

12
src/xenconfig/xen_common.c
View File

@ -594,8 +594,7 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def)
if (xenConfigCopyStringOpt(conf, "vnclisten", &listenAddr) < 0)
goto cleanup;
if (listenAddr &&
virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
goto cleanup;
VIR_FREE(listenAddr);
@ -664,8 +663,7 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def)
if (STREQ(key + 10, "1"))
graphics->data.vnc.autoport = true;
} else if (STRPREFIX(key, "vnclisten=")) {
if (virDomainGraphicsListenAppendAddress(graphics,
key+10) < 0)
if (VIR_STRDUP(listenAddr, key+10) < 0)
goto cleanup;
} else if (STRPREFIX(key, "vncpasswd=")) {
if (VIR_STRDUP(graphics->data.vnc.auth.passwd, key + 10) < 0)
@ -699,6 +697,12 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def)
nextkey++;
key = nextkey;
}
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
if (virDomainGraphicsListenAppendAddress(graphics,
listenAddr) < 0)
goto cleanup;
VIR_FREE(listenAddr);
}
if (VIR_ALLOC_N(def->graphics, 1) < 0)
goto cleanup;
def->graphics[0] = graphics;

6
src/xenconfig/xen_sxpr.c
View File

@ -867,8 +867,7 @@ xenParseSxprGraphicsOld(virDomainDefPtr def,
graphics->data.vnc.autoport = true;
graphics->data.vnc.port = port;
if (listenAddr &&
virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
goto error;
if (VIR_STRDUP(graphics->data.vnc.auth.passwd, vncPasswd) < 0)
@ -988,8 +987,7 @@ xenParseSxprGraphicsNew(virDomainDefPtr def,
port += 5900;
graphics->data.vnc.port = port;
if (listenAddr &&
virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
goto error;
if (VIR_STRDUP(graphics->data.vnc.auth.passwd, vncPasswd) < 0)

3
src/xenconfig/xen_xl.c
View File

@ -186,8 +186,7 @@ xenParseXLSpice(virConfPtr conf, virDomainDefPtr def)
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_SPICE;
if (xenConfigCopyStringOpt(conf, "spicehost", &listenAddr) < 0)
goto cleanup;
if (listenAddr &&
virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
if (virDomainGraphicsListenAppendAddress(graphics, listenAddr) < 0)
goto cleanup;
VIR_FREE(listenAddr);

4
tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml
View File

@ -19,7 +19,9 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml
View File

@ -19,7 +19,9 @@
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml
View File

@ -77,7 +77,9 @@
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'/>
<graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'>
<listen type='address'/>
</graphics>
<sound model='ac97'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</sound>

4
tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml
View File

@ -119,7 +119,9 @@
</channel>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<sound model='ich6'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</sound>

4
tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml
View File

@ -63,7 +63,9 @@
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<sound model='ac97'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</sound>

4
tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml
View File

@ -52,7 +52,9 @@
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<sound model='ac97'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</sound>

1
tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml
View File

@ -30,6 +30,7 @@
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='spice' autoport='no'>
<listen type='address'/>
<gl enable='yes'/>
</graphics>
<video>

4
tests/sexpr2xmldata/sexpr2xml-curmem.xml
View File

@ -33,7 +33,9 @@
</console>
<input type='mouse' bus='xen'/>
<input type='keyboard' bus='xen'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='xen' vram='4096' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
View File

@ -49,7 +49,9 @@
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='5925' autoport='yes' keymap='en-us'/>
<graphics type='vnc' port='5925' autoport='yes' keymap='en-us'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
View File

@ -42,7 +42,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
View File

@ -45,7 +45,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
View File

@ -45,7 +45,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
View File

@ -42,7 +42,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
View File

@ -43,7 +43,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
View File

@ -47,7 +47,9 @@
</parallel>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
View File

@ -54,7 +54,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
View File

@ -50,7 +50,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
View File

@ -50,7 +50,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
View File

@ -48,7 +48,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
View File

@ -50,7 +50,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
View File

@ -48,7 +48,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
View File

@ -48,7 +48,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
View File

@ -52,7 +52,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
View File

@ -52,7 +52,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
View File

@ -52,7 +52,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
View File

@ -50,7 +50,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
View File

@ -42,7 +42,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<sound model='sb16'/>
<sound model='es1370'/>
<video>

4
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
View File

@ -42,7 +42,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<sound model='sb16'/>
<sound model='es1370'/>
<video>

4
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
View File

@ -43,7 +43,9 @@
<input type='mouse' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
View File

@ -43,7 +43,9 @@
<input type='tablet' bus='usb'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
View File

@ -42,7 +42,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
View File

@ -42,7 +42,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-fv.xml
View File

@ -42,7 +42,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
View File

@ -47,7 +47,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
View File

@ -31,7 +31,9 @@
</console>
<input type='mouse' bus='xen'/>
<input type='keyboard' bus='xen'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='xen' vram='4096' heads='1' primary='yes'/>
</video>

4
tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
View File

@ -46,7 +46,9 @@
</interface>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'/>
<graphics type='vnc' port='-1' autoport='yes' keymap='ja'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/vmx2xmldata/vmx2xml-graphics-vnc.xml
View File

@ -11,7 +11,9 @@
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<graphics type='vnc' port='5903' autoport='no' keymap='de' passwd='password'/>
<graphics type='vnc' port='5903' autoport='no' keymap='de' passwd='password'>
<listen type='address'/>
</graphics>
<video>
<model type='vmvga' vram='4096' primary='yes'/>
</video>

4
tests/xmconfigdata/test-no-source-cdrom.xml
View File

@ -47,7 +47,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>

4
tests/xmconfigdata/test-pci-devs.xml
View File

@ -47,7 +47,9 @@
</console>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes'>
<listen type='address'/>
</graphics>
<video>
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
</video>