summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2023-03-02 09:06:47 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2023-03-27 18:07:53 +0200
commit7a8bd448e596463777a0b68d11c5f52a70e2ffb3 (patch)
tree4c7e5a705ec59fbbc030c2e9c468feef64d964d0
parent90e36b542d553850a51e9b399d18549a3f4751e6 (diff)
downloadDistroKit-7a8bd448e596463777a0b68d11c5f52a70e2ffb3.tar.gz
DistroKit-7a8bd448e596463777a0b68d11c5f52a70e2ffb3.tar.xz
x86_64: run: add 9p support
- copy the 9p rules from platform v7a and make 9p default Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Link: https://lore.pengutronix.de/20230302080647.2124306-1-m.grzeschik@pengutronix.de Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rwxr-xr-xconfigs/platform-x86_64/run23
1 files changed, 22 insertions, 1 deletions
diff --git a/configs/platform-x86_64/run b/configs/platform-x86_64/run
index c39d5a7..f3f4c34 100755
--- a/configs/platform-x86_64/run
+++ b/configs/platform-x86_64/run
@@ -67,6 +67,12 @@ fi
BASE_CMDLINE="console=ttyS0,115200 loglevel=5 systemd.log_level=warning systemd.show_status=auto"
+if [ -d "${PTXDIST_PLATFORMDIR}/root/.virtfs_metadata" ]; then
+ security_model="mapped-file"
+else
+ security_model="none"
+fi
+
# Machine to emulate
QEMU_ARGS=( -L ${PTXDIST_PLATFORMDIR}/sysroot-host/share/qemu/ -machine pc-q35-2.12 -smp 2 -cpu host -accel kvm -m 1G -s )
# disable graphics output
@@ -97,7 +103,22 @@ run_qemu_hda() {
-append "root=/dev/vda console=ttyS0,115200 rw ${BASE_CMDLINE}"
}
-target="${1:-hda}"
+#
+# This needs:
+# CONFIG_NET_9P_VIRTIO=y
+# CONFIG_9P_FS=y
+#
+run_qemu_9p() {
+ exec ${QEMU_EXEC} \
+ "${QEMU_ARGS[@]}" \
+ -fsdev local,id=rootfs,path=${PTXDIST_PLATFORMDIR}/root,security_model="${security_model}" \
+ -device virtio-9p-pci,msize=16777216,fsdev=rootfs,mount_tag=/dev/root \
+ "${QEMU_EXTRA_ARGS[@]}" \
+ "${QEMU_LINUX_ARGS[@]}" \
+ -append "root=/dev/root rw rootfstype=9p rootflags=trans=virtio ${BASE_CMDLINE}"
+}
+
+target="${1:-9p}"
#set -x
run_qemu_${target}