From fd011336c08a11f8d4f818dcac351908ae403b76 Mon Sep 17 00:00:00 2001 From: Anmol Date: Mon, 5 Jul 2021 23:22:46 +0200 Subject: meta-agl-jailhouse: Fix memmap command line parameter Jailhouse requires a contiguous piece of RAM for itself and additional cells. This has to be preallocated during emulation of the image and is typically done by adding `memmap=$`, and here escape sequencing before the dollar should only be added when there is a need to put this parameter in GRUB2 variables in /etc/default/grub. Fix it by removing `\` escape sequence from memmap command line parameter of the virtual machine's kernel. Signed-off-by: Anmol Change-Id: I9981a359d1cb00900153e7692c6c1175cb0a3ce6 (cherry picked from commit 8be4ced7dd842564c9deaabaa90da75397a22c56) --- templates/feature/agl-jailhouse/50_local.conf.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/feature/agl-jailhouse') diff --git a/templates/feature/agl-jailhouse/50_local.conf.inc b/templates/feature/agl-jailhouse/50_local.conf.inc index 565f9618..081c53fb 100644 --- a/templates/feature/agl-jailhouse/50_local.conf.inc +++ b/templates/feature/agl-jailhouse/50_local.conf.inc @@ -14,7 +14,7 @@ QB_MACHINE_qemux86-64 = "-machine q35,kernel_irqchip=split -smp 4" QB_CPU_qemux86-64 = "-enable-kvm" QB_CPU_KVM_qemux86-64 = "-cpu host,-kvm-pv-eoi,-kvm-pv-ipi,-kvm-asyncpf,-kvm-steal-time,-kvmclock,-invpcid,-hypervisor" -QB_KERNEL_CMDLINE_APPEND_append = " intel_iommu=off memmap=82M\$0x22000000" +QB_KERNEL_CMDLINE_APPEND_append = " intel_iommu=off memmap=82M$0x22000000" QB_KERNEL_ROOT = "/dev/vda" QB_SERIAL_OPT = "-serial none -serial stdio -serial telnet:localhost:4321,server,nowait" @@ -23,4 +23,4 @@ QB_SERIAL_OPT = "-serial none -serial stdio -serial telnet:localhost:4321,server # jailhouse needs ttyS1 in the agl-qemu.cell as debug console. # restrict the SERIAL_CONSOLES to ttyS0 only SERIAL_CONSOLES = "115200;ttyS0" -KERNEL_CONSOLE = "ttyS0" \ No newline at end of file +KERNEL_CONSOLE = "ttyS0" -- cgit 1.2.3-korg