Skip to content

Commit d306fb9

Browse files
authored
Merge pull request #2825 from aaronk6/main
Enable virtio-fs kernel module for shared directory support in QEMU VMs
2 parents f9bb09c + 49c8b51 commit d306fb9

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Enabled virtiofs and fuse-dax modules in the kernel for advaned Qemu usecases. Thank you @aaronk6! ([Flatcar#2825](https://github.com/flatcar/scripts/pull/2825))

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ CONFIG_KVM=m
7979
CONFIG_KVM_AMD=m
8080
CONFIG_KVM_INTEL=m
8181
CONFIG_MEMORY_FAILURE=y
82-
CONFIG_MEMORY_HOTPLUG=y
83-
CONFIG_MEMORY_HOTREMOVE=y
8482
CONFIG_MEM_SOFT_DIRTY=y
8583
CONFIG_MMC_SDHCI_ACPI=m
8684
# CONFIG_MOUSE_PS2_LIFEBOOK is not set

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,10 @@ CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
206206
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
207207
CONFIG_FSCACHE=m
208208
CONFIG_FSCACHE_STATS=y
209+
CONFIG_FS_DAX=y
209210
CONFIG_FS_ENCRYPTION=y
210211
CONFIG_FUSE_FS=m
212+
CONFIG_FUSE_DAX=y
211213
CONFIG_FUSION=y
212214
CONFIG_FUSION_CTL=m
213215
CONFIG_FUSION_LOGGING=y
@@ -458,6 +460,8 @@ CONFIG_MEGARAID_MM=m
458460
CONFIG_MEGARAID_NEWGEN=y
459461
CONFIG_MEGARAID_SAS=m
460462
CONFIG_MEMCG=y
463+
CONFIG_MEMORY_HOTPLUG=y
464+
CONFIG_MEMORY_HOTREMOVE=y
461465
CONFIG_MEMTEST=y
462466
CONFIG_MICROSOFT_MANA=m
463467
CONFIG_MINIX_SUBPARTITION=y
@@ -999,6 +1003,7 @@ CONFIG_VIRTIO_MMIO=y
9991003
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
10001004
CONFIG_VIRTIO_NET=m
10011005
CONFIG_VIRTIO_PCI=y
1006+
CONFIG_VIRTIO_FS=m
10021007
CONFIG_VIRTIO_VSOCKETS=m
10031008
CONFIG_VIRT_DRIVERS=y
10041009
CONFIG_VLAN_8021Q=m
@@ -1035,5 +1040,6 @@ CONFIG_XFS_QUOTA=y
10351040
# CONFIG_XZ_DEC_POWERPC is not set
10361041
# CONFIG_XZ_DEC_SPARC is not set
10371042
CONFIG_ZISOFS=y
1043+
CONFIG_ZONE_DEVICE=y
10381044
CONFIG_ZRAM=m
10391045
CONFIG_ZSMALLOC=m

0 commit comments

Comments
 (0)