From b5c780993c263d19dcb87fc1a06f3106be143ecf Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Tue, 9 Aug 2022 13:32:38 +0200
Subject: [PATCH] board: Rename virt_qemu to virt_qemu_<arch>

Instead of having a generic "virt_qemu" board use "virt_qemu_<arch>" in
order to have a clean distinction between boards. Current supported
boards are "virt_qemu_arm_v7a", "virt_qemu_arm_v8a", and
"virt_qemu_riscv".

issue #4034
---
 repos/base-hw/board/{virt_qemu => virt_qemu_arm_v7a}/arch | 1 -
 .../{virt_qemu => virt_qemu_arm_v7a}/image_link_address   | 0
 repos/base-hw/board/virt_qemu_arm_v8a/arch                | 1 +
 repos/base-hw/board/virt_qemu_arm_v8a/image_link_address  | 1 +
 ...-hw-virt_qemu.mk => bootstrap-hw-virt_qemu_arm_v7a.mk} | 4 ++--
 ...{core-hw-virt_qemu.mk => core-hw-virt_qemu_arm_v7a.mk} | 2 +-
 ...-hw-virt_qemu.mk => bootstrap-hw-virt_qemu_arm_v8a.mk} | 4 ++--
 ...{core-hw-virt_qemu.mk => core-hw-virt_qemu_arm_v8a.mk} | 2 +-
 repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk    | 4 ----
 .../recipes/src/base-hw-virt_qemu_arm_v7a/content.mk      | 4 ++++
 repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/hash  | 1 +
 .../used_apis                                             | 0
 .../recipes/src/base-hw-virt_qemu_arm_v8a/content.mk      | 4 ++++
 .../{base-hw-virt_qemu => base-hw-virt_qemu_arm_v8a}/hash | 0
 .../recipes/src/base-hw-virt_qemu_arm_v8a/used_apis       | 2 ++
 .../board/{virt_qemu => virt_qemu_arm_v7a}/board.h        | 0
 .../board/{virt_qemu => virt_qemu_arm_v7a}/platform.cc    | 0
 .../board/{virt_qemu_64 => virt_qemu_arm_v8a}/board.h     | 0
 .../board/{virt_qemu_64 => virt_qemu_arm_v8a}/platform.cc | 0
 .../core/board/{virt_qemu => virt_qemu_arm_v7a}/board.h   | 0
 .../board/{virt_qemu_64 => virt_qemu_arm_v8a}/board.h     | 0
 .../base/board/{virt_qemu => virt_qemu_arm_v7a}/qemu_args | 3 +--
 repos/base/board/virt_qemu_arm_v8a/qemu_args              | 8 ++++++++
 repos/dde_linux/run/vfs_cfg.run                           | 2 +-
 repos/dde_rump/run/libc_vfs_fs_ext2.run                   | 2 +-
 repos/dde_rump/run/rump_ext2.run                          | 2 +-
 repos/gems/run/aes_cbc_4k.run                             | 2 +-
 repos/gems/run/depot_download.run                         | 2 +-
 repos/gems/run/fs_query.run                               | 2 +-
 repos/gems/run/vfs_import.run                             | 2 +-
 repos/libports/run/extract.run                            | 2 +-
 repos/libports/run/fetchurl.inc                           | 2 +-
 repos/libports/run/libc_vfs_fs_fat.run                    | 2 +-
 repos/libports/run/lwip.run                               | 2 +-
 repos/libports/run/nic_bridge.run                         | 2 +-
 repos/libports/run/nic_router.inc                         | 2 +-
 .../README                                                | 0
 .../archives                                              | 2 +-
 .../hash                                                  | 0
 .../pkg/drivers_interactive-virt_qemu_arm_v8a/README      | 3 +++
 .../pkg/drivers_interactive-virt_qemu_arm_v8a/archives    | 6 ++++++
 .../pkg/drivers_interactive-virt_qemu_arm_v8a/hash        | 1 +
 .../README                                                | 0
 .../archives                                              | 2 +-
 .../hash                                                  | 0
 repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/README | 3 +++
 .../os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/archives | 4 ++++
 repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/hash   | 1 +
 .../content.mk                                            | 2 +-
 .../drivers.config                                        | 0
 .../event_filter.config                                   | 0
 .../hash                                                  | 0
 repos/os/recipes/raw/drivers_nic-virt_qemu/content.mk     | 4 ----
 repos/os/recipes/raw/drivers_nic-virt_qemu_arm/content.mk | 4 ++++
 .../drivers.config                                        | 0
 .../hash                                                  | 0
 repos/os/run/fb_bench.run                                 | 2 +-
 repos/os/run/nic_dump.run                                 | 2 +-
 repos/os/run/nic_router_disable_arp.run                   | 2 +-
 repos/os/run/nic_router_flood.run                         | 2 +-
 repos/os/run/ping.run                                     | 2 +-
 repos/os/run/ping_nic_router.run                          | 2 +-
 repos/os/run/sd_card_bench.run                            | 2 +-
 repos/os/run/timeout.run                                  | 2 +-
 repos/os/run/vmm_arm.run                                  | 3 ++-
 repos/ports/run/verify.run                                | 2 +-
 tool/builddir/build.conf/run_arm_v7                       | 6 +++---
 tool/builddir/build.conf/run_arm_v8                       | 6 +++---
 tool/builddir/build.conf/run_riscv                        | 4 ++--
 tool/run/power_on/qemu                                    | 7 -------
 70 files changed, 85 insertions(+), 58 deletions(-)
 rename repos/base-hw/board/{virt_qemu => virt_qemu_arm_v7a}/arch (50%)
 rename repos/base-hw/board/{virt_qemu => virt_qemu_arm_v7a}/image_link_address (100%)
 create mode 100644 repos/base-hw/board/virt_qemu_arm_v8a/arch
 create mode 100644 repos/base-hw/board/virt_qemu_arm_v8a/image_link_address
 rename repos/base-hw/lib/mk/spec/arm_v7/{bootstrap-hw-virt_qemu.mk => bootstrap-hw-virt_qemu_arm_v7a.mk} (76%)
 rename repos/base-hw/lib/mk/spec/arm_v7/{core-hw-virt_qemu.mk => core-hw-virt_qemu_arm_v7a.mk} (93%)
 rename repos/base-hw/lib/mk/spec/arm_v8/{bootstrap-hw-virt_qemu.mk => bootstrap-hw-virt_qemu_arm_v8a.mk} (77%)
 rename repos/base-hw/lib/mk/spec/arm_v8/{core-hw-virt_qemu.mk => core-hw-virt_qemu_arm_v8a.mk} (92%)
 delete mode 100644 repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk
 create mode 100644 repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/content.mk
 create mode 100644 repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/hash
 rename repos/base-hw/recipes/src/{base-hw-virt_qemu => base-hw-virt_qemu_arm_v7a}/used_apis (100%)
 create mode 100644 repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/content.mk
 rename repos/base-hw/recipes/src/{base-hw-virt_qemu => base-hw-virt_qemu_arm_v8a}/hash (100%)
 create mode 100644 repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/used_apis
 rename repos/base-hw/src/bootstrap/board/{virt_qemu => virt_qemu_arm_v7a}/board.h (100%)
 rename repos/base-hw/src/bootstrap/board/{virt_qemu => virt_qemu_arm_v7a}/platform.cc (100%)
 rename repos/base-hw/src/bootstrap/board/{virt_qemu_64 => virt_qemu_arm_v8a}/board.h (100%)
 rename repos/base-hw/src/bootstrap/board/{virt_qemu_64 => virt_qemu_arm_v8a}/platform.cc (100%)
 rename repos/base-hw/src/core/board/{virt_qemu => virt_qemu_arm_v7a}/board.h (100%)
 rename repos/base-hw/src/core/board/{virt_qemu_64 => virt_qemu_arm_v8a}/board.h (100%)
 rename repos/base/board/{virt_qemu => virt_qemu_arm_v7a}/qemu_args (61%)
 create mode 100644 repos/base/board/virt_qemu_arm_v8a/qemu_args
 rename repos/os/recipes/pkg/{drivers_interactive-virt_qemu => drivers_interactive-virt_qemu_arm_v7a}/README (100%)
 rename repos/os/recipes/pkg/{drivers_interactive-virt_qemu => drivers_interactive-virt_qemu_arm_v7a}/archives (71%)
 rename repos/os/recipes/pkg/{drivers_interactive-virt_qemu => drivers_interactive-virt_qemu_arm_v7a}/hash (100%)
 create mode 100644 repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/README
 create mode 100644 repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/archives
 create mode 100644 repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/hash
 rename repos/os/recipes/pkg/{drivers_nic-virt_qemu => drivers_nic-virt_qemu_arm_v7a}/README (100%)
 rename repos/os/recipes/pkg/{drivers_nic-virt_qemu => drivers_nic-virt_qemu_arm_v7a}/archives (64%)
 rename repos/os/recipes/pkg/{drivers_nic-virt_qemu => drivers_nic-virt_qemu_arm_v7a}/hash (100%)
 create mode 100644 repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/README
 create mode 100644 repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/archives
 create mode 100644 repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/hash
 rename repos/os/recipes/raw/{drivers_interactive-virt_qemu => drivers_interactive-virt_qemu_arm}/content.mk (73%)
 rename repos/os/recipes/raw/{drivers_interactive-virt_qemu => drivers_interactive-virt_qemu_arm}/drivers.config (100%)
 rename repos/os/recipes/raw/{drivers_interactive-virt_qemu => drivers_interactive-virt_qemu_arm}/event_filter.config (100%)
 rename repos/os/recipes/raw/{drivers_interactive-virt_qemu => drivers_interactive-virt_qemu_arm}/hash (100%)
 delete mode 100644 repos/os/recipes/raw/drivers_nic-virt_qemu/content.mk
 create mode 100644 repos/os/recipes/raw/drivers_nic-virt_qemu_arm/content.mk
 rename repos/os/recipes/raw/{drivers_nic-virt_qemu => drivers_nic-virt_qemu_arm}/drivers.config (100%)
 rename repos/os/recipes/raw/{drivers_nic-virt_qemu => drivers_nic-virt_qemu_arm}/hash (100%)

