github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-26 11:39:29 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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: bpradipt@in.ibm.com
This commit is contained in:
Pradipta Kr. Banerjee 2020-06-22 06:36:43 +00:00
parent b4d3a0af87
commit 2d241a6acc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/arch/ppc64le-options.mk
View File

@ -7,6 +7,6 @@
MACHINETYPE := pseries MACHINETYPE := pseries
KERNELPARAMS := 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. KERNELTYPE := uncompressed #This architecture must use an uncompressed kernel.
QEMUCMD := qemu-system-ppc64 QEMUCMD := qemu-system-ppc64

2
src/runtime/virtcontainers/qemu_ppc64le.go
View File

@ -22,7 +22,7 @@ const defaultQemuPath = "/usr/bin/qemu-system-ppc64"
const defaultQemuMachineType = QemuPseries 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 const defaultMemMaxPPC64le = 32256 // Restrict MemMax to 32Gb on PPC64le