uml: fix glibc-static check with GCC14

[openwrt/openwrt.git] / package / kernel / linux / modules / virt.mk

diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk
index 59a2d79563dcbf0eb8ea6bb8707553de667db1be..4a879f240ebadb81049a221e81be5f7dd9c0bb68 100644 (file)
--- a/package/kernel/linux/modules/virt.mk
+++ b/package/kernel/linux/modules/virt.mk
@@ -22,6 +22,7 @@ define KernelPackage/kvm-x86
   KCONFIG:=\
          CONFIG_KVM \
          CONFIG_KVM_MMU_AUDIT=n \
+         CONFIG_KVM_SMM=y@ge6.6 \
          CONFIG_VIRTUALIZATION=y
   FILES:= $(LINUX_DIR)/arch/$(LINUX_KARCH)/kvm/kvm.ko
   AUTOLOAD:=$(call AutoProbe,kvm.ko)
@@ -77,16 +78,16 @@ $(eval $(call KernelPackage,kvm-amd))
 define KernelPackage/vfio
   SUBMENU:=Virtualization
   TITLE:=VFIO Non-Privileged userspace driver framework
-  DEPENDS:=@TARGET_x86_64
+  DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8
   KCONFIG:= \
        CONFIG_VFIO \
        CONFIG_VFIO_NOIOMMU=n \
        CONFIG_VFIO_MDEV=n
   FILES:= \
        $(LINUX_DIR)/drivers/vfio/vfio.ko \
-       $(LINUX_DIR)/drivers/vfio/vfio_virqfd.ko \
+       $(LINUX_DIR)/drivers/vfio/vfio_virqfd.ko@lt6.2 \
        $(LINUX_DIR)/drivers/vfio/vfio_iommu_type1.ko
-  AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1 vfio_virqfd)
+  AUTOLOAD:=$(call AutoProbe,vfio vfio_iommu_type1 +LINUX_6_1:vfio_virqfd)
 endef
 
 define KernelPackage/vfio/description
@@ -99,12 +100,12 @@ $(eval $(call KernelPackage,vfio))
 define KernelPackage/vfio-pci
   SUBMENU:=Virtualization
   TITLE:=Generic VFIO support for any PCI device
-  DEPENDS:=@TARGET_x86_64 @PCI_SUPPORT +kmod-vfio +kmod-irqbypass
+  DEPENDS:=@TARGET_x86_64||TARGET_armsr_armv8 @PCI_SUPPORT +kmod-vfio +kmod-irqbypass
   KCONFIG:= \
        CONFIG_VFIO_PCI \
-       CONFIG_VFIO_PCI_IGD=y
+       CONFIG_VFIO_PCI_IGD=n
   FILES:= \
-       $(LINUX_DIR)/drivers/vfio/pci/vfio-pci-core.ko@ge5.15 \
+       $(LINUX_DIR)/drivers/vfio/pci/vfio-pci-core.ko \
        $(LINUX_DIR)/drivers/vfio/pci/vfio-pci.ko
   AUTOLOAD:=$(call AutoProbe,vfio-pci)
 endef
@@ -115,3 +116,27 @@ define KernelPackage/vfio-pci/description
 endef
 
 $(eval $(call KernelPackage,vfio-pci))
+
+
+define KernelPackage/vhost
+  SUBMENU:=Virtualization
+  TITLE:=Host kernel accelerator for virtio (base)
+  KCONFIG:=CONFIG_VHOST
+  FILES:=$(LINUX_DIR)/drivers/vhost/vhost.ko \
+    $(LINUX_DIR)/drivers/vhost/vhost_iotlb.ko
+  AUTOLOAD:=$(call AutoProbe,vhost vhost_iotlb)
+endef
+
+$(eval $(call KernelPackage,vhost))
+
+
+define KernelPackage/vhost-net
+  SUBMENU:=Virtualization
+  TITLE:=Host kernel accelerator for virtio-net
+  DEPENDS:=+kmod-tun +kmod-vhost
+  KCONFIG:=CONFIG_VHOST_NET
+  FILES:=$(LINUX_DIR)/drivers/vhost/vhost_net.ko
+  AUTOLOAD:=$(call AutoProbe,vhost_net)
+endef
+
+$(eval $(call KernelPackage,vhost-net))