Skip to content

Commit 6548b34

Browse files
Baptiste Jonglezdangowrt
authored andcommitted
x86/64: add xen DomU support
Xen support for x86/generic was added in 1d6879e. This commit also enables it for x86/64. This was successfully tested with Xen 4.5, although the serial console is broken in the same way as x86/generic (see FS#787) Signed-off-by: Baptiste Jonglez <[email protected]>
1 parent de8370f commit 6548b34

File tree

2 files changed

+68
-1
lines changed

2 files changed

+68
-1
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
# Copyright (C) 2010 OpenWrt.org
3+
4+
do_mount_xenfs() {
5+
grep -q xenfs /proc/filesystems && \
6+
mount -o noatime -t xenfs none /proc/xen
7+
}
8+
9+
boot_hook_add preinit_mount_root do_mount_xenfs

target/linux/x86/64/config-default

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ CONFIG_ACPI_BATTERY=y
55
# CONFIG_ACPI_BGRT is not set
66
CONFIG_ACPI_BUTTON=y
77
# CONFIG_ACPI_CMPC is not set
8-
# CONFIG_ACPI_CONTAINER is not set
8+
CONFIG_ACPI_CONTAINER=y
99
CONFIG_ACPI_CPU_FREQ_PSS=y
1010
# CONFIG_ACPI_CUSTOM_DSDT is not set
1111
# CONFIG_ACPI_DEBUG is not set
1212
# CONFIG_ACPI_DEBUGGER is not set
1313
# CONFIG_ACPI_DOCK is not set
1414
# CONFIG_ACPI_EC_DEBUGFS is not set
1515
CONFIG_ACPI_FAN=y
16+
CONFIG_ACPI_HOTPLUG_CPU=y
1617
CONFIG_ACPI_HOTPLUG_IOAPIC=y
1718
CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
1819
# CONFIG_ACPI_NFIT is not set
@@ -46,9 +47,11 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
4647
CONFIG_BACKLIGHT_GENERIC=y
4748
CONFIG_BACKLIGHT_LCD_SUPPORT=y
4849
CONFIG_BLK_DEV_INTEGRITY=y
50+
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
4951
CONFIG_CALGARY_IOMMU=y
5052
CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
5153
CONFIG_CONNECTOR=y
54+
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
5255
CONFIG_CPU_RMAP=y
5356
CONFIG_CRC_T10DIF=y
5457
CONFIG_CRYPTO_ABLK_HELPER=y
@@ -89,6 +92,7 @@ CONFIG_CRYPTO_NULL2=y
8992
# CONFIG_CRYPTO_TWOFISH_X86_64 is not set
9093
# CONFIG_CRYPTO_TWOFISH_X86_64_3WAY is not set
9194
CONFIG_CRYPTO_XTS=y
95+
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
9296
# CONFIG_DPTF_POWER is not set
9397
# CONFIG_EARLY_PRINTK_EFI is not set
9498
CONFIG_EFI=y
@@ -109,10 +113,15 @@ CONFIG_FB_CFB_COPYAREA=y
109113
CONFIG_FB_CFB_FILLRECT=y
110114
CONFIG_FB_CFB_IMAGEBLIT=y
111115
CONFIG_FB_CMDLINE=y
116+
CONFIG_FB_DEFERRED_IO=y
112117
CONFIG_FB_EFI=y
113118
CONFIG_FB_HYPERV=y
114119
CONFIG_FB_MODE_HELPERS=y
115120
CONFIG_FB_SIMPLE=y
121+
CONFIG_FB_SYS_COPYAREA=y
122+
CONFIG_FB_SYS_FILLRECT=y
123+
CONFIG_FB_SYS_FOPS=y
124+
CONFIG_FB_SYS_IMAGEBLIT=y
116125
CONFIG_FB_TILEBLITTING=y
117126
# CONFIG_FB_VESA is not set
118127
# CONFIG_FONTS is not set
@@ -122,6 +131,7 @@ CONFIG_FONT_SUPPORT=y
122131
CONFIG_FRAMEBUFFER_CONSOLE=y
123132
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
124133
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
134+
CONFIG_FREEZER=y
125135
CONFIG_GART_IOMMU=y
126136
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
127137
CONFIG_GENERIC_CPU=y
@@ -150,9 +160,11 @@ CONFIG_HAVE_LIVEPATCH=y
150160
CONFIG_HAVE_MEMORY_PRESENT=y
151161
CONFIG_HAVE_STACK_VALIDATION=y
152162
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
163+
CONFIG_HIBERNATE_CALLBACKS=y
153164
CONFIG_HID_BATTERY_STRENGTH=y
154165
CONFIG_HID_GENERIC=y
155166
CONFIG_HID_HYPERV_MOUSE=y
167+
CONFIG_HOTPLUG_CPU=y
156168
CONFIG_HOTPLUG_PCI=y
157169
CONFIG_HOTPLUG_PCI_ACPI=y
158170
# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
@@ -163,6 +175,9 @@ CONFIG_HPET=y
163175
CONFIG_HPET_MMAP=y
164176
# CONFIG_HP_ACCEL is not set
165177
CONFIG_HVC_DRIVER=y
178+
CONFIG_HVC_IRQ=y
179+
CONFIG_HVC_XEN=y
180+
CONFIG_HVC_XEN_FRONTEND=y
166181
CONFIG_HWMON=y
167182
CONFIG_HW_RANDOM_AMD=y
168183
CONFIG_HW_RANDOM_INTEL=y
@@ -177,6 +192,7 @@ CONFIG_HYPERV_UTILS=y
177192
# CONFIG_I7300_IDLE is not set
178193
# CONFIG_IA32_EMULATION is not set
179194
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
195+
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
180196
CONFIG_INTEL_IDLE=y
181197
# CONFIG_INTEL_IPS is not set
182198
# CONFIG_INTEL_MENLOW is not set
@@ -211,6 +227,7 @@ CONFIG_MMC_SDHCI_PCI=y
211227
# CONFIG_MMC_SDHCI_PLTFM is not set
212228
# CONFIG_MMC_TIFM_SD is not set
213229
# CONFIG_MMC_WBSD is not set
230+
CONFIG_MMU_NOTIFIER=y
214231
CONFIG_MODULES_USE_ELF_RELA=y
215232
# CONFIG_MPSC is not set
216233
CONFIG_MUTEX_SPIN_ON_OWNER=y
@@ -232,11 +249,17 @@ CONFIG_PATA_PLATFORM=y
232249
CONFIG_PATA_VIA=y
233250
CONFIG_PCIEAER=y
234251
CONFIG_PCIEPORTBUS=y
252+
CONFIG_PCIE_PME=y
235253
# CONFIG_PCI_HYPERV is not set
236254
# CONFIG_PCI_MMCONFIG is not set
255+
CONFIG_PCI_XEN=y
237256
CONFIG_PGTABLE_LEVELS=4
238257
CONFIG_PHYSICAL_ALIGN=0x1000000
258+
CONFIG_PM=y
239259
# CONFIG_PMIC_OPREGION is not set
260+
# CONFIG_PM_DEBUG is not set
261+
CONFIG_PM_SLEEP=y
262+
CONFIG_PM_SLEEP_SMP=y
240263
CONFIG_PNP=y
241264
CONFIG_PNPACPI=y
242265
CONFIG_PNP_DEBUG_MESSAGES=y
@@ -268,6 +291,8 @@ CONFIG_SPARSEMEM_MANUAL=y
268291
# CONFIG_SPARSEMEM_VMEMMAP is not set
269292
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
270293
# CONFIG_SURFACE_PRO3_BUTTON is not set
294+
CONFIG_SWIOTLB_XEN=y
295+
CONFIG_SYS_HYPERVISOR=y
271296
# CONFIG_THUNDER_NIC_BGX is not set
272297
# CONFIG_THUNDER_NIC_PF is not set
273298
# CONFIG_THUNDER_NIC_RGX is not set
@@ -303,6 +328,7 @@ CONFIG_VMWARE_VMCI=y
303328
CONFIG_VMWARE_VMCI_VSOCKETS=y
304329
CONFIG_VMXNET3=y
305330
CONFIG_VSOCKETS=y
331+
CONFIG_VT_CONSOLE_SLEEP=y
306332
CONFIG_WATCHDOG_CORE=y
307333
CONFIG_X86_64=y
308334
CONFIG_X86_64_SMP=y
@@ -325,5 +351,37 @@ CONFIG_X86_PM_TIMER=y
325351
# CONFIG_X86_VSYSCALL_EMULATION is not set
326352
CONFIG_X86_X2APIC=y
327353
# CONFIG_X86_X32 is not set
354+
CONFIG_XEN=y
355+
CONFIG_XENFS=y
356+
CONFIG_XEN_512GB=y
357+
CONFIG_XEN_ACPI=y
358+
CONFIG_XEN_ACPI_PROCESSOR=y
359+
CONFIG_XEN_AUTO_XLATE=y
360+
# CONFIG_XEN_BACKEND is not set
361+
CONFIG_XEN_BALLOON=y
362+
CONFIG_XEN_BLKDEV_FRONTEND=y
363+
CONFIG_XEN_COMPAT_XENFS=y
364+
CONFIG_XEN_DEBUG_FS=y
365+
CONFIG_XEN_DEV_EVTCHN=y
366+
CONFIG_XEN_DOM0=y
367+
CONFIG_XEN_EFI=y
368+
CONFIG_XEN_FBDEV_FRONTEND=y
369+
CONFIG_XEN_GNTDEV=y
370+
CONFIG_XEN_GRANT_DEV_ALLOC=y
371+
CONFIG_XEN_HAVE_PVMMU=y
372+
CONFIG_XEN_HAVE_VPMU=y
373+
# CONFIG_XEN_MCE_LOG is not set
374+
CONFIG_XEN_NETDEV_FRONTEND=y
375+
CONFIG_XEN_PCIDEV_FRONTEND=y
376+
CONFIG_XEN_PRIVCMD=y
377+
CONFIG_XEN_PVH=y
378+
CONFIG_XEN_PVHVM=y
379+
CONFIG_XEN_SAVE_RESTORE=y
380+
CONFIG_XEN_SCRUB_PAGES=y
381+
CONFIG_XEN_SCSI_FRONTEND=y
382+
CONFIG_XEN_SYMS=y
383+
CONFIG_XEN_SYS_HYPERVISOR=y
384+
CONFIG_XEN_WDT=y
385+
CONFIG_XEN_XENBUS_FRONTEND=y
328386
CONFIG_XPS=y
329387
CONFIG_ZONE_DMA32=y

0 commit comments

Comments
 (0)