From ee3e73b88989db2762ecf1d2bced6168db50114e Mon Sep 17 00:00:00 2001 From: Kohei Tokunaga Date: Sun, 10 Nov 2024 10:29:51 +0900 Subject: [PATCH] bump up qemu Signed-off-by: Kohei Tokunaga --- Dockerfile | 4 ++-- examples/emscripten-aarch64/htdocs/module.js | 2 +- examples/raspi3ap-qemu/src/htdocs/module.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 511b685..3e69775 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ ARG BOCHS_REPO=https://github.com/ktock/Bochs ARG BOCHS_REPO_VERSION=a88d1f687ec83ff82b5318f59dcecb8dab44fc83 ARG QEMU_REPO=https://github.com/ktock/qemu-wasm -ARG QEMU_REPO_VERSION=b9d652ca63a2d454d5fa49cd1dce582a881effa2 +ARG QEMU_REPO_VERSION=7ce4a680cb3b402bc4331891ea94fea0a57ec853 ARG SOURCE_REPO=https://github.com/ktock/container2wasm ARG SOURCE_REPO_VERSION=v0.6.5 @@ -754,7 +754,7 @@ COPY --link --from=qemu-emscripten-dev-aarch64-images /pack / FROM qemu-emscripten-dev AS qemu-emscripten-dev-aarch64 ARG LOAD_MODE -RUN EXTRA_CFLAGS="-O3 -g -Wno-error=unused-command-line-argument -matomics -mbulk-memory -DNDEBUG -DG_DISABLE_ASSERT -D_GNU_SOURCE -sASYNCIFY=1 -pthread -sPROXY_TO_PTHREAD=1 -sFORCE_FILESYSTEM -sALLOW_TABLE_GROWTH -sTOTAL_MEMORY=$((2048*1024*1024)) -sWASM_BIGINT -sMALLOC=mimalloc --js-library=/qemu/build/node_modules/xterm-pty/emscripten-pty.js -sEXPORT_ES6=1 " ; \ +RUN EXTRA_CFLAGS="-O3 -g -Wno-error=unused-command-line-argument -matomics -mbulk-memory -DNDEBUG -DG_DISABLE_ASSERT -D_GNU_SOURCE -sASYNCIFY=1 -pthread -sPROXY_TO_PTHREAD=1 -sFORCE_FILESYSTEM -sALLOW_TABLE_GROWTH -sTOTAL_MEMORY=2300MB -sWASM_BIGINT -sMALLOC=mimalloc --js-library=/qemu/build/node_modules/xterm-pty/emscripten-pty.js -sEXPORT_ES6=1 " ; \ emconfigure ../configure --static --target-list=aarch64-softmmu --cpu=wasm32 --cross-prefix= \ --without-default-features --enable-system --with-coroutine=fiber \ --extra-cflags="$EXTRA_CFLAGS" --extra-cxxflags="$EXTRA_CFLAGS" --extra-ldflags="-sEXPORTED_RUNTIME_METHODS=getTempRet0,setTempRet0,addFunction,removeFunction,TTY" && \ diff --git a/examples/emscripten-aarch64/htdocs/module.js b/examples/emscripten-aarch64/htdocs/module.js index 9439bc4..342057b 100644 --- a/examples/emscripten-aarch64/htdocs/module.js +++ b/examples/emscripten-aarch64/htdocs/module.js @@ -8,7 +8,7 @@ Module['arguments'] = [ '-nic', 'none', '-drive', 'if=virtio,format=raw,file=/pack/rootfs.bin', '-kernel', '/pack/bzImage', - '-append', 'earlyprintk=hvc0 console=hvc0 root=/dev/vda rootwait ro loglevel=7 NO_RUNTIME_CONFIG=1 init=/sbin/tini -- /sbin/init', + '-append', 'earlyprintk=hvc0 console=hvc0 root=/dev/vda rootwait no_console_suspend ro loglevel=7 NO_RUNTIME_CONFIG=1 init=/sbin/tini -- /sbin/init', '-device', 'virtio-serial,id=virtio-serial0', '-chardev', 'stdio,id=charconsole0,mux=on', '-device', 'virtconsole,chardev=charconsole0,id=console0' diff --git a/examples/raspi3ap-qemu/src/htdocs/module.js b/examples/raspi3ap-qemu/src/htdocs/module.js index d759a78..77d1762 100644 --- a/examples/raspi3ap-qemu/src/htdocs/module.js +++ b/examples/raspi3ap-qemu/src/htdocs/module.js @@ -6,5 +6,5 @@ Module['arguments'] = [ '-dtb', '/pack/bcm2710-rpi-3-b-plus.dtb', '-kernel', '/pack/kernel8.img', '-drive', 'file=/pack/rootfs.bin,format=raw,if=sd', - '-append', 'earlycon=pl011,0x3f201000 console=ttyAMA0,115200 loglevel=8 initcall_blacklist=bcm2835_pm_driver_init root=/dev/mmcblk0 rootfstype=ext4 rootwait' + '-append', 'earlycon=pl011,0x3f201000 console=ttyAMA0,115200 loglevel=8 initcall_blacklist=bcm2835_pm_driver_init root=/dev/mmcblk0 rootfstype=ext4 rootwait no_console_suspend' ];