shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-19 06:50:07 +03:00
Code Releases Wiki Activity

bug #2585: add quotes to xen hvm vnc parameters

Browse Source
This commit is contained in:
Javi Fontan 2014-03-25 17:24:09 +01:00
parent 8e739beee2
commit 545567dabe
1 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/vmm/XenDriver.cc
View File

@ -511,21 +511,16 @@ int XenDriver::deployment_description(
{
file << "vfb = ['type=vnc";
} else {
file << "vnc=1" << endl;
file << "vnc = '1'" << endl;
}
if ( !listen.empty() )
{
if ( !is_hvm )
{
file << ",";
}
file << "vnclisten=" << listen;
if ( is_hvm )
{
file << endl;
file << "vnclisten = '" << listen << "'" << endl;
} else {
file << ",vnclisten=" << listen << endl;
}
}
@ -543,46 +538,31 @@ int XenDriver::deployment_description(
if ( is_hvm )
{
file << "vncunused=0" << endl;
file << "vncunused = '0'" << endl;
file << "vncdisplay = '" << display - 5900 << "'" << endl;
} else {
file << ",vncunused=0,";
}
file << "vncdisplay=" << display - 5900;
if ( is_hvm )
{
file << endl;
file << ",vncunused=0";
file << ",vncdisplay=" << display - 5900;
}
}
if ( !passwd.empty() )
{
if ( !is_hvm )
{
file << ",";
}
file <<"vncpasswd=" << passwd;
if ( is_hvm )
{
file << endl;
file << "vncpasswd = '" << passwd << "'" << endl;
} else {
file << ",vncpasswd=" << passwd;
}
}
if ( !keymap.empty() )
{
if ( !is_hvm )
{
file << ",";
}
file << "keymap=" << keymap ;
if ( is_hvm )
{
file << endl;
file << "keymap = '" << keymap << "'" << endl;
} else {
file << ",keymap=" << keymap;
}
}