diff --git a/repos/base-hw/board/virt_qemu/arch b/repos/base-hw/board/virt_qemu_arm_v7a/arch
similarity index 50%
rename from repos/base-hw/board/virt_qemu/arch
rename to repos/base-hw/board/virt_qemu_arm_v7a/arch
index cd8d498319..16c61114d8 100644
--- a/repos/base-hw/board/virt_qemu/arch
+++ b/repos/base-hw/board/virt_qemu_arm_v7a/arch
@@ -1,2 +1 @@
 arm_v7a
-arm_v8a
diff --git a/repos/base-hw/board/virt_qemu/image_link_address b/repos/base-hw/board/virt_qemu_arm_v7a/image_link_address
similarity index 100%
rename from repos/base-hw/board/virt_qemu/image_link_address
rename to repos/base-hw/board/virt_qemu_arm_v7a/image_link_address
diff --git a/repos/base-hw/board/virt_qemu_arm_v8a/arch b/repos/base-hw/board/virt_qemu_arm_v8a/arch
new file mode 100644
index 0000000000..ae398b9a2e
--- /dev/null
+++ b/repos/base-hw/board/virt_qemu_arm_v8a/arch
@@ -0,0 +1 @@
+arm_v8a
diff --git a/repos/base-hw/board/virt_qemu_arm_v8a/image_link_address b/repos/base-hw/board/virt_qemu_arm_v8a/image_link_address
new file mode 100644
index 0000000000..f8742e5363
--- /dev/null
+++ b/repos/base-hw/board/virt_qemu_arm_v8a/image_link_address
@@ -0,0 +1 @@
+0x40000000
diff --git a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu_arm_v7a.mk
similarity index 76%
rename from repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu.mk
rename to repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu_arm_v7a.mk
index d4351334e5..b26a3dc66e 100644
--- a/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v7/bootstrap-hw-virt_qemu_arm_v7a.mk
@@ -1,6 +1,6 @@
-REP_INC_DIR += src/bootstrap/board/virt_qemu
+REP_INC_DIR += src/bootstrap/board/virt_qemu_arm_v7a
 
