From 53e53629fa43387fde81f0236521ccd20b23d6a1 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 30 Jul 2010 14:53:45 +0000
Subject: [PATCH] -Workaround changes in recent libvirt/qemu to not use
 autodetection for qcow2/raw determination  autodetect was intentionally
 disabled due to security concerns

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6926 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/kvm.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index a0aff8810..b6121f75e 100644
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -145,8 +145,13 @@ sub get_multiple_paths_by_url {
     my @volobjs = $poolobj->list_volumes();
     my %paths;
     foreach (@volobjs) {
-        if ($_->get_name() =~ /^$node\.(.*)$/) {
-            $paths{$_->get_path()} = $1;
+        if ($_->get_name() =~ /^$node\.([^\.]*)\.([^\.]*)$/) {
+            $paths{$_->get_path()} = {device=>$1,format=>$2};
+        } elsif (($_->get_name() =~ /^$node\.([^\.]*)$/) {
+             $paths{$_->get_path()} = {device=>$1,format=>'raw'}; 
+             #this requires any current user of qcow2 to migrate, unfortunate to escape
+             #a vulnerability where raw user could write malicious qcow2 to header
+             #and use that to get at files on the hypervisor os with escalated privilege
         }
     }
     return \%paths;
@@ -172,7 +177,7 @@ sub get_filepath_by_url { #at the end of the day, the libvirt storage api gives
     unless ($poolobj) { die "Could not get storage pool for $url"; }
     $poolobj->refresh(); #if volumes change on nfs storage, libvirt is too dumb to notice
     my @volobjs = $poolobj->list_volumes();
-    my $desiredname = $node.'.'.$dev;
+    my $desiredname = $node.'.'.$dev.'.'.$format;
     foreach (@volobjs) {
         if ($_->get_name() eq $desiredname) {
             if ($create) {
@@ -302,8 +307,10 @@ sub build_diskstruct {
                     my $tdiskhash;
                     $tdiskhash->{type};
                     $tdiskhash->{device}='disk';
+                    $tdiskhash->{driver}->{name}='qemu';
+                    $tdiskhash->{driver}->{type}=$disks{$_}->{format};
                     $tdiskhash->{source}->{file}=$_;
-                    $tdiskhash->{target}->{dev} = $disks{$_};
+                    $tdiskhash->{target}->{dev} = $disks{$_}->{device};
                     if ($disks{$_} =~ /^vd/) {
                         $tdiskhash->{target}->{bus} = 'virtio';
                     } elsif ($disks{$_} =~ /^hd/) {