Merge pull request #585 from bugfinder/master

build-vm-kvm: on power8 with qemu-5.0 add cap-ccf-assist=off
openSUSE · Jul 29, 2020 · 710fa83 · 710fa83
2 parents ab6f002 + 8c1c82f
commit 710fa83
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Build/Helm.pm b/Build/Helm.pm
@@ -77,7 +77,7 @@ sub show {
     die("bad name '$name'\n") if $name =~ /^[-\.]/;
     die("bad name '$name'\n") if $name =~ /[\/\000-\037]/;
     die("no version\n") unless defined $version;
-    die("bad version '$version'\n") if $versioneq '';
+    die("bad version '$version'\n") if $version eq '';
     die("bad version '$version'\n") if $version =~ /\//;
     die("bad version '$version'\n") if $version =~ /[\/\000-\037]/;
     if ($field eq 'manifest') {

diff --git a/build-vm-kvm b/build-vm-kvm
@@ -120,6 +120,12 @@ vm_verify_options_kvm() {
 	    kvm_bin="/usr/bin/qemu-system-ppc64"
 	    kvm_console=hvc0
 	    kvm_options="-enable-kvm -M pseries"
+	    if grep -q POWER8 /proc/cpuinfo ; then
+	        # This option only exists with QEMU 5.0 or newer
+		if $kvm_bin -machine 'pseries,?' 2>&1 | grep -q cap-ccf-assist ; then
+		kvm_options="-enable-kvm -M pseries,cap-ccf-assist=off"
+		fi
+	    fi
 	    grep -q PPC970MP /proc/cpuinfo && kvm_check_ppc970
 	    vm_kernel=/boot/vmlinux
 	    vm_initrd=/boot/initrd