Add virtio_pci to loaded modules; leave only -virtfs

Guest kernel may not have `virtio_pci` module loaded by default, so load it explicitly. Also, `-virtfs` is a synonym to `-device 'virtio-9p-pci'` so the latter is redundant and can be removed. Signed-off-by: Dmitrii Kuvaiskii <[email protected]>
gramineproject · Aug 28, 2023 · d3d8886 · d3d8886
1 parent 20b73af
commit d3d8886
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/initramfs_builder/Makefile b/initramfs_builder/Makefile
@@ -44,6 +44,7 @@ $(addprefix $(INITRAMFS_DIR)/,$(INIT_FILES)): $(INITRAMFS_DIR)/%: % $(INITRAMFS_
 insert_modules.sh:
 	modprobe --show-depends 9p > $@
 	modprobe --show-depends 9pnet_virtio >> $@
+	modprobe --show-depends virtio_pci >> $@
 	modprobe --show-depends overlay >> $@
 	sed -i '/builtin/d' $@
 

diff --git a/initramfs_builder/run.sh b/initramfs_builder/run.sh
@@ -15,7 +15,6 @@ exec qemu-system-x86_64 \
     -m 1G \
     -append "console=ttyS0 loglevel=3 quiet oops=panic $*" \
     -device virtio-rng-pci \
-    -virtfs 'local,path=/,id=hostfs,mount_tag=hostfs,security_model=none,readonly=on' \
-    -device 'virtio-9p-pci,fsdev=hostfs,mount_tag=hostfs' \
+    -virtfs local,path=/,id=hostfs,mount_tag=hostfs,security_model=none,readonly=on \
     -object memory-backend-epc,id=epc_mem,size=64M,prealloc=on \
     -M sgx-epc.0.memdev=epc_mem