arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed bug 3458567: lsvm NODE -l not display huge_page information

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11249 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao 2011-12-15 06:55:40 +00:00
parent dc1b2ea716
commit e3d4fa281d
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
perl-xCAT/xCAT/FSPvm.pm
View File

@ -981,6 +981,7 @@ sub list {
my $lpar_infos;
my $bsr_infos;
my $huge_infos;
my %lpar_huges = ();
my $l_string = "\n";
#print Dumper($hash);
while (my ($mtms,$h) = each(%$hash) ) {
@ -1016,15 +1017,15 @@ sub list {
if (ref($bsr_infos) eq 'ARRAY') {
return $bsr_infos;
}
}
$huge_infos = get_cec_attr_info($node_name, $d, "huge_page");
if (ref($huge_infos) eq 'ARRAY') {
return $huge_infos;
}
}
$lpar_infos = get_cec_attr_info($node_name, $d, "lpar_info");
if (ref($lpar_infos) eq 'ARRAY') {
return $lpar_infos;
}
$huge_infos = get_cec_attr_info($node_name, $d, "huge_page");
if (ref($huge_infos) eq 'ARRAY') {
return $huge_infos;
}
}
my $v;
my @t;
@ -1034,22 +1035,32 @@ sub list {
my $ios = join('/', @t);
if ($request->{opt}->{l}) {
my $lparname = get_cec_lpar_name($node_name, $lpar_infos, $lparid);
my $hugepage;
if ($type =~ /^(fsp|cec)$/) {
my $lpar_bsr = get_cec_lpar_bsr($node_name, $bsr_infos, $lparid, $lparname);
if (ref($lpar_bsr) eq 'ARRAY') {
return $lpar_bsr;
}
$ios .= ": ".$lpar_bsr;
$hugepage = get_cec_lpar_hugepage($node_name, $huge_infos, $lparid, $lparname);
if (ref($hugepage) eq 'ARRAY') {
return $hugepage;
}
} else {
if ($lparid ne $id) {
next;
}
}
if (defined($lpar_huges{$lparid})) {
$hugepage = $lpar_huges{$lparid};
} else {
$hugepage = get_cec_attr_info($node_name, $d, "huge_page");
if (ref($hugepage) eq 'ARRAY') {
return $hugepage;
}
$lpar_huges{$lparid} = $hugepage;
}
}
my $hugepage = get_cec_lpar_hugepage($node_name, $huge_infos, $lparid, $lparname);
if (ref($hugepage) eq 'ARRAY') {
return $hugepage;
}
$ios .= ": ".$hugepage;
$ios .= ": ".$hugepage;
if (ref($lparname) eq 'ARRAY') {
return $lparname;
} else {