Module Name: src
Committed By: dsl
Date: Wed Oct 3 18:58:33 UTC 2012
Modified Files:
src/sys/arch/i386/conf: ALL Makefile.i386 files.i386
src/sys/arch/i386/i386: autoconf.c machdep.c trap.c
src/sys/arch/xen/conf: files.compat files.xen
src/sys/arch/xen/x86: autoconf.c
Removed Files:
src/sys/arch/i386/i386: kvm86.c kvm86call.S
src/sys/arch/i386/include: kvm86.h
Log Message:
Remove all references to KVM86.
It was only ever used by APMBIOS - and then only if an option was selected.
Probably didn't work well at all!
To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.177 -r1.178 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.366 -r1.367 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/i386/i386/autoconf.c
cvs rdiff -u -r1.21 -r0 src/sys/arch/i386/i386/kvm86.c
cvs rdiff -u -r1.10 -r0 src/sys/arch/i386/i386/kvm86call.S
cvs rdiff -u -r1.732 -r1.733 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.264 -r1.265 src/sys/arch/i386/i386/trap.c
cvs rdiff -u -r1.6 -r0 src/sys/arch/i386/include/kvm86.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/xen/conf/files.compat
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/xen/conf/files.xen
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/xen/x86/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.345 src/sys/arch/i386/conf/ALL:1.346
--- src/sys/arch/i386/conf/ALL:1.345 Sun Sep 30 21:36:18 2012
+++ src/sys/arch/i386/conf/ALL Wed Oct 3 18:58:30 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.345 2012/09/30 21:36:18 dsl Exp $
+# $NetBSD: ALL,v 1.346 2012/10/03 18:58:30 dsl Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.345 $"
+#ident "ALL-$Revision: 1.346 $"
maxusers 64 # estimated number of users
@@ -2140,7 +2140,6 @@ options KLOADER_DEBUG
options KSTACK_DEBUG
options KSYMS_DEBUG
options KUE_DEBUG
-options KVM86DEBUG
options LANA_DEBUG
options LCD_DEBUG
options LDT_DEBUG
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.177 src/sys/arch/i386/conf/Makefile.i386:1.178
--- src/sys/arch/i386/conf/Makefile.i386:1.177 Mon Oct 1 17:35:57 2012
+++ src/sys/arch/i386/conf/Makefile.i386 Wed Oct 3 18:58:31 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.177 2012/10/01 17:35:57 dsl Exp $
+# $NetBSD: Makefile.i386,v 1.178 2012/10/03 18:58:31 dsl Exp $
# Makefile for NetBSD
#
@@ -89,7 +89,7 @@ freebsd_sigcode.o i386func.o ibcs2_sigco
linux_sigcode.o lock_stubs.o svr4_sigcode.o mach_sigcode.o: assym.h
cpufunc.o cpu_in_cksum.o pnpbioscall.o bioscall.o: assym.h
mptramp.o: assym.h
-acpi_wakeup_low.o busfunc.o kvm86call.o: assym.h
+acpi_wakeup_low.o busfunc.o: assym.h
##
## (7) misc settings
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.366 src/sys/arch/i386/conf/files.i386:1.367
--- src/sys/arch/i386/conf/files.i386:1.366 Sun Sep 30 20:19:51 2012
+++ src/sys/arch/i386/conf/files.i386 Wed Oct 3 18:58:31 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.366 2012/09/30 20:19:51 dsl Exp $
+# $NetBSD: files.i386,v 1.367 2012/10/03 18:58:31 dsl Exp $
#
# new style config file for i386 architecture
#
@@ -20,7 +20,6 @@ obsolete defflag XBOX
# VM86 emulation
defflag VM86
-defflag KVM86
# User-settable LDT (used by WINE)
defflag USER_LDT
@@ -329,10 +328,6 @@ include "dev/apm/files.apm"
# VM86 mode
file arch/i386/i386/vm86.c vm86
-# VM86 in kernel
-file arch/i386/i386/kvm86.c kvm86
-file arch/i386/i386/kvm86call.S kvm86
-
# Binary compatibility with previous NetBSD releases (COMPAT_XX)
file arch/i386/i386/compat_13_machdep.c compat_13
file arch/i386/i386/compat_16_machdep.c compat_16 | compat_ibcs2
Index: src/sys/arch/i386/i386/autoconf.c
diff -u src/sys/arch/i386/i386/autoconf.c:1.97 src/sys/arch/i386/i386/autoconf.c:1.98
--- src/sys/arch/i386/i386/autoconf.c:1.97 Tue Feb 22 06:37:24 2011
+++ src/sys/arch/i386/i386/autoconf.c Wed Oct 3 18:58:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.97 2011/02/22 06:37:24 dholland Exp $ */
+/* $NetBSD: autoconf.c,v 1.98 2012/10/03 18:58:31 dsl Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.97 2011/02/22 06:37:24 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.98 2012/10/03 18:58:31 dsl Exp $");
#include "opt_compat_oldboot.h"
#include "opt_intrdebug.h"
@@ -90,11 +90,6 @@ extern void platform_init(void);
#include <i386/pci/pcibios.h>
#endif
-#include "opt_kvm86.h"
-#ifdef KVM86
-#include <machine/kvm86.h>
-#endif
-
/*
* Determine i/o configuration for a machine.
*/
@@ -113,10 +108,6 @@ cpu_configure(void)
pcibios_init();
#endif
-#ifdef KVM86
- kvm86_init();
-#endif
-
if (config_rootfound("mainbus", NULL) == NULL)
panic("configure: mainbus not configured");
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.732 src/sys/arch/i386/i386/machdep.c:1.733
--- src/sys/arch/i386/i386/machdep.c:1.732 Sun Sep 30 20:54:52 2012
+++ src/sys/arch/i386/i386/machdep.c Wed Oct 3 18:58:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.732 2012/09/30 20:54:52 dsl Exp $ */
+/* $NetBSD: machdep.c,v 1.733 2012/10/03 18:58:32 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.732 2012/09/30 20:54:52 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.733 2012/10/03 18:58:32 dsl Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -1442,7 +1442,7 @@ init386(paddr_t first_avail)
pmap_update(pmap_kernel());
memcpy((void *)BIOSTRAMP_BASE, biostramp_image, biostramp_image_size);
- /* Needed early, for bioscall() and kvm86_call() */
+ /* Needed early, for bioscall() */
cpu_info_primary.ci_pmap = pmap_kernel();
#endif
#endif /* !XEN */
Index: src/sys/arch/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.264 src/sys/arch/i386/i386/trap.c:1.265
--- src/sys/arch/i386/i386/trap.c:1.264 Sat Jun 30 23:33:10 2012
+++ src/sys/arch/i386/i386/trap.c Wed Oct 3 18:58:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.264 2012/06/30 23:33:10 rmind Exp $ */
+/* $NetBSD: trap.c,v 1.265 2012/10/03 18:58:32 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,14 +68,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.264 2012/06/30 23:33:10 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.265 2012/10/03 18:58:32 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_lockdebug.h"
#include "opt_multiprocessor.h"
#include "opt_vm86.h"
-#include "opt_kvm86.h"
#include "opt_kstack_dr0.h"
#include "opt_xen.h"
#include "opt_dtrace.h"
@@ -132,13 +131,6 @@ void trap(struct trapframe *);
void trap_tss(struct i386tss *, int, int);
void trap_return_fault_return(struct trapframe *) __dead;
-#ifdef KVM86
-#include <machine/kvm86.h>
-#define KVM86MODE (kvm86_incall)
-#else
-#define KVM86MODE (0)
-#endif
-
const char * const trap_type[] = {
"privileged instruction fault", /* 0 T_PRIVINFLT */
"breakpoint trap", /* 1 T_BPTFLT */
@@ -340,7 +332,7 @@ trap(struct trapframe *frame)
trap_print(frame, l);
}
#endif
- if (type != T_NMI && !KVM86MODE &&
+ if (type != T_NMI &&
!KERNELMODE(frame->tf_cs, frame->tf_eflags)) {
type |= T_USER;
l->l_md.md_regs = frame;
@@ -372,9 +364,6 @@ trap(struct trapframe *frame)
switch (type) {
case T_ASTFLT:
- if (KVM86MODE) {
- break;
- }
/*FALLTHROUGH*/
default:
@@ -399,12 +388,6 @@ trap(struct trapframe *frame)
/*NOTREACHED*/
case T_PROTFLT:
-#ifdef KVM86
- if (KVM86MODE) {
- kvm86_gpfault(frame);
- return;
- }
-#endif
case T_SEGNPFLT:
case T_ALIGNFLT:
case T_TSSFLT:
Index: src/sys/arch/xen/conf/files.compat
diff -u src/sys/arch/xen/conf/files.compat:1.23 src/sys/arch/xen/conf/files.compat:1.24
--- src/sys/arch/xen/conf/files.compat:1.23 Fri Nov 18 22:18:08 2011
+++ src/sys/arch/xen/conf/files.compat Wed Oct 3 18:58:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.compat,v 1.23 2011/11/18 22:18:08 jmcneill Exp $
+# $NetBSD: files.compat,v 1.24 2012/10/03 18:58:32 dsl Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# options for MP configuration through the MP spec
@@ -14,7 +14,6 @@ defflag opt_xen.h XEN PAE
# XXX define fake options to make config create the .h files
defflag lapic.h XXXLAPIC
defflag apm.h XXXAPM
-defflag apmbios.h XXXAPMBIOS
defflag eisa.h XXXEISA
defflag isadma.h XXXISADMA
defflag mca.h XXXMCA
@@ -28,7 +27,6 @@ defflag opt_pcifixup.h XXXOPT_PCIFIXUP
# VM86 emulation
defflag opt_vm86.h XXXVM86
-defflag opt_kvm86.h XXXKVM86
# User-settable LDT (used by WINE)
defflag opt_user_ldt.h XXXUSER_LDT
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.128 src/sys/arch/xen/conf/files.xen:1.129
--- src/sys/arch/xen/conf/files.xen:1.128 Wed Aug 29 17:13:22 2012
+++ src/sys/arch/xen/conf/files.xen Wed Oct 3 18:58:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.128 2012/08/29 17:13:22 drochner Exp $
+# $NetBSD: files.xen,v 1.129 2012/10/03 18:58:32 dsl Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
@@ -316,10 +316,6 @@ ifdef i386
# VM86 mode
file arch/i386/i386/vm86.c vm86
-# VM86 in kernel
-file arch/i386/i386/kvm86.c kvm86
-file arch/i386/i386/kvm86call.S kvm86
-
# Binary compatibility with previous NetBSD releases (COMPAT_XX)
file arch/i386/i386/compat_13_machdep.c compat_13
file arch/i386/i386/compat_16_machdep.c compat_16 | compat_ibcs2
Index: src/sys/arch/xen/x86/autoconf.c
diff -u src/sys/arch/xen/x86/autoconf.c:1.15 src/sys/arch/xen/x86/autoconf.c:1.16
--- src/sys/arch/xen/x86/autoconf.c:1.15 Sun Jul 29 18:05:47 2012
+++ src/sys/arch/xen/x86/autoconf.c Wed Oct 3 18:58:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.15 2012/07/29 18:05:47 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.16 2012/10/03 18:58:33 dsl Exp $ */
/* NetBSD: autoconf.c,v 1.75 2003/12/30 12:33:22 pk Exp */
/*-
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2012/07/29 18:05:47 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2012/10/03 18:58:33 dsl Exp $");
#include "opt_xen.h"
#include "opt_compat_oldboot.h"
@@ -104,11 +104,6 @@ int x86_ndisks;
#include <i386/pci/pcibios.h>
#endif
-#include "opt_kvm86.h"
-#ifdef KVM86
-#include <machine/kvm86.h>
-#endif
-
/*
* Determine i/o configuration for a machine.
*/
@@ -127,10 +122,6 @@ cpu_configure(void)
pcibios_init();
#endif
-#ifdef KVM86
- kvm86_init();
-#endif
-
if (config_rootfound("mainbus", NULL) == NULL)
panic("configure: mainbus not configured");
