x86: remove the kvm_guest subtarget

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

diff --git a/package/kernel/linux/modules/virtual.mk b/package/kernel/linux/modules/virtual.mk
index 125ec72f154d1c9ca839abe47b1ba4487125cff3..e18c376d3e4fecc5221ecc39bec56432180e2fd2 100644 (file)
--- a/package/kernel/linux/modules/virtual.mk
+++ b/package/kernel/linux/modules/virtual.mk
@@ -7,57 +7,26 @@
 
 VIRTUAL_MENU:=Virtualization Support
 
-define KernelPackage/virtio-balloon
+define KernelPackage/xen-privcmd
   SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=VirtIO balloon driver
-  DEPENDS:=@TARGET_x86_kvm_guest
-  KCONFIG:=CONFIG_VIRTIO_BALLOON
-  FILES:=$(LINUX_DIR)/drivers/virtio/virtio_balloon.ko
-  AUTOLOAD:=$(call AutoLoad,06,virtio-balloon)
-endef
-
-define KernelPackage/virtio-balloon/description
- Kernel module for VirtIO memory ballooning support
-endef
-
-$(eval $(call KernelPackage,virtio-balloon))
-
-
-define KernelPackage/virtio-net
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=VirtIO network driver
-  DEPENDS:=@TARGET_x86_kvm_guest
-  KCONFIG:=CONFIG_VIRTIO_NET
-  FILES:=$(LINUX_DIR)/drivers/net/virtio_net.ko
-  AUTOLOAD:=$(call AutoLoad,50,virtio_net)
+  TITLE:=Xen private commands
+  DEPENDS:=@TARGET_x86_xen_domu
+  KCONFIG:=CONFIG_XEN_PRIVCMD
+  FILES:=$(LINUX_DIR)/drivers/xen/xen-privcmd.ko
+  AUTOLOAD:=$(call AutoLoad,04,xen-privcmd)
 endef
 
-define KernelPackage/virtio-net/description
- Kernel module for the VirtIO paravirtualized network device
+define KernelPackage/xen-privcmd/description
+ Kernel module for Xen private commands
 endef
 
-$(eval $(call KernelPackage,virtio-net))
-
+$(eval $(call KernelPackage,xen-privcmd))
 
-define KernelPackage/virtio-random
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=VirtIO Random Number Generator support
-  DEPENDS:=@TARGET_x86_kvm_guest
-  KCONFIG:=CONFIG_HW_RANDOM_VIRTIO
-  FILES:=$(LINUX_DIR)/drivers/char/hw_random/virtio-rng.ko
-  AUTOLOAD:=$(call AutoLoad,09,virtio-rng)
-endef
-
-define KernelPackage/virtio-random/description
- Kernel module for the VirtIO Random Number Generator
-endef
-
-$(eval $(call KernelPackage,virtio-random))
 
 define KernelPackage/xen-fs
   SUBMENU:=$(VIRTUAL_MENU)
   TITLE:=Xen filesystem
-  DEPENDS:=@TARGET_x86_xen_domu
+  DEPENDS:=@TARGET_x86_xen_domu +kmod-xen-privcmd
   KCONFIG:= \
        CONFIG_XENFS \
        CONFIG_XEN_COMPAT_XENFS=y
@@ -100,11 +69,11 @@ define KernelPackage/xen-fbdev
        CONFIG_FB_SYS_IMAGEBLIT \
        CONFIG_FIRMWARE_EDID=n
   FILES:= \
-       $(LINUX_DIR)/drivers/video/xen-fbfront.ko \
-       $(LINUX_DIR)/drivers/video/syscopyarea.ko \
-       $(LINUX_DIR)/drivers/video/sysfillrect.ko \
-       $(LINUX_DIR)/drivers/video/fb_sys_fops.ko \
-       $(LINUX_DIR)/drivers/video/sysimgblt.ko
+       $(LINUX_DIR)/drivers/video/fbdev/xen-fbfront.ko \
+       $(LINUX_DIR)/drivers/video/fbdev/core/syscopyarea.ko \
+       $(LINUX_DIR)/drivers/video/fbdev/core/sysfillrect.ko \
+       $(LINUX_DIR)/drivers/video/fbdev/core/fb_sys_fops.ko \
+       $(LINUX_DIR)/drivers/video/fbdev/core/sysimgblt.ko
   AUTOLOAD:=$(call AutoLoad,07, \
        fb \
        syscopyarea \
@@ -122,22 +91,6 @@ endef
 $(eval $(call KernelPackage,xen-fbdev))
 
 
-define KernelPackage/xen-kbddev
-  SUBMENU:=$(VIRTUAL_MENU)
-  TITLE:=Xen virtual keyboard and mouse
-  DEPENDS:=@TARGET_x86_xen_domu
-  KCONFIG:=CONFIG_XEN_KBDDEV_FRONTEND
-  FILES:=$(LINUX_DIR)/drivers/input/xen-kbdfront.ko
-  AUTOLOAD:=$(call AutoLoad,08,xen-kbdfront)
-endef
-
-define KernelPackage/xen-kbddev/description
- Kernel module for the Xen virtual keyboard and mouse
-endef
-
-$(eval $(call KernelPackage,xen-kbddev))
-
-
 define KernelPackage/xen-netdev
   SUBMENU:=$(VIRTUAL_MENU)
   TITLE:=Xen network device frontend