Index: opennebula-1.1.85+svn329/src/vmm/LibVirtDriver.cc =================================================================== --- opennebula-1.1.85+svn329.orig/src/vmm/LibVirtDriver.cc 2009-01-28 18:31:47.332999499 +0100 +++ opennebula-1.1.85+svn329/src/vmm/LibVirtDriver.cc 2009-01-28 18:42:07.209030171 +0100 @@ -20,6 +20,8 @@ #include "Nebula.h" #include #include +#include +#include int LibVirtDriver::deployment_description( @@ -100,17 +102,26 @@ // ------------------------------------------------------------------------ - vm->get_template_attribute("CPU", cpu); + vm->get_template_attribute("VCPU", cpu); if(cpu.empty()) { - get_default("CPU",cpu); + get_default("VCPU",cpu); } + if(cpu.empty()) + { + vm->get_template_attribute("CPU", cpu); + } + + if(cpu.empty()) + { + get_default("CPU",cpu); + } + if (!cpu.empty()) { - //file << "\t" << cpu << "" << endl; - // TODO decide about the vpcu value + file << "\t" << (int) ceil(atof(cpu.c_str())) << "" << endl; } else {