feature #1163: add support for hvm in xen4 drivers

This commit is contained in:
Javi Fontan committed 2013-05-21 12:10:54 +02:00
1 parent 8e96e8da5a
commit abc4bbb6d3
2 files changed
+14 -3

No files matched your search

+12 -1
View File
@@ -42,6 +42,7 @@ int XenDriver::deployment_description(
string root = "";
string kernel_cmd = "";
string bootloader = "";
string hvm = "";
const VectorAttribute * disk;
const VectorAttribute * context;
@@ -155,6 +156,7 @@ int XenDriver::deployment_description(
root = os->vector_value("ROOT");
kernel_cmd = os->vector_value("KERNEL_CMD");
bootloader = os->vector_value("BOOTLOADER");
hvm = os->vector_value("HVM");
}
}
@@ -178,6 +180,11 @@ int XenDriver::deployment_description(
get_default("OS","ROOT",root);
}
if ( hvm.empty() )
{
get_default("OS","HVM",hvm);
}
if ( kernel_cmd.empty() )
{
get_default("OS","KERNEL_CMD",kernel_cmd);
@@ -206,6 +213,10 @@ int XenDriver::deployment_description(
{
file << "bootloader = \"" << bootloader << "\"" << endl;
}
else if ( !hvm.empty() && ( hvm=="yes" || hvm=="YES" ) )
{
file << "builder = \"hvm\"" << endl;
}
else
{
goto error_boot;
@@ -505,7 +516,7 @@ error_memory:
error_boot:
vm->log("VMM", Log::ERROR,
"No kernel or bootloader defined and no default provided.");
"No kernel, bootloader or hvm defined and no default provided.");
file.close();
return -1;
+2 -2
View File
@@ -18,14 +18,14 @@
# (all domains will use these values as defaults). These values can
# be overridden in each VM template. Valid atributes are:
# - credit
# - os [kernel,initrd,root,kernel_cmd]
# - os [kernel,initrd,root,kernel_cmd,hvm]
# - vcpu
# - disk[driver]
# - nic[model]
# - raw
#VCPU = 1
#OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", kernel_cmd="ro" ]
#OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", kernel_cmd="ro", hvm="yes" ]
CREDIT = 256
DISK = [ driver = "tap2:tapdisk:aio:" ]