From d3d88863d9c90da6984a814cc8e3739529a4fc48 Mon Sep 17 00:00:00 2001 From: Dmitrii Kuvaiskii Date: Thu, 24 Aug 2023 22:59:35 -0700 Subject: [PATCH] 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 --- initramfs_builder/Makefile | 1 + initramfs_builder/run.sh | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/initramfs_builder/Makefile b/initramfs_builder/Makefile index 157a3b1..2fe06ed 100644 --- 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 index 4d5ba7f..b3abb12 100755 --- 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