Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Retire the non-PAE-i386-PV configuration files. Keep only PA...
details: https://anonhg.NetBSD.org/src/rev/5a59ec6f2812
branches: trunk
changeset: 324908:5a59ec6f2812
user: maxv <maxv%NetBSD.org@localhost>
date: Thu Jul 26 16:22:49 2018 +0000
description:
Retire the non-PAE-i386-PV configuration files. Keep only PAE-i386-PV.
Non-PAE has been dropped years ago by Xen.
The content of XEN3_* is merged into XEN3PAE_*, with "options PAE" set.
diffstat:
distrib/notes/common/contents | 4 +-
etc/etc.i386/Makefile.inc | 5 +-
sys/arch/i386/conf/INSTALL_XEN3_DOMU | 16 -
sys/arch/i386/conf/XEN3PAE_DOM0 | 911 ++++++++++++++++++++++++++++++++++-
sys/arch/i386/conf/XEN3PAE_DOMU | 253 +++++++++-
sys/arch/i386/conf/XEN3_DOM0 | 909 ----------------------------------
sys/arch/i386/conf/XEN3_DOMU | 251 ---------
7 files changed, 1160 insertions(+), 1189 deletions(-)
diffs (truncated from 2408 to 300 lines):
diff -r 1466a3d88386 -r 5a59ec6f2812 distrib/notes/common/contents
--- a/distrib/notes/common/contents Thu Jul 26 15:46:09 2018 +0000
+++ b/distrib/notes/common/contents Thu Jul 26 16:22:49 2018 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.174 2018/06/24 09:38:46 leot Exp $
+.\" $NetBSD: contents,v 1.175 2018/07/26 16:22:49 maxv Exp $
.\"
.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -94,8 +94,6 @@
. It Pa netbsd-INSTALL_XEN3PAE_DOMU.gz
. It Pa netbsd-INSTALL_XEN3_DOMU.gz
. It Pa netbsd-XEN3PAE_DOMU.gz
-. It Pa netbsd-XEN3_DOM0.gz
-. It Pa netbsd-XEN3_DOMU.gz
.\}
.if \n[mac68k] \{\
. It Pa netbsd-GENERIC.gz
diff -r 1466a3d88386 -r 5a59ec6f2812 etc/etc.i386/Makefile.inc
--- a/etc/etc.i386/Makefile.inc Thu Jul 26 15:46:09 2018 +0000
+++ b/etc/etc.i386/Makefile.inc Thu Jul 26 16:22:49 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.68 2015/03/07 07:28:37 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.69 2018/07/26 16:22:49 maxv Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -9,8 +9,6 @@
KERNEL_SETS= GENERIC
KERNEL_SETS+= MONOLITHIC
KERNEL_SETS+= LEGACY
-KERNEL_SETS+= XEN3_DOM0
-KERNEL_SETS+= XEN3_DOMU
KERNEL_SETS+= XEN3PAE_DOM0
KERNEL_SETS+= XEN3PAE_DOMU
# KERNEL_SETS+= GENERIC_USERMODE
@@ -18,7 +16,6 @@
# KERNEL_SETS+= GENERIC_PS2TINY
BUILD_KERNELS+= INSTALL
-BUILD_KERNELS+= INSTALL_XEN3_DOMU
BUILD_KERNELS+= INSTALL_XEN3PAE_DOMU
# BUILD_KERNELS+= INSTALL_FLOPPY
# BUILD_KERNELS+= INSTALL_SMALL
diff -r 1466a3d88386 -r 5a59ec6f2812 sys/arch/i386/conf/INSTALL_XEN3_DOMU
--- a/sys/arch/i386/conf/INSTALL_XEN3_DOMU Thu Jul 26 15:46:09 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: INSTALL_XEN3_DOMU,v 1.13 2011/05/28 13:01:50 ryo Exp $
-#
-# INSTALL_XEN3_DOMU - Installation kernel for Xen 3/DomU.
-#
-# This kernel is derived from XEN3_DOMU with additional memory disk
-# options.
-
-include "arch/i386/conf/XEN3_DOMU"
-
-#ident "INSTALL-$Revision: 1.13 $"
-
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_IS_ROOT # force root on memory disk
-options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks
-options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
diff -r 1466a3d88386 -r 5a59ec6f2812 sys/arch/i386/conf/XEN3PAE_DOM0
--- a/sys/arch/i386/conf/XEN3PAE_DOM0 Thu Jul 26 15:46:09 2018 +0000
+++ b/sys/arch/i386/conf/XEN3PAE_DOM0 Thu Jul 26 16:22:49 2018 +0000
@@ -1,5 +1,910 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.1 2009/02/13 21:14:46 bouyer Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.2 2018/07/26 16:22:49 maxv Exp $
+#
+# XEN3_0: Xen 3.0 domain0 kernel
+
+include "arch/xen/conf/std.xen"
+
+#options MULTIPROCESSOR # (not yet - dom0 stuff is not MP-safe)
+
+options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+
+#options UVMHIST
+#options UVMHIST_PRINT
+#options SYSCALL_DEBUG
+
+maxusers 32 # estimated number of users
+
+#
+options XEN
+options PAE
+#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface
+
+# boot messages with MPBIOS, acpi and ioapic can be quite large
+options MSGBUFSIZE=24576
+
+options DOM0OPS
+# making MCLBYTES = PAGE_SIZE avoids a copy when a mbuf cluster is sent
+# to a domU, at the expense of a higher memory usage by the network stack.
+#options MCLSHIFT=12
+
+makeoptions CPUFLAGS="-march=i686"
+
+#options USER_LDT # user-settable LDT; used by WINE
+
+# CPU features
+est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
+powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
+
+#options MTRR # memory-type range register syscall support
+
+#options CONSDEVNAME="\"xencons\""
+#options CONS_OVERRIDE
+
+options INSECURE # disable kernel security levels - X needs this
+
+options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
+options NTP # NTP phase/frequency locked loop
+
+options KTRACE # system call tracing via ktrace(1)
+
+options CPU_UCODE # cpu ucode loading support
+
+options SYSVMSG # System V-like message queues
+options SYSVSEM # System V-like semaphores
+#options SEMMNI=10 # number of semaphore identifiers
+#options SEMMNS=60 # number of semaphores in system
+#options SEMUME=10 # max number of undo entries per process
+#options SEMMNU=30 # number of undo structures in system
+options SYSVSHM # System V-like memory sharing
+#options SHMMAXPGS=2048 # 2048 pages is the default
+
+options MODULAR # new style module(7) framework
+options USERCONF # userconf(4) support
+options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
+
+# Alternate buffer queue strategies for better responsiveness under high
+# disk I/O load.
+#options BUFQ_READPRIO
+options BUFQ_PRIOCSCAN
+
+# Diagnostic/debugging support options
+options DIAGNOSTIC # inexpensive kernel consistency checks
+#options DEBUG # expensive debugging checks/support
+options DDB # in-kernel debugger
+options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+#options KGDB # remote debugger
+#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600
+#makeoptions DEBUG="-g" # compile full symbol table
+options DDB_COMMANDONENTER="show registers"
+
+# Compatibility options
+include "conf/compat_netbsd09.config"
+options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
+#options COMPAT_386BSD_MBRPART # recognize old partition ID
+
+options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
+options COMPAT_LINUX # binary compatibility with Linux
+#options COMPAT_FREEBSD # binary compatibility with FreeBSD
+
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
+#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
+#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
+options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
+#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges
+
+# File systems
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
+file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
+file-system CODA # Coda File System; also needs vcoda (below)
+file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+file-system PTYFS # /dev/pts/N support
+file-system TMPFS # Efficient memory file-system
+
+# File system options
+options QUOTA # legacy UFS quotas
+options QUOTA2 # new, in-filesystem UFS quotas
+#options DISKLABEL_EI # disklabel Endian Independent support
+#options FFS_EI # FFS Endian Independent support
+options WAPBL # File system journaling support
+#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
+options NFSSERVER # Network File System server
+#options FFS_NO_SNAPSHOT # No FFS snapshot support
+options UFS_EXTATTR # Extended attribute support for UFS1
+#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+ # immutable) behave as system flags.
+
+# Networking options
+#options GATEWAY # packet forwarding
+options INET # IP + ICMP + TCP + UDP
+options INET6 # IPv6
+options IPSEC # IP security
+#options IPSEC_DEBUG # debug for IP security
+#options MROUTING # IP multicast routing
+#options PIM # Protocol Independent Multicast
+options NETATALK # AppleTalk networking protocols
+options PPP_BSDCOMP # BSD-Compress compression support for PPP
+options PPP_DEFLATE # Deflate compression support for PPP
+options PPP_FILTER # Active filter support for PPP (requires bpf)
+options IPFILTER_LOG # ipmon(8) log support
+options IPFILTER_LOOKUP # ippool(8) support
+#options IPFILTER_DEFAULT_BLOCK # block all packets by default
+#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
+
+#options ALTQ # Manipulate network interfaces' output queues
+#options ALTQ_BLUE # Stochastic Fair Blue
+#options ALTQ_CBQ # Class-Based Queueing
+#options ALTQ_CDNR # Diffserv Traffic Conditioner
+#options ALTQ_FIFOQ # First-In First-Out Queue
+#options ALTQ_FLOWVALVE # RED/flow-valve (red-penalty-box)
+#options ALTQ_HFSC # Hierarchical Fair Service Curve
+#options ALTQ_LOCALQ # Local queueing discipline
+#options ALTQ_PRIQ # Priority Queueing
+#options ALTQ_RED # Random Early Detection
+#options ALTQ_RIO # RED with IN/OUT
+#options ALTQ_WFQ # Weighted Fair Queueing
+
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+#options MIIVERBOSE # verbose PHY autoconfig messages
+#options PCIVERBOSE # verbose PCI device autoconfig messages
+#options PCI_CONFIG_DUMP # verbosely dump PCI config space
+options SCSIVERBOSE # human readable SCSI error messages
+#options USBVERBOSE # verbose USB device autoconfig messages
+#options HDAUDIOVERBOSE # verbose HDAUDIO driver messages
+
+options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
+#options NFS_BOOT_BOOTSTATIC
+#options NFS_BOOTSTATIC_MYIP="\"169.254.1.2\""
+#options NFS_BOOTSTATIC_GWIP="\"169.254.1.1\""
+#options NFS_BOOTSTATIC_MASK="\"255.255.255.0\""
+#options NFS_BOOTSTATIC_SERVADDR="\"169.254.1.1\""
+#options NFS_BOOTSTATIC_SERVER="\"server:/path/to/root\""
+
+options WSEMUL_VT100 # VT100 / VT220 emulation
+options WS_KERNEL_FG=WSCOL_GREEN
+options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
+options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
+options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
+options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+options WSDISPLAY_DEFAULTSCREENS=4
+options WSDISPLAY_SCROLLSUPPORT
+options PCDISPLAY_SOFTCURSOR
+
+config netbsd root on ? type ?
+#config netbsd root on wd0a type ffs
+#config netbsd root on xennet0 type nfs
+
+mainbus0 at root
+
+cpu* at mainbus?
+
+# IPMI support
+ipmi0 at mainbus?
+
+hypervisor* at mainbus? # Xen hypervisor
+
+vcpu* at hypervisor? # Xen virtual CPUs
+xenbus* at hypervisor? # Xen virtual bus
+
+xencons* at hypervisor? # Xen virtual console
+#xennet* at hypervisor? # Xen virtual network interface
+balloon* at xenbus? # Xen balloon device
+
+#xbd* at hypervisor? # Xen virtual block device
+#wd* at hypervisor? # Xen vbd (wd identity)
+#sd* at hypervisor? # Xen vbd (sd identity)
+#cd* at hypervisor? # Xen vbd (cd identity)
+
+# PCI bus support
+pci* at hypervisor? bus ?
+pci* at pchb? bus ?
+
+# PCI bridges
+ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ timecounter,
+ # watchdog and SpeedStep support
+pcib* at pci? dev ? function ? # PCI-ISA bridges
+pchb* at pci? dev ? function ? # PCI-Host bridges
+options AGP_X86
+ppb* at pci? dev ? function ? # PCI-PCI bridges
+# XXX 'puc's aren't really bridges, but there's no better place for them here
+puc* at pci? dev ? function ? # PCI "universal" comm. cards
+
+agp* at pchb?
+
+# ISA bus support
Home |
Main Index |
Thread Index |
Old Index