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

Changes for #90 (acpi and pae values) applied to trunk

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@480 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Javier Fontán Muiños 2009-04-21 09:28:05 +00:00
parent 19e9bcad88
commit 25f5065070
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/vmm/LibVirtDriver.cc
View File

@ -489,22 +489,35 @@ int LibVirtDriver::deployment_description(
{
pae = features->vector_value("PAE");
acpi = features->vector_value("ACPI");
file << "\t<features>" << endl;
if ( pae == "yes" )
{
file << "\t\t<pae/>" << endl;
}
if ( acpi == "no" )
{
file << "\t\t<acpi/>" << endl;
}
file << "\t</features>" << endl;
}
}
if ( pae.empty() )
{
get_default("FEATURES", "PAE", pae);
}
if ( acpi.empty() )
{
get_default("FEATURES", "ACPI", acpi);
}
if( acpi=="yes" || pae=="yes" )
{
file << "\t<features>" << endl;
if ( pae == "yes" )
{
file << "\t\t<pae/>" << endl;
}
if ( acpi == "yes" )
{
file << "\t\t<acpi/>" << endl;
}
file << "\t</features>" << endl;
}
attrs.clear();

5
src/vmm_mad/kvm/vmm_kvm.conf
View File

@ -5,9 +5,14 @@
# - memory
# - cpu
# - vcpu
# - features [acpi, pae]
#VCPU = 1
#MEMORY = 128
#OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", boot=hd,kernel_cmd="ro"]
OS = [ boot = "hd" ]
FEATURES = [
PAE=no,
ACPI=yes
]