Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
2dd08ebb
Commit
2dd08ebb
authored
Jun 28, 2013
by
Leigh B Stoller
Browse files
Minor changes for XEN support.
parent
f44d3d18
Changes
1
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniCM.pm.in
View file @
2dd08ebb
...
...
@@ -1063,6 +1063,9 @@ sub GetTicketAuxAux($$$$$$$$$)
if (GeniXML::HasXenSettings($ref)) {
$xensettings = GeniXML::GetXenSettings($ref);
}
my $ptype = GeniXML::XenPtype($ref);
$pctype = $ptype
if (defined($ptype));
}
elsif ($virtualization_subtype eq "emulab-spp") {
$osname = "SPPVM-FAKE";
...
...
@@ -1450,9 +1453,6 @@ sub GetTicketAuxAux($$$$$$$$$)
};
if
(
defined
($
xensettings
))
{
print
STDERR
"foo
\n
"
;
print
STDERR
Dumper
($
xensettings
);
foreach
my
$
setting
(
keys
(%$
xensettings
))
{
my
$
attrvalue
=
$
xensettings
->{$
setting
};
my
$
attrkey
;
...
...
@@ -1468,9 +1468,27 @@ sub GetTicketAuxAux($$$$$$$$$)
}
elsif
($
setting
eq
"cores"
)
{
$
attrkey
=
"XEN_CORES"
;
if
($
attrvalue
<
0
||
$
attrvalue
>
4
)
{
$
response
=
GeniResponse
->
Create
(
GENIRESPONSE_BADARGS
,
undef
,
"Bad XEN setting; "
.
"limited to 1-4 cores"
);
goto
bad
;
}
}
elsif
($
setting
eq
"disk"
)
{
$
attrkey
=
"XEN_EXTRAFS"
;
if
($
attrvalue
>
8
)
{
$
response
=
GeniResponse
->
Create
(
GENIRESPONSE_BADARGS
,
undef
,
"Bad XEN setting; "
.
"limited to 8GB extra disk"
);
goto
bad
;
}
}
else
{
next
;
}
$
virtexperiment
->
NewTableRow
(
"virt_node_attributes"
,
{
"vname"
=>
$
node_nickname
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment