From 0f4c23e96b5bcbe87093b8ccacd7b53e9f1346e4 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 4 Nov 2008 22:06:53 +0000 Subject: [PATCH] -Fix Xen support for block devices -Fix xen 'no-op' output git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2466 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/xen.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/xen.pm b/xCAT-server/lib/xcat/plugins/xen.pm index 79d5ec0fd..087e6461a 100644 --- a/xCAT-server/lib/xcat/plugins/xen.pm +++ b/xCAT-server/lib/xcat/plugins/xen.pm @@ -110,7 +110,7 @@ sub build_diskstruct { $currdev='hd'.$suffixes[$suffidx++]; if ($disktype eq "phy") { my $diskdev = substr($disk, 4); - $diskhash->{type}='dev'; + $diskhash->{type}='block'; $diskhash->{source}->{dev}=$diskdev; } else { $diskhash->{type}='file'; @@ -354,7 +354,7 @@ sub power { } unless ($retstring =~ /reset/) { - $retstring.=getpowstate($dom); + $retstring=getpowstate($dom).$retstring; } return (0,$retstring); } @@ -665,7 +665,7 @@ sub forward_data { foreach (@$responses) { #save the nodes that has errors and the ones that has no-op for use by the node status monitoring my $no_op=0; - if (exists($_->{node}->[0]->{errorcode})) { $no_op=1; } + if ($_->{node}->[0]->{errorcode}) { $no_op=1; } else { my $text=$_->{node}->[0]->{data}->[0]->{contents}->[0]; #print "data:$text\n";