-SRC_CC  += bootstrap/board/virt_qemu/platform.cc
+SRC_CC  += bootstrap/board/virt_qemu_arm_v7a/platform.cc
 SRC_CC  += bootstrap/spec/arm/arm_v7_cpu.cc
 SRC_CC  += bootstrap/spec/arm/cortex_a15_cpu.cc
 SRC_CC  += bootstrap/spec/arm/gicv2.cc
diff --git a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu_arm_v7a.mk
similarity index 93%
rename from repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu.mk
rename to repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu_arm_v7a.mk
index 477b70eb93..e6830f1877 100644
--- a/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu_arm_v7a.mk
@@ -1,4 +1,4 @@
-REP_INC_DIR += src/core/board/virt_qemu
+REP_INC_DIR += src/core/board/virt_qemu_arm_v7a
 REP_INC_DIR += src/core/spec/arm/virtualization
 
 # add C++ sources
diff --git a/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu_arm_v8a.mk
similarity index 77%
rename from repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu.mk
rename to repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu_arm_v8a.mk
index c6d06d592f..65ac7ac5cb 100644
--- a/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-virt_qemu_arm_v8a.mk
@@ -1,8 +1,8 @@
-REP_INC_DIR += src/bootstrap/board/virt_qemu_64
+REP_INC_DIR += src/bootstrap/board/virt_qemu_arm_v8a
 
 SRC_CC  += bootstrap/spec/arm/gicv3.cc
 SRC_CC  += bootstrap/spec/arm_64/cortex_a53_mmu.cc
-SRC_CC  += bootstrap/board/virt_qemu_64/platform.cc
+SRC_CC  += bootstrap/board/virt_qemu_arm_v8a/platform.cc
 SRC_CC  += lib/base/arm_64/kernel/interface.cc
 SRC_CC  += spec/64bit/memory_map.cc
 SRC_S   += bootstrap/spec/arm_64/crt0.s
diff --git a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu.mk b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu_arm_v8a.mk
similarity index 92%
rename from repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu.mk
rename to repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu_arm_v8a.mk
index 27e337f0fe..41825db29d 100644
--- a/repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu.mk
+++ b/repos/base-hw/lib/mk/spec/arm_v8/core-hw-virt_qemu_arm_v8a.mk
@@ -1,4 +1,4 @@
-REP_INC_DIR += src/core/board/virt_qemu_64
+REP_INC_DIR += src/core/board/virt_qemu_arm_v8a
 REP_INC_DIR += src/core/spec/arm/virtualization
 
 # add C++ sources
