From 1d6879eedd5a766e82e7e4b33d79186a0ca40aa9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 13 Jan 2017 15:03:24 +0100 Subject: [PATCH] x86/generic: add xen DomU support Copy the relevant config options from the xen_domu subtarget Signed-off-by: Felix Fietkau --- target/linux/x86/base-files/etc/inittab | 1 + .../base-files/lib/preinit/45_mount_xenfs | 9 +++ target/linux/x86/generic/config-default | 61 +++++++++++++++++-- 3 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs diff --git a/target/linux/x86/base-files/etc/inittab b/target/linux/x86/base-files/etc/inittab index d1b5a0fa22..f4747f200d 100644 --- a/target/linux/x86/base-files/etc/inittab +++ b/target/linux/x86/base-files/etc/inittab @@ -1,4 +1,5 @@ ::sysinit:/etc/init.d/rcS S boot ::shutdown:/etc/init.d/rcS K shutdown ttyS0::askfirst:/usr/libexec/login.sh +hvc0::askfirst:/usr/libexec/login.sh tty1::askfirst:/usr/libexec/login.sh diff --git a/target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs b/target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs new file mode 100644 index 0000000000..ac484f6210 --- /dev/null +++ b/target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs @@ -0,0 +1,9 @@ +#!/bin/sh +# Copyright (C) 2010 OpenWrt.org + +do_mount_xenfs() { + grep -q xenfs /proc/filesystems && \ + mount -o noatime -t xenfs none /proc/xen +} + +boot_hook_add preinit_mount_root do_mount_xenfs diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default index bef606935b..1a14c270bc 100644 --- a/target/linux/x86/generic/config-default +++ b/target/linux/x86/generic/config-default @@ -5,7 +5,7 @@ CONFIG_ACPI_BATTERY=y # CONFIG_ACPI_BGRT is not set CONFIG_ACPI_BUTTON=y # CONFIG_ACPI_CMPC is not set -# CONFIG_ACPI_CONTAINER is not set +CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_CPU_FREQ_PSS=y # CONFIG_ACPI_CUSTOM_DSDT is not set # CONFIG_ACPI_DEBUG is not set @@ -13,6 +13,7 @@ CONFIG_ACPI_CPU_FREQ_PSS=y # CONFIG_ACPI_DOCK is not set # CONFIG_ACPI_EC_DEBUGFS is not set # CONFIG_ACPI_FAN is not set +CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_HOTPLUG_IOAPIC=y # CONFIG_ACPI_I2C_OPREGION is not set # CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set @@ -40,6 +41,7 @@ CONFIG_AGP_INTEL=y # CONFIG_AGP_SIS is not set # CONFIG_AGP_SWORKS is not set # CONFIG_AGP_VIA is not set +# CONFIG_APM is not set CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y @@ -51,10 +53,17 @@ CONFIG_BACKLIGHT_GENERIC=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BLK_DEV_SR=y # CONFIG_BLK_DEV_SR_VENDOR is not set +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_COMMON_CLK=y CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_CPU_RMAP=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_NULL2=y +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DMA_SHARED_BUFFER=y CONFIG_DRM=y CONFIG_DRM_AMDGPU=y @@ -112,6 +121,7 @@ CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_CMDLINE=y +CONFIG_FB_DEFERRED_IO=y CONFIG_FB_EFI=y # CONFIG_FB_I810 is not set CONFIG_FB_SYS_COPYAREA=y @@ -126,6 +136,7 @@ CONFIG_FONT_SUPPORT=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FREEZER=y CONFIG_GENERIC_PENDING_IRQ=y CONFIG_GENERIC_PINCONF=y CONFIG_GPIOLIB=y @@ -151,13 +162,18 @@ CONFIG_HAVE_KVM_IRQ_BYPASS=y CONFIG_HAVE_KVM_IRQ_ROUTING=y CONFIG_HAVE_KVM_MSI=y CONFIG_HDMI=y +CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HID=y CONFIG_HID_BATTERY_STRENGTH=y # CONFIG_HIGHMEM64G is not set +CONFIG_HOTPLUG_CPU=y CONFIG_HPET=y CONFIG_HPET_MMAP=y # CONFIG_HP_ACCEL is not set CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y CONFIG_HWMON=y CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HYPERVISOR_GUEST=y @@ -169,6 +185,7 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INTEL_GTT=y CONFIG_INTEL_IDLE=y # CONFIG_INTEL_IPS is not set @@ -194,7 +211,6 @@ CONFIG_KVM_MMIO=y CONFIG_KVM_VFIO=y # CONFIG_LANCE is not set # CONFIG_LCD_CLASS_DEVICE is not set -# CONFIG_LGUEST is not set # CONFIG_LGUEST_GUEST is not set CONFIG_LOCK_SPIN_ON_OWNER=y # CONFIG_M486 is not set @@ -234,6 +250,7 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NO_HZ=y CONFIG_NR_CPUS=4 +CONFIG_PADATA=y CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_PARAVIRT_DEBUG is not set @@ -249,7 +266,9 @@ CONFIG_PATA_SC1200=y CONFIG_PATA_VIA=y CONFIG_PCIEAER=y CONFIG_PCIEPORTBUS=y +CONFIG_PCIE_PME=y CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y # CONFIG_PCWATCHDOG is not set CONFIG_PGTABLE_LEVELS=3 CONFIG_PHYS_ADDR_T_64BIT=y @@ -259,7 +278,12 @@ CONFIG_PINCTRL_BROXTON=y CONFIG_PINCTRL_CHERRYVIEW=y CONFIG_PINCTRL_INTEL=y CONFIG_PINCTRL_SUNRISEPOINT=y +CONFIG_PM=y # CONFIG_PMIC_OPREGION is not set +CONFIG_PM_CLK=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y CONFIG_PNP=y CONFIG_PNPACPI=y # CONFIG_PNPBIOS is not set @@ -284,9 +308,10 @@ CONFIG_SERIAL_8250_PNP=y CONFIG_SMP=y # CONFIG_SURFACE_PRO3_BUTTON is not set CONFIG_SWIOTLB=y +CONFIG_SWIOTLB_XEN=y +CONFIG_SYS_HYPERVISOR=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y -# CONFIG_TASK_XACCT is not set # CONFIG_TOSHIBA_BT_RFKILL is not set CONFIG_TREE_RCU=y CONFIG_UCS2_STRING=y @@ -303,7 +328,6 @@ CONFIG_USER_RETURN_NOTIFIER=y CONFIG_VGACON_SOFT_SCROLLBACK=y CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_VHOST=y -# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set CONFIG_VHOST_NET=y CONFIG_VHOST_RING=y CONFIG_VIRTIO=y @@ -317,6 +341,7 @@ CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_PCI_LEGACY=y CONFIG_VIRTUALIZATION=y +CONFIG_VT_CONSOLE_SLEEP=y # CONFIG_WDT is not set CONFIG_X86_32_SMP=y CONFIG_X86_ACPI_CPUFREQ=y @@ -342,4 +367,32 @@ CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K8 is not set CONFIG_X86_TSC=y CONFIG_X86_USE_PPRO_CHECKSUM=y +CONFIG_XEN=y +CONFIG_XENFS=y +CONFIG_XEN_ACPI=y +CONFIG_XEN_ACPI_PROCESSOR=y +CONFIG_XEN_AUTO_XLATE=y +# CONFIG_XEN_BACKEND is not set +CONFIG_XEN_BALLOON=y +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_DEBUG_FS=y +CONFIG_XEN_DEV_EVTCHN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_GNTDEV=y +CONFIG_XEN_GRANT_DEV_ALLOC=y +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_HAVE_VPMU=y +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_PCIDEV_FRONTEND=y +CONFIG_XEN_PRIVCMD=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_SAVE_RESTORE=y +CONFIG_XEN_SCRUB_PAGES=y +CONFIG_XEN_SCSI_FRONTEND=y +CONFIG_XEN_SYMS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_WDT=y +CONFIG_XEN_XENBUS_FRONTEND=y CONFIG_XPS=y