External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

xenconfig: format spice listenAddr when formating ports

Browse Source 
Move formating of spice listenAddr to the section of code
where spice ports are formatted.  It is more logical to
format address and ports together.  Account for the change
in spice cfg test file by moving 'spicehost'.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2015-04-23 15:42:50 -06:00
parent 096b39c961
commit e21b1180a9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xenconfig/xen_xl.c
View File

@ -683,6 +683,11 @@ xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def)
if (xenConfigSetInt(conf, "spice", 1) < 0) if (xenConfigSetInt(conf, "spice", 1) < 0)
return -1; return -1;
listenAddr = virDomainGraphicsListenGetAddress(graphics, 0);
if (listenAddr &&
xenConfigSetString(conf, "spicehost", listenAddr) < 0)
return -1;
if (xenConfigSetInt(conf, "spiceport", if (xenConfigSetInt(conf, "spiceport",
graphics->data.spice.port) < 0) graphics->data.spice.port) < 0)
return -1; return -1;
@ -701,11 +706,6 @@ xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def)
return -1; return -1;
} }
listenAddr = virDomainGraphicsListenGetAddress(graphics, 0);
if (listenAddr &&
xenConfigSetString(conf, "spicehost", listenAddr) < 0)
return -1;
if (xenConfigSetInt(conf, "spiceagent_mouse", if (xenConfigSetInt(conf, "spiceagent_mouse",
graphics->data.spice.mousemode) < 0) graphics->data.spice.mousemode) < 0)
return -1; return -1;

2
tests/xlconfigdata/test-spice.cfg
View File

@ -22,9 +22,9 @@ disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,
sdl = 0 sdl = 0
vnc = 0 vnc = 0
spice = 1 spice = 1
spicehost = "127.0.0.1"
spiceport = 590 spiceport = 590
spicetls_port = 500 spicetls_port = 500
spicedisable_ticketing = 1 spicedisable_ticketing = 1
spicepasswd = "thebeast" spicepasswd = "thebeast"
spicehost = "127.0.0.1"
spiceagent_mouse = 0 spiceagent_mouse = 0