From c1798eb3412a6afd56feade2ab7a43089a4d313f Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 19 Jan 2009 13:48:12 +0000
Subject: [PATCH] -Correct problem where rpower on of xen guest would say 'off'
 -Correct bug with multple disk devices being referenced by the same name

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2629 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 691d360c6..dbf44fd1d 100644
--- a/xCAT-server/lib/xcat/plugins/xen.pm
+++ b/xCAT-server/lib/xcat/plugins/xen.pm
@@ -111,7 +111,6 @@ sub build_oshash {
 
 sub build_diskstruct {
     my @returns=();
-    my $diskhash;
     my $currdev;
     my @suffixes=('a'..'z');
     my $suffidx=0;
@@ -120,6 +119,7 @@ sub build_diskstruct {
         my @locations=split /\|/,$disklocs;
         foreach my $disk (@locations) {
             #Setting default values of a virtual disk backed by a file at hd*.
+            my $diskhash;
             $diskhash->{type} = 'file';
             $diskhash->{device} = 'disk';
             $diskhash->{target}->{dev} = 'hd'.$suffixes[$suffidx];
@@ -437,7 +437,7 @@ sub power {
     my $errstr;
     if ($subcommand eq 'on') {
         unless ($dom) {
-            $dom,$errstr = makedom($node);
+            ($dom,$errstr) = makedom($node);
             if ($errstr) { return (1,$errstr); }
         } else {
           $retstring .= " $status_noop";
@@ -453,7 +453,7 @@ sub power {
     } elsif ($subcommand eq 'reset') {
         if ($dom) {
             $dom->destroy();
-            $dom = makedom($node);
+            ($dom,$errstr) = makedom($node);
             if ($errstr) { return (1,$errstr); }
             $retstring.="reset";
         } else { $retstring .= " $status_noop"; }