diff --git a/src/vmm/XenDriver.cc b/src/vmm/XenDriver.cc index bcdf7b650e..bf6512d3de 100644 --- a/src/vmm/XenDriver.cc +++ b/src/vmm/XenDriver.cc @@ -16,6 +16,7 @@ #include "XenDriver.h" #include "Nebula.h" +#include "NebulaUtil.h" #include #include #include @@ -213,14 +214,10 @@ int XenDriver::deployment_description( { file << "bootloader = \"" << bootloader << "\"" << endl; } - else if ( !hvm.empty() && ( hvm=="yes" || hvm=="YES" ) ) + else //No kernel & no bootloader use hvm { file << "builder = \"hvm\"" << endl; } - else - { - goto error_boot; - } attrs.clear(); @@ -236,6 +233,10 @@ int XenDriver::deployment_description( { default_driver = "tap:aio:"; } + else if (*default_driver.rbegin() != ':' ) + { + default_driver += ':'; + } file << "disk = [" << endl; @@ -259,13 +260,13 @@ int XenDriver::deployment_description( goto error_disk; } - transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper); + one_util::toupper(type); mode = "w"; if ( !ro.empty() ) { - transform(ro.begin(),ro.end(),ro.begin(),(int(*)(int))toupper); + one_util::toupper(ro); if ( ro == "YES" ) { @@ -276,6 +277,11 @@ int XenDriver::deployment_description( if ( !driver.empty() ) { file << " '" << driver; + + if (*driver.rbegin() != ':') + { + file << ":"; + } } else { @@ -316,6 +322,11 @@ int XenDriver::deployment_description( if ( !driver.empty() ) { file << driver; + + if (*driver.rbegin() != ':') + { + file << ":"; + } } else { @@ -514,12 +525,6 @@ error_memory: file.close(); return -1; -error_boot: - vm->log("VMM", Log::ERROR, - "No kernel, bootloader or hvm defined and no default provided."); - file.close(); - return -1; - error_disk: vm->log("VMM", Log::ERROR, "Wrong target value in DISK."); file.close();