mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 22:25:25 +00:00
ef79fb5b5f
Once it's plugged in, the <listen> element will be an optional
replacement for the "listen" attribute that graphics elements already
have. If the <listen> element is type='address', it will have an
attribute called 'address' which will contain an IP address or dns
name that the guest's display server should listen on. If, however,
type='network', the <listen> element should have an attribute called
'network' that will be set to the name of a network configuration to
get the IP address from.
* docs/schemas/domain.rng: updated to allow the <listen> element
* docs/formatdomain.html.in: document the <listen> element and its
attributes.
* src/conf/domain_conf.[hc]:
1) The domain parser, formatter, and data structure are modified to
support 0 or more <listen> subelements to each <graphics>
element. The old style "legacy" listen attribute is also still
accepted, and will be stored internally just as if it were a
separate <listen> element. On output (i.e. format), the address
attribute of the first <listen> element of type 'address' will be
duplicated in the legacy "listen" attribute of the <graphic>
element.
2) The "listenAddr" attribute has been removed from the unions in
virDomainGRaphicsDef for graphics types vnc, rdp, and spice.
This attribute is now in the <listen> subelement (aka
virDomainGraphicsListenDef)
3) Helper functions were written to provide simple access
(both Get and Set) to the listen elements and their attributes.
* src/libvirt_private.syms: export the listen helper functions
* src/qemu/qemu_command.c, src/qemu/qemu_hotplug.c,
src/qemu/qemu_migration.c, src/vbox/vbox_tmpl.c,
src/vmx/vmx.c, src/xenxs/xen_sxpr.c, src/xenxs/xen_xm.c
Modify all these files to use the listen helper functions rather
than directly referencing the (now missing) listenAddr
attribute. There can be multiple <listen> elements to a single
<graphics>, but the drivers all currently only support one, so all
replacements of direct access with a helper function indicate index
"0".
* tests/* - only 3 of these are new files added explicitly to test the
new <listen> element. All the others have been modified to reflect
the fact that any legacy "listen" attributes passed in to the domain
parse will be saved in a <listen> element (i.e. one of the
virDomainGraphicsListenDefs), and during the domain format function,
both the <listen> element as well as the legacy attributes will be
output.
51 lines
1.4 KiB
XML
51 lines
1.4 KiB
XML
<domain type='xen'>
|
|
<name>XenGuest2</name>
|
|
<uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
|
|
<memory>592896</memory>
|
|
<currentMemory>403456</currentMemory>
|
|
<vcpu>1</vcpu>
|
|
<os>
|
|
<type arch='i686' machine='xenfv'>hvm</type>
|
|
<loader>/usr/lib/xen/boot/hvmloader</loader>
|
|
<boot dev='cdrom'/>
|
|
</os>
|
|
<features>
|
|
<acpi/>
|
|
<apic/>
|
|
<pae/>
|
|
</features>
|
|
<clock offset='utc'/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
<on_crash>restart</on_crash>
|
|
<devices>
|
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
|
<disk type='block' device='disk'>
|
|
<driver name='phy'/>
|
|
<source dev='/dev/HostVG/XenGuest2'/>
|
|
<target dev='hda' bus='ide'/>
|
|
</disk>
|
|
<disk type='file' device='cdrom'>
|
|
<driver name='file'/>
|
|
<source file='/root/boot.iso'/>
|
|
<target dev='hdc' bus='ide'/>
|
|
<readonly/>
|
|
</disk>
|
|
<interface type='bridge'>
|
|
<mac address='00:16:3e:66:92:9c'/>
|
|
<source bridge='xenbr1'/>
|
|
<script path='vif-bridge'/>
|
|
<model type='e1000'/>
|
|
</interface>
|
|
<parallel type='tcp'>
|
|
<source mode='connect' host='127.0.0.1' service='7777'/>
|
|
<protocol type='raw'/>
|
|
<target port='0'/>
|
|
</parallel>
|
|
<input type='mouse' bus='ps2'/>
|
|
<graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
|
|
<listen type='address' address='127.0.0.1'/>
|
|
</graphics>
|
|
</devices>
|
|
</domain>
|