NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

xenconfig: use local variable for graphics def

Browse Source 
'graphics->' is a bit easier to read and type, and makes for
shorter lines than 'def->graphics[0]->'.

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

23
src/xenconfig/xen_xl.c
View File

@ -667,9 +667,12 @@ static int
xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def) xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def)
{ {
const char *listenAddr = NULL; const char *listenAddr = NULL;
virDomainGraphicsDefPtr graphics;
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
if (def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { graphics = def->graphics[0];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
/* set others to false but may not be necessary */ /* set others to false but may not be necessary */
if (xenConfigSetInt(conf, "sdl", 0) < 0) if (xenConfigSetInt(conf, "sdl", 0) < 0)
return -1; return -1;
@ -681,37 +684,37 @@ xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def)
return -1; return -1;
if (xenConfigSetInt(conf, "spiceport", if (xenConfigSetInt(conf, "spiceport",
def->graphics[0]->data.spice.port) < 0) graphics->data.spice.port) < 0)
return -1; return -1;
if (xenConfigSetInt(conf, "spicetls_port", if (xenConfigSetInt(conf, "spicetls_port",
def->graphics[0]->data.spice.tlsPort) < 0) graphics->data.spice.tlsPort) < 0)
return -1; return -1;
if (def->graphics[0]->data.spice.auth.passwd) { if (graphics->data.spice.auth.passwd) {
if (xenConfigSetInt(conf, "spicedisable_ticketing", 1) < 0) if (xenConfigSetInt(conf, "spicedisable_ticketing", 1) < 0)
return -1; return -1;
if (def->graphics[0]->data.spice.auth.passwd && if (graphics->data.spice.auth.passwd &&
xenConfigSetString(conf, "spicepasswd", xenConfigSetString(conf, "spicepasswd",
def->graphics[0]->data.spice.auth.passwd) < 0) graphics->data.spice.auth.passwd) < 0)
return -1; return -1;
} }
listenAddr = virDomainGraphicsListenGetAddress(def->graphics[0], 0); listenAddr = virDomainGraphicsListenGetAddress(graphics, 0);
if (listenAddr && if (listenAddr &&
xenConfigSetString(conf, "spicehost", listenAddr) < 0) xenConfigSetString(conf, "spicehost", listenAddr) < 0)
return -1; return -1;
if (xenConfigSetInt(conf, "spiceagent_mouse", if (xenConfigSetInt(conf, "spiceagent_mouse",
def->graphics[0]->data.spice.mousemode) < 0) graphics->data.spice.mousemode) < 0)
return -1; return -1;
if (def->graphics[0]->data.spice.copypaste) { if (graphics->data.spice.copypaste) {
if (xenConfigSetInt(conf, "spicedvagent", 1) < 0) if (xenConfigSetInt(conf, "spicedvagent", 1) < 0)
return -1; return -1;
if (xenConfigSetInt(conf, "spice_clipboard_sharing", if (xenConfigSetInt(conf, "spice_clipboard_sharing",
def->graphics[0]->data.spice.copypaste) < 0) graphics->data.spice.copypaste) < 0)
return -1; return -1;
} }
} }