From 2d241a6accdbbdacdc296571b2a4f73e8af5b3b9 Mon Sep 17 00:00:00 2001 From: "Pradipta Kr. Banerjee" Date: Mon, 22 Jun 2020 06:36:43 +0000 Subject: [PATCH] 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: bpradipt@in.ibm.com --- src/runtime/arch/ppc64le-options.mk | 2 +- src/runtime/virtcontainers/qemu_ppc64le.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime/arch/ppc64le-options.mk b/src/runtime/arch/ppc64le-options.mk index 821e4f683..9ce0a253c 100644 --- a/src/runtime/arch/ppc64le-options.mk +++ b/src/runtime/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/src/runtime/virtcontainers/qemu_ppc64le.go b/src/runtime/virtcontainers/qemu_ppc64le.go index 4f15ef859..fdddadcf2 100644 --- a/src/runtime/virtcontainers/qemu_ppc64le.go +++ b/src/runtime/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