This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 8a70f8a76d2bfe1ac0a231f4fad23363c7476852 Author: Masayuki Ishikawa <[email protected]> AuthorDate: Fri May 12 11:24:20 2023 +0900 boards: Add virtio blk driver to qemu-arm8a and rv-virt Summary: - This commit adds blk driver to qemu-armv8a:netnsh, rv-virt:netnsh and rv-virt:netnsh64 - Also updates README.txt Impact: - None Testing: - Tested with qemu-7.1 Signed-off-by: Masayuki Ishikawa <[email protected]> --- boards/arm64/qemu/qemu-armv8a/README.txt | 4 +++- boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig | 6 ++++++ boards/risc-v/qemu-rv/rv-virt/README.txt | 6 +++++- boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig | 6 ++++++ boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig | 6 ++++++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/boards/arm64/qemu/qemu-armv8a/README.txt b/boards/arm64/qemu/qemu-armv8a/README.txt index 97b6cb5885..c638d0217e 100644 --- a/boards/arm64/qemu/qemu-armv8a/README.txt +++ b/boards/arm64/qemu/qemu-armv8a/README.txt @@ -51,15 +51,17 @@ Getting Started -net none -chardev stdio,id=con,mux=on -serial chardev:con \ -mon chardev=con,mode=readline -kernel ./nuttx - 3.1.1 Single Core with network (GICv3) + 3.1.1 Single Core with virtio network and block driver (GICv3) Configuring NuttX and compile: $ ./tools/configure.sh -l qemu-armv8a:netnsh $ make + $ dd if=/dev/zero of=./mydisk-1gb.img bs=1M count=1024 Running with qemu $ qemu-system-aarch64 -cpu cortex-a53 -nographic \ -machine virt,virtualization=on,gic-version=3 \ -chardev stdio,id=con,mux=on -serial chardev:con \ -global virtio-mmio.force-legacy=false \ + -drive file=./mydisk-1gb.img,if=none,format=raw,id=hd -device virtio-blk-device,drive=hd \ -netdev user,id=u1,hostfwd=tcp:127.0.0.1:10023-10.0.2.15:23,hostfwd=tcp:127.0.0.1:15001-10.0.2.15:5001 \ -device virtio-net-device,netdev=u1,bus=virtio-mmio-bus.0 \ -mon chardev=con,mode=readline -kernel ./nuttx diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig index d3bb170182..8f9e8cb09d 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig @@ -19,12 +19,18 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=8192 CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y +CONFIG_DRIVERS_VIRTIO_BLK=y CONFIG_DRIVERS_VIRTIO_MMIO_BASE=0x0a000000 CONFIG_DRIVERS_VIRTIO_MMIO_IRQ=48 CONFIG_DRIVERS_VIRTIO_MMIO_NUM=32 CONFIG_DRIVERS_VIRTIO_MMIO_REGSIZE=0x200 CONFIG_DRIVERS_VIRTIO_NET=y CONFIG_EXAMPLES_HELLO=y +CONFIG_FAT_LCNAMES=y +CONFIG_FAT_LFN=y +CONFIG_FS_FAT=y +CONFIG_FS_FATTIME=y +CONFIG_FS_LARGEFILE=y CONFIG_FS_PROCFS=y CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y diff --git a/boards/risc-v/qemu-rv/rv-virt/README.txt b/boards/risc-v/qemu-rv/rv-virt/README.txt index cb3629ce14..35d2dee767 100644 --- a/boards/risc-v/qemu-rv/rv-virt/README.txt +++ b/boards/risc-v/qemu-rv/rv-virt/README.txt @@ -57,10 +57,13 @@ ... nsh> -4. Run the nuttx network with qemu +4. Run the virtio network and block driver with qemu + + $ dd if=/dev/zero of=./mydisk-1gb.img bs=1M count=1024 $ qemu-system-riscv32 -semihosting -M virt,aclint=on -cpu rv32 -smp 8 \ -global virtio-mmio.force-legacy=false \ + -drive file=./mydisk-1gb.img,if=none,format=raw,id=hd -device virtio-blk-device,drive=hd \ -netdev user,id=u1,hostfwd=tcp:127.0.0.1:10023-10.0.2.15:23,hostfwd=tcp:127.0.0.1:15001-10.0.2.15:5001 \ -device virtio-net-device,netdev=u1,bus=virtio-mmio-bus.0 \ -bios none -kernel nuttx -nographic @@ -69,6 +72,7 @@ $ qemu-system-riscv64 -semihosting -M virt,aclint=on -cpu rv64 -smp 8 \ -global virtio-mmio.force-legacy=false \ + -drive file=./mydisk-1gb.img,if=none,format=raw,id=hd -device virtio-blk-device,drive=hd \ -netdev user,id=u1,hostfwd=tcp:127.0.0.1:10023-10.0.2.15:23,hostfwd=tcp:127.0.0.1:15001-10.0.2.15:5001 \ -device virtio-net-device,netdev=u1,bus=virtio-mmio-bus.0 \ -bios none -kernel nuttx -nographic diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig index 3f698ad38d..3fc94a2eaf 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh/defconfig @@ -32,6 +32,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y +CONFIG_DRIVERS_VIRTIO_BLK=y CONFIG_DRIVERS_VIRTIO_MMIO_BASE=0x10001000 CONFIG_DRIVERS_VIRTIO_MMIO_IRQ=28 CONFIG_DRIVERS_VIRTIO_MMIO_NUM=8 @@ -39,7 +40,12 @@ CONFIG_DRIVERS_VIRTIO_MMIO_REGSIZE=0x1000 CONFIG_DRIVERS_VIRTIO_NET=y CONFIG_ELF=y CONFIG_EXAMPLES_HELLO=m +CONFIG_FAT_LCNAMES=y +CONFIG_FAT_LFN=y +CONFIG_FS_FAT=y +CONFIG_FS_FATTIME=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LARGEFILE=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INIT_ENTRYPOINT="nsh_main" diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig index acc2b4ba82..d712f7cde6 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64/defconfig @@ -32,6 +32,7 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEV_ZERO=y CONFIG_DRIVERS_VIRTIO=y +CONFIG_DRIVERS_VIRTIO_BLK=y CONFIG_DRIVERS_VIRTIO_MMIO_BASE=0x10001000 CONFIG_DRIVERS_VIRTIO_MMIO_IRQ=28 CONFIG_DRIVERS_VIRTIO_MMIO_NUM=8 @@ -39,7 +40,12 @@ CONFIG_DRIVERS_VIRTIO_MMIO_REGSIZE=0x1000 CONFIG_DRIVERS_VIRTIO_NET=y CONFIG_ELF=y CONFIG_EXAMPLES_HELLO=m +CONFIG_FAT_LCNAMES=y +CONFIG_FAT_LFN=y +CONFIG_FS_FAT=y +CONFIG_FS_FATTIME=y CONFIG_FS_HOSTFS=y +CONFIG_FS_LARGEFILE=y CONFIG_FS_PROCFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INIT_ENTRYPOINT="nsh_main"
