Mount kernel module directory

Author: gsingh93

Makefile

@@ -31,7 +31,7 @@ else ifeq ($(filter x86_64 arm64 i386,$(ARCH)),)
 endif
 
 .PHONY: default
-default: linux tools-vm
+default: linux linux_modules tools-vm
 
 .PHONY: clean
 clean: linux_clean tools-vm_clean
@@ -198,7 +198,6 @@ ifneq (,$(wildcard $(LINUX_SRC)/scripts/clang-tools/gen_compile_commands.py))
 	cd $(LINUX_SRC) && ./scripts/clang-tools/gen_compile_commands.py -d $(LINUX_OUT)
 endif
 
-
 .PHONY: linux_modules
 linux_modules $(LINUX_OUT_MODULES_DEP): $(KERNEL_IMAGE)
 	+ $(LINUX_MAKE) modules
@@ -368,6 +367,7 @@ QEMU_ARGS := \
   -kernel $(QEMU_KERNEL_IMAGE) \
   -netdev user,id=eth0,hostfwd=tcp::7777-:7777,hostfwd=tcp::2222-:22,hostfwd=tcp::2223-:23 -device virtio-net-pci,netdev=eth0 \
   -virtfs local,security_model=mapped-xattr,path=$(SHARED_DIR),mount_tag=shared \
+  -virtfs local,security_model=mapped-xattr,path=$(LINUX_MODULES_INSTALL_PATH)/lib/modules,mount_tag=modules \
   -echr $(ECHR) \
   $(QEMU_EXTRA_ARGS)
 
@@ -417,8 +417,13 @@ QEMU_ARGS += -append "$(QEMU_KERNEL_CMDLINE) $(QEMU_EXTRA_KERNEL_CMDLINE)"
 
 RUN_DEPS := $(QEMU_KERNEL_IMAGE)
 
+# Make sure the modules directory exists, even if it's empty. Otherwise mount
+# will fail.
+$(LINUX_MODULES_INSTALL_PATH)/lib/modules:
+	mkdir -p $@
+
 .PHONY: run
-run: $(RUN_DEPS) | $(SHARED_DIR)
+run: $(RUN_DEPS) | $(SHARED_DIR) $(LINUX_MODULES_INSTALL_PATH)/lib/modules
 	@echo "$(GREEN)Running QEMU, press 'ctrl-a x' to quit $(NC)"
 ifeq ($(GDB),1)
 	@echo "$(ARCH) $(ACK)" > $(OUT_DIR)/.gdb

config/rootfs-overlay/etc/init.d/setup

@@ -26,6 +26,9 @@ case "$1" in
         mkdir -p /shared
         mount -t 9p -o trans=virtio,version=9p2000.L shared /shared
 
+        mkdir -p /lib/modules
+        mount -t 9p -o trans=virtio,version=9p2000.L modules /lib/modules
+
         mount -t debugfs none /sys/kernel/debug
         [ ! -e /d ] && ln -s /sys/kernel/debug /d