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

Fix kvm issues seen in 2.6.0 testing

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9504 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2011-05-06 14:22:18 +00:00
parent 7541b9cd6e
commit 42b155260c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xCAT-server/lib/xcat/plugins/kvm.pm
View File

@@ -1012,6 +1012,7 @@ sub makedom {
my $parseddom = $parser->parse_string($xml);
my ($graphics) = $parseddom->findnodes("//graphics");
$graphics->setAttribute("passwd",genpassword(20));
$graphics->setAttribute("listen",'0.0.0.0');
my $errstr;
eval { $dom=$hypconn->create_domain($xml); };
if ($@) { $errstr = $@; }
@@ -1370,7 +1371,7 @@ sub chvm {
"a=s"=>\@addsizes,
"d=s"=>\@derefdisks,
"mem=s"=>\$memory,
"cdrom=s"=>\$cdrom,
"optical|cdrom=s"=>\$cdrom,
"eject"=>\$eject,
"cpus=s" => \$cpucount,
"p=s"=>\@purge,
@@ -1905,7 +1906,9 @@ sub clone_vm_from_master {
$url =~ s/,.*//;
my $destinationpool = get_storage_pool_by_url($url);
foreach $disk ($newnodexml->findnodes("/domain/devices/disk")) {
my $srcfilename = $disk->findnodes("./source")->[0]->getAttribute("file");
my ($source) = ($disk->findnodes("./source"));
unless ($source) { next; } #most likely an empty cdrom
my $srcfilename = $source->getAttribute("file");
my $filename = $srcfilename;
$filename =~ s/^.*$mastername/$node/;
$filename =~ m!\.([^\.]*)\z!;