diff --git a/repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk b/repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk
deleted file mode 100644
index 2d331b60be..0000000000
--- a/repos/base-hw/recipes/src/base-hw-virt_qemu/content.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-CONTENT += src/core/board/virt_qemu_64 \
-           src/bootstrap/board/virt_qemu_64
-
-include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
diff --git a/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/content.mk b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/content.mk
new file mode 100644
index 0000000000..38ce9bebad
--- /dev/null
+++ b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/content.mk
@@ -0,0 +1,4 @@
+CONTENT += src/core/board/virt_qemu_arm_v7a \
+           src/bootstrap/board/virt_qemu_arm_v7a
+
+include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
diff --git a/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/hash b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/hash
new file mode 100644
index 0000000000..dd479c2c5b
--- /dev/null
+++ b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/hash
@@ -0,0 +1 @@
+2022-08-10 70b4f8849f5c72c7d76985d7d5d2dbbd68bb7808
diff --git a/repos/base-hw/recipes/src/base-hw-virt_qemu/used_apis b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/used_apis
similarity index 100%
rename from repos/base-hw/recipes/src/base-hw-virt_qemu/used_apis
rename to repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v7a/used_apis
diff --git a/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/content.mk b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/content.mk
new file mode 100644
index 0000000000..7b0ace030f
--- /dev/null
+++ b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/content.mk
@@ -0,0 +1,4 @@
+CONTENT += src/core/board/virt_qemu_arm_v8a \
+           src/bootstrap/board/virt_qemu_arm_v8a
+
+include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc
diff --git a/repos/base-hw/recipes/src/base-hw-virt_qemu/hash b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/hash
similarity index 100%
rename from repos/base-hw/recipes/src/base-hw-virt_qemu/hash
rename to repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/hash
diff --git a/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/used_apis b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/used_apis
new file mode 100644
index 0000000000..ed9b772565
--- /dev/null
+++ b/repos/base-hw/recipes/src/base-hw-virt_qemu_arm_v8a/used_apis
@@ -0,0 +1,2 @@
+base-hw
+base
diff --git a/repos/base-hw/src/bootstrap/board/virt_qemu/board.h b/repos/base-hw/src/bootstrap/board/virt_qemu_arm_v7a/board.h
similarity index 100%
rename from repos/base-hw/src/bootstrap/board/virt_qemu/board.h
rename to repos/base-hw/src/bootstrap/board/virt_qemu_arm_v7a/board.h
diff --git a/repos/base-hw/src/bootstrap/board/virt_qemu/platform.cc b/repos/base-hw/src/bootstrap/board/virt_qemu_arm_v7a/platform.cc
similarity index 100%
rename from repos/base-hw/src/bootstrap/board/virt_qemu/platform.cc
rename to repos/base-hw/src/bootstrap/board/virt_qemu_arm_v7a/platform.cc
diff --git a/repos/base-hw/src/bootstrap/board/virt_qemu_64/board.h b/repos/base-hw/src/bootstrap/board/virt_qemu_arm_v8a/board.h
similarity index 100%
rename from repos/base-hw/src/bootstrap/board/virt_qemu_64/board.h
rename to repos/base-hw/src/bootstrap/board/virt_qemu_arm_v8a/board.h
diff --git a/repos/base-hw/src/bootstrap/board/virt_qemu_64/platform.cc b/repos/base-hw/src/bootstrap/board/virt_qemu_arm_v8a/platform.cc
similarity index 100%
rename from repos/base-hw/src/bootstrap/board/virt_qemu_64/platform.cc
rename to repos/base-hw/src/bootstrap/board/virt_qemu_arm_v8a/platform.cc
diff --git a/repos/base-hw/src/core/board/virt_qemu/board.h b/repos/base-hw/src/core/board/virt_qemu_arm_v7a/board.h
similarity index 100%
rename from repos/base-hw/src/core/board/virt_qemu/board.h
rename to repos/base-hw/src/core/board/virt_qemu_arm_v7a/board.h
diff --git a/repos/base-hw/src/core/board/virt_qemu_64/board.h b/repos/base-hw/src/core/board/virt_qemu_arm_v8a/board.h
similarity index 100%
rename from repos/base-hw/src/core/board/virt_qemu_64/board.h
rename to repos/base-hw/src/core/board/virt_qemu_arm_v8a/board.h
diff --git a/repos/base/board/virt_qemu/qemu_args b/repos/base/board/virt_qemu_arm_v7a/qemu_args
similarity index 61%
rename from repos/base/board/virt_qemu/qemu_args
rename to repos/base/board/virt_qemu_arm_v7a/qemu_args
index 2d21c33626..183d6293ad 100644
--- a/repos/base/board/virt_qemu/qemu_args
+++ b/repos/base/board/virt_qemu_arm_v7a/qemu_args
@@ -1,9 +1,8 @@
 -m 2048
+-M virt,virtualization=true -cpu cortex-a15 -smp 2
 -global virtio-mmio.force-legacy=false
 -device virtio-net-device,bus=virtio-mmio-bus.0,netdev=net0
 -device virtio-mouse-device
 -device virtio-keyboard-device
 -device virtio-gpu-device
 -netdev user,id=net0
