feature #1163: XenDriver modifications to handle drivers with and without ':' and include support for HVM

This commit is contained in:
Ruben S. Montero committed 2013-06-07 12:19:07 +02:00
1 parent ff01b7b5ad
commit a5a8be2319
1 file changed
+18 -13
+18 -13
View File
@@ -16,6 +16,7 @@
#include "XenDriver.h"
#include "Nebula.h"
#include "NebulaUtil.h"
#include <sstream>
#include <fstream>
#include <math.h>
@@ -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();