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

feature #2547: add localtime feature to Xen

Browse Source
This commit is contained in:
Javi Fontan 2014-02-17 16:25:46 +01:00
parent e95fa8fb7e
commit 859a85905d
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/vmm/XenDriver.cc
View File

@ -88,15 +88,17 @@ int XenDriver::deployment_description(
const VectorAttribute * features;
bool pae = false;
bool acpi = false;
bool apic = false;
bool pae = false;
bool acpi = false;
bool apic = false;
string device_model = "";
bool localtime = false;
int pae_found = -1;
int acpi_found = -1;
int apic_found = -1;
int device_model_found = -1;
int pae_found = -1;
int acpi_found = -1;
int apic_found = -1;
int device_model_found = -1;
int localtime_found = -1;
const VectorAttribute * raw;
string data;
@ -644,6 +646,8 @@ int XenDriver::deployment_description(
pae_found = features->vector_value("PAE", pae);
acpi_found = features->vector_value("ACPI", acpi);
apic_found = features->vector_value("APIC", apic);
localtime_found =
features->vector_value("LOCALTIME", localtime);
device_model = features->vector_value("DEVICE_MODEL");
if ( device_model != "" )
@ -677,6 +681,11 @@ int XenDriver::deployment_description(
}
}
if ( localtime_found != 0 )
{
get_default("FEATURES", "LOCALTIME", localtime);
}
if ( pae_found == 0)
{
file << "pae = " << on_off_string(pae) << endl;
@ -697,6 +706,11 @@ int XenDriver::deployment_description(
file << "device_model = '" << device_model << "'" << endl;
}
if ( localtime )
{
file << "localtime = 'yes'" << endl;
}
attrs.clear();
}

2
src/vmm_mad/exec/vmm_exec_xen4.conf
View File

@ -20,7 +20,7 @@
# - credit
# - os [kernel,initrd,root,kernel_cmd,hvm]
# - vcpu
# - features [acpi, pae, apic, device_model]
# - features [acpi, pae, apic, device_model, localtime]
# - disk[driver]
# - nic[model]
# - raw