From 7e79247a82a7a04c4915c086f54612cfe67f0b67 Mon Sep 17 00:00:00 2001 From: Parth Dode Date: Wed, 26 Aug 2020 03:31:42 +0200 Subject: meta-agl-jailhouse: Enable jailhouse on qemu-x86_64 through runqemu jailhouse enable /usr/share/jailhouse/cells/qemu-agl.cell added the appropriate QB variables required to use runqemu v2: updated QB_SERIAL_OPT v3: updated do_configure and do_install v4: updated memmap v5: resolved comments v6: 2G to 1G Bug-AGL: SPEC-3507 Change-Id: Iae8cf6a1f27bc285e4c0c5f2518cd1985ddf3b74 Signed-off-by: Parth Dode --- templates/feature/agl-jailhouse/50_local.conf.inc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'templates') diff --git a/templates/feature/agl-jailhouse/50_local.conf.inc b/templates/feature/agl-jailhouse/50_local.conf.inc index 7c5b3292..565f9618 100644 --- a/templates/feature/agl-jailhouse/50_local.conf.inc +++ b/templates/feature/agl-jailhouse/50_local.conf.inc @@ -3,3 +3,24 @@ IMAGE_INSTALL_append = " jailhouse jailhouse-demos" PREFERRED_VERSION_linux-raspberrypi = "5.4%" RPI_KERNEL_DEVICETREE_OVERLAYS_append = " overlays/jailhouse-memory.dtbo" + +#Qemu Boot Config +# qemu flags for jailhouse +QB_OPT_APPEND_append = " -device intel-iommu,intremap=on,x-buggy-eim=on -device intel-hda,addr=1b.0 -device hda-duplex" +QB_MEM = "-m 1G" + +# use override with higher priority than x86-64 +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_ROOT = "/dev/vda" +QB_SERIAL_OPT = "-serial none -serial stdio -serial telnet:localhost:4321,server,nowait" + + +# 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 -- cgit 1.2.3-korg