-arm_v8a: -M virt,virtualization=true,gic-version=3 -cpu cortex-a53 -smp 4
-arm_v7a: -M virt,virtualization=true -cpu cortex-a15 -smp 2
diff --git a/repos/base/board/virt_qemu_arm_v8a/qemu_args b/repos/base/board/virt_qemu_arm_v8a/qemu_args
new file mode 100644
index 0000000000..a9c9e5f1f4
--- /dev/null
+++ b/repos/base/board/virt_qemu_arm_v8a/qemu_args
@@ -0,0 +1,8 @@
+-m 2048
+-M virt,virtualization=true,gic-version=3 -cpu cortex-a53 -smp 4
+-global virtio-mmio.force-legacy=false
+-device virtio-net-device,bus=virtio-mmio-bus.0,netdev=net0
+-device virtio-mouse-device
+-device virtio-keyboard-device
+-device virtio-gpu-device
+-netdev user,id=net0
diff --git a/repos/dde_linux/run/vfs_cfg.run b/repos/dde_linux/run/vfs_cfg.run
index 55419cc29b..abdf0eef57 100644
--- a/repos/dde_linux/run/vfs_cfg.run
+++ b/repos/dde_linux/run/vfs_cfg.run
@@ -1,4 +1,4 @@
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/dde_rump/run/libc_vfs_fs_ext2.run b/repos/dde_rump/run/libc_vfs_fs_ext2.run
index 581236094d..55be02619e 100644
--- a/repos/dde_rump/run/libc_vfs_fs_ext2.run
+++ b/repos/dde_rump/run/libc_vfs_fs_ext2.run
@@ -1,4 +1,4 @@
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run
index a7dea12adf..c44c156c66 100644
--- a/repos/dde_rump/run/rump_ext2.run
+++ b/repos/dde_rump/run/rump_ext2.run
@@ -2,7 +2,7 @@ if {[have_spec arm]} {
    assert_spec arm_v7
 }
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/gems/run/aes_cbc_4k.run b/repos/gems/run/aes_cbc_4k.run
index 6c5872b973..c2e6950583 100644
--- a/repos/gems/run/aes_cbc_4k.run
+++ b/repos/gems/run/aes_cbc_4k.run
@@ -3,7 +3,7 @@ set block_number 12345
 
 set test_rounds  10000
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/gems/run/depot_download.run b/repos/gems/run/depot_download.run
index 00466a20c7..56e7aa5bc4 100644
--- a/repos/gems/run/depot_download.run
+++ b/repos/gems/run/depot_download.run
@@ -5,7 +5,7 @@ if {[have_board linux] || [have_board rpi3] || [have_board imx53_qsb_tz]} {
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/gems/run/fs_query.run b/repos/gems/run/fs_query.run
index 2492146f73..fec0651a92 100644
--- a/repos/gems/run/fs_query.run
+++ b/repos/gems/run/fs_query.run
@@ -1,6 +1,6 @@
 create_boot_directory
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/gems/run/vfs_import.run b/repos/gems/run/vfs_import.run
index d0d963dd6f..6f2346bcea 100644
--- a/repos/gems/run/vfs_import.run
+++ b/repos/gems/run/vfs_import.run
@@ -1,4 +1,4 @@
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/libports/run/extract.run b/repos/libports/run/extract.run
index 699e69c553..3369bdc1c3 100644
--- a/repos/libports/run/extract.run
+++ b/repos/libports/run/extract.run
@@ -1,6 +1,6 @@
 create_boot_directory
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/libports/run/fetchurl.inc b/repos/libports/run/fetchurl.inc
index 1a218d36e0..c81d851462 100644
--- a/repos/libports/run/fetchurl.inc
+++ b/repos/libports/run/fetchurl.inc
@@ -10,7 +10,7 @@ if {[have_board rpi3] || [have_board imx53_qsb_tz]} {
 }
 
 if {[get_cmd_switch --autopilot] && ([have_board linux] ||
-                                     [have_board riscv_qemu])} {
+                                     [have_board virt_qemu_riscv])} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/libports/run/libc_vfs_fs_fat.run b/repos/libports/run/libc_vfs_fs_fat.run
index cbf12c61f3..d6079385c1 100644
--- a/repos/libports/run/libc_vfs_fs_fat.run
+++ b/repos/libports/run/libc_vfs_fs_fat.run
@@ -1,4 +1,4 @@
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run
index 8881d41d53..144db0030c 100644
--- a/repos/libports/run/lwip.run
+++ b/repos/libports/run/lwip.run
@@ -25,7 +25,7 @@ if {[have_board linux] ||
     [have_board rpi3]} {
 	puts "\n Run script is not supported on this platform. \n"; exit 0 }
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run
index 7aac8e2276..12b1f6199f 100644
--- a/repos/libports/run/nic_bridge.run
+++ b/repos/libports/run/nic_bridge.run
@@ -8,7 +8,7 @@ if {[have_board rpi3]} {
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc
index 6e0fd49dc9..fd8539c946 100644
--- a/repos/libports/run/nic_router.inc
+++ b/repos/libports/run/nic_router.inc
@@ -1,4 +1,4 @@
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu/README b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/README
similarity index 100%
rename from repos/os/recipes/pkg/drivers_interactive-virt_qemu/README
rename to repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/README
diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/archives
similarity index 71%
rename from repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives
rename to repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/archives
index 9b392ccf04..bb1b5d8f0f 100644
--- a/repos/os/recipes/pkg/drivers_interactive-virt_qemu/archives
+++ b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/archives
@@ -3,4 +3,4 @@ _/src/virtio_input_drv
 _/src/platform_drv
 _/src/event_filter
 _/src/virtdev_rom
-_/raw/drivers_interactive-virt_qemu
+_/raw/drivers_interactive-virt_qemu_arm
diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu/hash b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/hash
similarity index 100%
rename from repos/os/recipes/pkg/drivers_interactive-virt_qemu/hash
rename to repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v7a/hash
diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/README b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/README
new file mode 100644
index 0000000000..3273ce23de
--- /dev/null
+++ b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/README
@@ -0,0 +1,3 @@
+
+               Device drivers needed to run interactive
+          scenarios on the Virt platform as emulated by Qemu
diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/archives b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/archives
new file mode 100644
index 0000000000..bb1b5d8f0f
--- /dev/null
+++ b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/archives
@@ -0,0 +1,6 @@
+_/src/virtio_fb_drv
+_/src/virtio_input_drv
+_/src/platform_drv
+_/src/event_filter
+_/src/virtdev_rom
+_/raw/drivers_interactive-virt_qemu_arm
diff --git a/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/hash b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/hash
new file mode 100644
index 0000000000..52ad32bde8
--- /dev/null
+++ b/repos/os/recipes/pkg/drivers_interactive-virt_qemu_arm_v8a/hash
@@ -0,0 +1 @@
+2022-08-10 1f5b06e3adabbb73ba2b6e24edf621b15cfafa9a
diff --git a/repos/os/recipes/pkg/drivers_nic-virt_qemu/README b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/README
similarity index 100%
rename from repos/os/recipes/pkg/drivers_nic-virt_qemu/README
rename to repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/README
diff --git a/repos/os/recipes/pkg/drivers_nic-virt_qemu/archives b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/archives
similarity index 64%
rename from repos/os/recipes/pkg/drivers_nic-virt_qemu/archives
rename to repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/archives
index 9aae66c752..c947c8bdc9 100644
--- a/repos/os/recipes/pkg/drivers_nic-virt_qemu/archives
+++ b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/archives
@@ -1,4 +1,4 @@
-_/raw/drivers_nic-virt_qemu
+_/raw/drivers_nic-virt_qemu_arm
 _/src/virtdev_rom
 _/src/platform_drv
 _/src/virtio_nic_drv
diff --git a/repos/os/recipes/pkg/drivers_nic-virt_qemu/hash b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/hash
similarity index 100%
rename from repos/os/recipes/pkg/drivers_nic-virt_qemu/hash
rename to repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v7a/hash
diff --git a/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/README b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/README
new file mode 100644
index 0000000000..b9ad938515
--- /dev/null
+++ b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/README
@@ -0,0 +1,3 @@
+
+               Device drivers needed for scenarios
+                   using one network interface
diff --git a/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/archives b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/archives
new file mode 100644
index 0000000000..c947c8bdc9
--- /dev/null
+++ b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/archives
@@ -0,0 +1,4 @@
+_/raw/drivers_nic-virt_qemu_arm
+_/src/virtdev_rom
+_/src/platform_drv
+_/src/virtio_nic_drv
diff --git a/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/hash b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/hash
new file mode 100644
index 0000000000..c51748fa16
--- /dev/null
+++ b/repos/os/recipes/pkg/drivers_nic-virt_qemu_arm_v8a/hash
@@ -0,0 +1 @@
+2022-08-10 8cc0b5d0e02903c31134630d4244ec9135cb5560
diff --git a/repos/os/recipes/raw/drivers_interactive-virt_qemu/content.mk b/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/content.mk
similarity index 73%
rename from repos/os/recipes/raw/drivers_interactive-virt_qemu/content.mk
rename to repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/content.mk
index 54b94f2896..c954b65ba9 100644
--- a/repos/os/recipes/raw/drivers_interactive-virt_qemu/content.mk
+++ b/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/content.mk
@@ -1,7 +1,7 @@
 content: drivers.config event_filter.config en_us.chargen special.chargen
 
 drivers.config event_filter.config:
-	cp $(REP_DIR)/recipes/raw/drivers_interactive-virt_qemu/$@ $@
+	cp $(REP_DIR)/recipes/raw/drivers_interactive-virt_qemu_arm/$@ $@
 
 en_us.chargen special.chargen:
 	cp $(REP_DIR)/src/server/event_filter/$@ $@
diff --git a/repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config b/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config
similarity index 100%
rename from repos/os/recipes/raw/drivers_interactive-virt_qemu/drivers.config
rename to repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/drivers.config
diff --git a/repos/os/recipes/raw/drivers_interactive-virt_qemu/event_filter.config b/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/event_filter.config
similarity index 100%
rename from repos/os/recipes/raw/drivers_interactive-virt_qemu/event_filter.config
rename to repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/event_filter.config
diff --git a/repos/os/recipes/raw/drivers_interactive-virt_qemu/hash b/repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/hash
similarity index 100%
rename from repos/os/recipes/raw/drivers_interactive-virt_qemu/hash
rename to repos/os/recipes/raw/drivers_interactive-virt_qemu_arm/hash
diff --git a/repos/os/recipes/raw/drivers_nic-virt_qemu/content.mk b/repos/os/recipes/raw/drivers_nic-virt_qemu/content.mk
deleted file mode 100644
index 78a408f9d6..0000000000
--- a/repos/os/recipes/raw/drivers_nic-virt_qemu/content.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-content: drivers.config
-
-drivers.config:
-	cp $(REP_DIR)/recipes/raw/drivers_nic-virt_qemu/$@ $@
diff --git a/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/content.mk b/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/content.mk
new file mode 100644
index 0000000000..0dca8b503e
--- /dev/null
+++ b/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/content.mk
@@ -0,0 +1,4 @@
+content: drivers.config
+
+drivers.config:
+	cp $(REP_DIR)/recipes/raw/drivers_nic-virt_qemu_arm/$@ $@
diff --git a/repos/os/recipes/raw/drivers_nic-virt_qemu/drivers.config b/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config
similarity index 100%
rename from repos/os/recipes/raw/drivers_nic-virt_qemu/drivers.config
rename to repos/os/recipes/raw/drivers_nic-virt_qemu_arm/drivers.config
diff --git a/repos/os/recipes/raw/drivers_nic-virt_qemu/hash b/repos/os/recipes/raw/drivers_nic-virt_qemu_arm/hash
similarity index 100%
rename from repos/os/recipes/raw/drivers_nic-virt_qemu/hash
rename to repos/os/recipes/raw/drivers_nic-virt_qemu_arm/hash
diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run
index f764505b0f..65a907520a 100644
--- a/repos/os/run/fb_bench.run
+++ b/repos/os/run/fb_bench.run
@@ -9,7 +9,7 @@ if {[have_board imx7d_sabre] ||
 }
 
 if {[get_cmd_switch --autopilot] && ([have_spec linux] ||
-                                     [have_board riscv_qemu])} {
+                                     [have_board virt_qemu_riscv])} {
 	puts "\nAutopilot run is not supported on this platform\n"
 	exit 0
 }
