Skip to content
GitLab
Menu
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
8a4666cc
Commit
8a4666cc
authored
Dec 18, 2013
by
Leigh B Stoller
Browse files
Pass XEN_CORES through when not a shared node, or if an admin.
parent
066d3361
Changes
1
Hide whitespace changes
Inline
Side-by-side
tbsetup/libvtop_test.pm.in
View file @
8a4666cc
...
...
@@ -1400,6 +1400,12 @@ sub LoadVirtNodes($)
$attr->attrkey() eq "MEMORYSIZE") {
$vnode->_desires()->{"?+ram"} = $attr->attrvalue();
}
elsif ($attr->attrkey() eq "XEN_CORES") {
# Overridden below for shared nodes.
$self->experiment()->SetVirtNodeAttribute($vname,
"VM_VCPUS",
$attr->attrvalue());
}
}
$vnode->_atttributes($attrs);
...
...
@@ -1449,7 +1455,7 @@ sub LoadVirtNodes($)
# We will deal with later, but set a default=1 for now.
$self->experiment()->SetVirtNodeAttribute($vname, "VM_VCPUS", 1)
if (!$self->user()->IsAdmin());
if (
$vnode->_sharedokay() &&
!$self->user()->IsAdmin());
}
#
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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