From 878d9443dda9f3f34ad979f30cd812d927996459 Mon Sep 17 00:00:00 2001
From: zhaoertao <ertaozh@cn.ibm.com>
Date: Mon, 10 Nov 2014 03:09:23 -0500
Subject: [PATCH] enable SMT for powerKVM VMs

---
 xCAT-server/lib/xcat/plugins/kvm.pm | 76 ++++++++++++++++++++++++++---
 1 file changed, 68 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index c40baa899..02db71711 100644
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -401,9 +401,9 @@ sub reconfigvm {
 		$_->setData(getUnits($confdata->{vm}->{$node}->[0]->{memory},"M",1024));
 	}
     }
-    if (defined $confdata->{vm}->{$node}->[0]->{cpus}) {
+    if (defined $confdata->{vm}->{$node}->[0]->{vcpus}) {
 	$needfixin=1;
-	$domdesc->findnodes("/domain/vcpu/text()")->[0]->setData($confdata->{vm}->{$node}->[0]->{cpus});
+	$domdesc->findnodes("/domain/vcpu/text()")->[0]->setData($confdata->{vm}->{$node}->[0]->{vcpus});
     }
     if (defined $confdata->{vm}->{$node}->[0]->{bootorder}) {
         my @expectedorder = split(/[:,]/,$confdata->{vm}->{$node}->[0]->{bootorder});
@@ -664,6 +664,12 @@ sub build_xmldesc {
     my $cdloc=$args{cd};
     my %xtree=();
     my $hypcpumodel = $confdata->{$confdata->{vm}->{$node}->[0]->{host}}->{cpumodel};
+    my $hypcputype = $confdata->{$confdata->{vm}->{$node}->[0]->{host}}->{cputype};
+    my $hypcputhreads = $confdata->{$confdata->{vm}->{$node}->[0]->{host}}->{cpu_thread};
+    unless ($hypcputhreads) {
+        $hypcputhreads = "1";
+    }
+
     $xtree{type}='kvm';
     $xtree{name}->{content}=$node;
     $xtree{uuid}->{content}=getNodeUUID($node);
@@ -683,15 +689,38 @@ sub build_xmldesc {
     } else {
         $xtree{memory}->{content}=524288;
     }
-    if ($args{cpus}) {
-        $xtree{vcpu}->{content}=$args{cpus};
-        if ($confdata->{vm}->{$node}->[0]->{cpus}) {
+    if ($hypcpumodel eq "ppc64") {
+        my %cpuhash = ();
+        $cpuhash{model} = $hypcputype;
+        if ($args{cpus}) {
+            $xtree{vcpu}->{content}=$args{cpus} * $hypcputhreads;
+            $cpuhash{topology}->{sockets} = 1;
+            $cpuhash{topology}->{cores} = $args{cpus};
+            $cpuhash{topology}->{threads} = $hypcputhreads;
             $updatetable->{vm}->{$node}->{cpus}=$args{cpus};
+        } elsif (defined $confdata->{vm}->{$node}->[0]->{cpus}) {
+            $xtree{vcpu}->{content}=$confdata->{vm}->{$node}->[0]->{cpus} * $hypcputhreads;
+            $cpuhash{topology}->{sockets} = 1;
+            $cpuhash{topology}->{cores} = $confdata->{vm}->{$node}->[0]->{cpus};
+            $cpuhash{topology}->{threads} = $hypcputhreads;
+        } else {
+            $xtree{vcpu}->{content}=1 * $hypcputhreads;
+            $cpuhash{topology}->{sockets} = 1;
+            $cpuhash{topology}->{cores} = 1;
+            $cpuhash{topology}->{threads} = $hypcputhreads;
         }
-    } elsif (defined $confdata->{vm}->{$node}->[0]->{cpus}) {
-        $xtree{vcpu}->{content}=$confdata->{vm}->{$node}->[0]->{cpus};
+        $xtree{cpu} = \%cpuhash;
     } else {
-        $xtree{vcpu}->{content}=1;
+        if ($args{cpus}) {
+            $xtree{vcpu}->{content}=$args{cpus};
+            if ($confdata->{vm}->{$node}->[0]->{cpus}) {
+                $updatetable->{vm}->{$node}->{cpus}=$args{cpus};
+            }
+        } elsif (defined $confdata->{vm}->{$node}->[0]->{cpus}) {
+            $xtree{vcpu}->{content}=$confdata->{vm}->{$node}->[0]->{cpus};
+        } else {
+            $xtree{vcpu}->{content}=1;
+        }
     }
     if (defined ($confdata->{vm}->{$node}->[0]->{clockoffset})) {
         #If user requested a specific behavior, give it
@@ -1846,6 +1875,16 @@ sub chvm {
         } else { #offline xml edits
             my $parsed=$parser->parse_string($vmxml); #TODO: should only do this once, oh well
             if ($cpucount) {
+                my $hypcpumodel = $confdata->{$confdata->{vm}->{$node}->[0]->{host}}->{cpumodel};
+                if ($hypcpumodel eq "ppc64") {
+                    my $hypcputype = $confdata->{$confdata->{vm}->{$node}->[0]->{host}}->{cputype};
+                    my $cputhreads = $parsed->findnodes("/domain/cpu/topology")->[0]->getAttribute('threads');
+                    unless ($cputhreads) {
+                        $cputhreads = "1";
+                    }
+                    $parsed->findnodes("/domain/cpu/topology")->[0]->setAttribute('cores'=>$cpucount);
+                    $cpucount *= $cputhreads;
+                }
                 $parsed->findnodes("/domain/vcpu/text()")->[0]->setData($cpucount);
             }
             if ($memory) {
@@ -3011,6 +3050,20 @@ sub dohyp {
       my $nodeinfo = $hypconn->get_node_info();
       if (exists($nodeinfo->{model})) {
           $confdata->{$hyp}->{cpumodel} = $nodeinfo->{model};
+          if ($nodeinfo->{model} eq "ppc64") {
+              my $syshash = XMLin($hypconn->get_sysinfo());
+              my $processor_content = $syshash->{processor}->[0]->{entry}->{type}->{content};
+              if ($processor_content =~ /POWER8/i) {
+                  $confdata->{$hyp}->{cputype} = "power8";
+                  $confdata->{$hyp}->{cpu_thread} = "8";
+              } elsif ($processor_content =~ /POWER7/i) {
+                  $confdata->{$hyp}->{cputype} = "power7";
+                  $confdata->{$hyp}->{cpu_thread} = "4";
+              } elsif ($processor_content =~ /POWER6/i) {
+                  $confdata->{$hyp}->{cputype} = "power6";
+                  $confdata->{$hyp}->{cpu_thread} = "2";
+              }
+          }
       }
   }
 
@@ -3018,6 +3071,13 @@ sub dohyp {
     if ($confdata->{$hyp}->{cpumodel} and $confdata->{$hyp}->{cpumodel} =~ /ppc64/i) {
         $confdata->{vm}->{$node}->[0]->{storagemodel} = "scsi";
     }
+    if ($confdata->{$hyp}->{cpu_thread}) {
+        $confdata->{vm}->{$node}->[0]->{cpu_thread} = $confdata->{$hyp}->{cpu_thread};
+    }
+    if ($confdata->{$hyp}->{cputype})  {
+        $confdata->{vm}->{$node}->[0]->{cputype} = $confdata->{$hyp}->{cputype};
+    }
+
     my ($rc,@output) = guestcmd($hyp,$node,$command,@$args); 
 
     foreach(@output) {