qemu: Remove hard-coding of Qemu machine options for ppc64le

Hard-coded Qemu machine options create challenges when running Kata with latest Qemu (v5.0) or with latest processor version. This patch makes it configurable by leveraging the existing machine_accelerators option in configuration.toml. This patch fixes #2657 for ppc64le Signed-off-by: [email protected] (cherry picked from commit 1d3e1ea)
kata-containers · Jun 8, 2020 · 3eee00e · 3eee00e
1 parent cecd7f7
commit 3eee00e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/arch/ppc64le-options.mk b/arch/ppc64le-options.mk
@@ -7,6 +7,6 @@
 
 MACHINETYPE := pseries
 KERNELPARAMS :=
-MACHINEACCELERATORS :=
+MACHINEACCELERATORS := "cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,cap-large-decr=off,cap-ccf-assist=off"
 KERNELTYPE := uncompressed #This architecture must use an uncompressed kernel.
 QEMUCMD := qemu-system-ppc64
diff --git a/virtcontainers/qemu_ppc64le.go b/virtcontainers/qemu_ppc64le.go
@@ -22,7 +22,7 @@ const defaultQemuPath = "/usr/bin/qemu-system-ppc64"
 
 const defaultQemuMachineType = QemuPseries
 
-const defaultQemuMachineOptions = "accel=kvm,usb=off,cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,cap-large-decr=off"
+const defaultQemuMachineOptions = "accel=kvm,usb=off"
 
 const defaultMemMaxPPC64le = 32256 // Restrict MemMax to 32Gb on PPC64le