diff options
| author |   Anmol <anmol.karan123@gmail.com> | 2021-07-05 23:22:46 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-07-07 11:58:49 +0000 |
| commit | fd011336c08a11f8d4f818dcac351908ae403b76 (patch) | |
| tree | 43c88ed66cd9edb35e5ebd258dcf93014a7bf8e1 | |
| parent | 37c827410831a8926789ba3e02d94b96476101f5 (diff) | |
meta-agl-jailhouse: Fix memmap command line parameterlamprey_12.0.0lamprey/12.0.012.0.0
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=<size>$<memory_address>`, 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 <anmol.karan123@gmail.com>
Change-Id: I9981a359d1cb00900153e7692c6c1175cb0a3ce6
(cherry picked from commit 8be4ced7dd842564c9deaabaa90da75397a22c56)
| -rw-r--r-- | templates/feature/agl-jailhouse/50_local.conf.inc | 4 |
1 files changed, 2 insertions, 2 deletions
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" |