diff --git a/repos/os/run/nic_dump.run b/repos/os/run/nic_dump.run
index 96324f1fd5..315195a083 100644
--- a/repos/os/run/nic_dump.run
+++ b/repos/os/run/nic_dump.run
@@ -4,7 +4,7 @@ if {[have_spec foc] || [have_spec linux] || [have_board rpi3] ||
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/os/run/nic_router_disable_arp.run b/repos/os/run/nic_router_disable_arp.run
index 6a60925cdf..23890b73f6 100644
--- a/repos/os/run/nic_router_disable_arp.run
+++ b/repos/os/run/nic_router_disable_arp.run
@@ -5,7 +5,7 @@ if {![have_include power_on/qemu] || [have_spec foc] || [have_spec linux] ||
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/os/run/nic_router_flood.run b/repos/os/run/nic_router_flood.run
index b5d555710e..6f67f12247 100644
--- a/repos/os/run/nic_router_flood.run
+++ b/repos/os/run/nic_router_flood.run
@@ -7,7 +7,7 @@ if {![have_include power_on/qemu] ||
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && ([have_board riscv_qemu] ||
+if {[get_cmd_switch --autopilot] && ([have_board virt_qemu_riscv] ||
                                      [have_board zynq_qemu])} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run
index 58c57ee607..2caac903c1 100644
--- a/repos/os/run/ping.run
+++ b/repos/os/run/ping.run
@@ -38,7 +38,7 @@ if {[have_spec foc] || [have_board rpi3] || [have_board imx53_qsb_tz]} {
 }
 
 if {[get_cmd_switch --autopilot] && ([have_spec linux] ||
-                                     [have_board riscv_qemu])} {
+                                     [have_board virt_qemu_riscv])} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run
index 67e781abd5..b447ada897 100644
--- a/repos/os/run/ping_nic_router.run
+++ b/repos/os/run/ping_nic_router.run
@@ -4,7 +4,7 @@ if {[have_spec foc] || [have_spec linux] || [have_board rpi3] ||
 	exit 0
 }
 
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/os/run/sd_card_bench.run b/repos/os/run/sd_card_bench.run
index 9e239a5fdb..e3a2b9226c 100644
--- a/repos/os/run/sd_card_bench.run
+++ b/repos/os/run/sd_card_bench.run
@@ -1,7 +1,7 @@
 #
 # Check for platform support
 #
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/repos/os/run/timeout.run b/repos/os/run/timeout.run
index 8a872a81fd..ad6afb56ca 100644
--- a/repos/os/run/timeout.run
+++ b/repos/os/run/timeout.run
@@ -10,7 +10,7 @@ proc fast_polling_buf_size  { } {
 	if {[expr [have_board pbxa9]        && [have_spec foc]]} { return 40000000 }
 	if {[expr [have_board imx53_qsb_tz] && [have_spec hw]]}  { return 40000000 }
 	if {[expr [have_board rpi]          && [have_spec hw]]}  { return 40000000 }
-	if {[expr [have_board riscv_qemu]   && [have_spec hw]]}  { return 15000000 }
+	if {[expr [have_board virt_qemu_riscv]   && [have_spec hw]]}  { return 15000000 }
 	return 80000000
 }
 
diff --git a/repos/os/run/vmm_arm.run b/repos/os/run/vmm_arm.run
index d5b5e54bbe..06a8ada3ae 100644
--- a/repos/os/run/vmm_arm.run
+++ b/repos/os/run/vmm_arm.run
@@ -7,7 +7,8 @@
 assert_spec hw
 
 if { ![have_board imx7d_sabre] && ![have_board imx8q_evk] &&
-     ![have_board virt_qemu]} {
+     ![have_board virt_qemu_arm_v7a] &&
+     ![have_board virt_qemu_arm_v8a]} {
 	puts "Run script is not supported on this platform"
 	exit 0
 }
diff --git a/repos/ports/run/verify.run b/repos/ports/run/verify.run
index 6d145b8213..7d69ee1bb0 100644
--- a/repos/ports/run/verify.run
+++ b/repos/ports/run/verify.run
@@ -1,4 +1,4 @@
-if {[get_cmd_switch --autopilot] && [have_board riscv_qemu]} {
+if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	puts "Autopilot mode is not supported on this platform."
 	exit 0
 }
diff --git a/tool/builddir/build.conf/run_arm_v7 b/tool/builddir/build.conf/run_arm_v7
index 722bae3f91..8b399f2b85 100644
--- a/tool/builddir/build.conf/run_arm_v7
+++ b/tool/builddir/build.conf/run_arm_v7
@@ -5,13 +5,13 @@ QEMU_RUN_OPT := --include power_on/qemu  --include log/qemu
 #KERNEL ?= hw
 
 # board to use (imx53_qsb, imx53_qsb_tz, imx6q_sabrelite, imx7d_sabre,
-#               nit6_solox, pbxa9, usb_armory, virt_qemu, wand_quad,
+#               nit6_solox, pbxa9, usb_armory, virt_qemu_arm_v7a, wand_quad,
 #               or zynq_qemu)
 #BOARD ?= pbxa9
 
 # local variable for run-tool arguments that depend on the used board
-BOARD_RUN_OPT(pbxa9)     = $(QEMU_RUN_OPT)
-BOARD_RUN_OPT(virt_qemu) = $(QEMU_RUN_OPT)
+BOARD_RUN_OPT(pbxa9)             = $(QEMU_RUN_OPT)
+BOARD_RUN_OPT(virt_qemu_arm_v7a) = $(QEMU_RUN_OPT)
 
 ##
 ## Qemu arguments, effective when using the run tool's 'power_on/qemu' back end
diff --git a/tool/builddir/build.conf/run_arm_v8 b/tool/builddir/build.conf/run_arm_v8
index 976840ef17..192eea86f6 100644
--- a/tool/builddir/build.conf/run_arm_v8
+++ b/tool/builddir/build.conf/run_arm_v8
@@ -8,9 +8,9 @@ QEMU_RUN_OPT := --include power_on/qemu  --include log/qemu
 #BOARD ?= rpi3
 
 # local variable for run-tool arguments that depend on the used board
-BOARD_RUN_OPT(linux)     := --include power_on/linux --include log/linux
-BOARD_RUN_OPT(rpi3)      := $(QEMU_RUN_OPT)
-BOARD_RUN_OPT(virt_qemu) := $(QEMU_RUN_OPT)
+BOARD_RUN_OPT(linux)             := --include power_on/linux --include log/linux
+BOARD_RUN_OPT(rpi3)              := $(QEMU_RUN_OPT)
+BOARD_RUN_OPT(virt_qemu_arm_v8a) := $(QEMU_RUN_OPT)
 
 ##
 ## Qemu arguments, effective when using the run tool's 'power_on/qemu' back end
diff --git a/tool/builddir/build.conf/run_riscv b/tool/builddir/build.conf/run_riscv
index 9ae807a2e1..eaf00f0105 100644
--- a/tool/builddir/build.conf/run_riscv
+++ b/tool/builddir/build.conf/run_riscv
@@ -5,7 +5,7 @@ QEMU_RUN_OPT := --include power_on/qemu  --include log/qemu
 KERNEL ?= hw
 
 # board to use (riscv_qemu)
-BOARD  ?= riscv_qemu
+BOARD  ?= virt_qemu_riscv
 
 # local variable for run-tool arguments that depend on the used board
-BOARD_RUN_OPT(riscv_qemu) = $(QEMU_RUN_OPT)
+BOARD_RUN_OPT(virt_qemu_riscv) = $(QEMU_RUN_OPT)
diff --git a/tool/run/power_on/qemu b/tool/run/power_on/qemu
index 06ebc518fd..d1cf7437a2 100644
--- a/tool/run/power_on/qemu
+++ b/tool/run/power_on/qemu
@@ -54,18 +54,11 @@ proc board_qemu_args { } {
 
 	##
 	# Each line is appended to qemu_args.
-	# Arguments might be general or restricted to a particular spec as follows:
-	#   general arguments
-	#   arm_v7a: arguments for arm_v7a
 	#
 	set qemu_args ""
 	foreach line [split $file_content "\n"] {
-		if {[regexp {^([\w]+):(.*)$} $line dummy spec arg]} {
-			if {[have_spec $spec]} { append qemu_args " $arg" }
-		} else {
 			# general arguments
 			append qemu_args " $line"
-		}
 	}
 
 	return $qemu_args