[src/trunk]: src/sys/arch/xen Snag the final bits of PV only code to conditio...

[cherry <cherry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/38d4dcebf547
branches:  trunk
changeset: 448928:38d4dcebf547
user:      cherry <cherry%NetBSD.org@localhost>
date:      Thu Feb 14 06:59:24 2019 +0000

description:
Snag the final bits of PV only code to conditionally compile under
-DXENPV

This completes the bifurcation.

The next step is to add -DXENPVHVM code.

diffstat:

 sys/arch/xen/conf/files.xen          |  27 +++++++++++++--------------
 sys/arch/xen/include/amd64/vmparam.h |   5 ++++-
 sys/arch/xen/include/bus_private.h   |   6 ++++--
 3 files changed, 21 insertions(+), 17 deletions(-)

diffs (128 lines):

diff -r 898b5f63793d -r 38d4dcebf547 sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen       Thu Feb 14 06:47:32 2019 +0000
+++ b/sys/arch/xen/conf/files.xen       Thu Feb 14 06:59:24 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.xen,v 1.176 2019/01/27 02:08:39 pgoyette Exp $
+#      $NetBSD: files.xen,v 1.177 2019/02/14 06:59:24 cherry 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 
 
@@ -36,7 +36,7 @@
 
 defparam               PCI_CONF_MODE
 
-file   arch/xen/x86/autoconf.c
+file   arch/xen/x86/autoconf.c         xenpv
 ifdef i386
 file   arch/i386/i386/aout_machdep.c   exec_aout
 file   arch/i386/i386/busfunc.S
@@ -86,10 +86,10 @@
 file   arch/x86/x86/kgdb_machdep.c     kgdb
 # file         arch/x86/x86/mtrr_i686.c        mtrr
 file   arch/x86/x86/syscall.c
-file   arch/xen/x86/x86_xpmap.c
-file   arch/xen/x86/xen_pmap.c
+file   arch/xen/x86/x86_xpmap.c        xenpv
+file   arch/xen/x86/xen_pmap.c         xenpv
 file   arch/xen/x86/xen_intr.c
-file   arch/xen/x86/xenfunc.c
+file   arch/xen/x86/xenfunc.c          xenpv
 
 file   arch/x86/x86/cpu_ucode.c        dom0ops & cpu_ucode needs-flag
 file   arch/x86/x86/cpu_ucode_amd.c    dom0ops & cpu_ucode needs-flag
@@ -97,9 +97,9 @@
 file   arch/x86/x86/compat_60_cpu_ucode.c      compat_60 & dom0ops & cpu_ucode
 
 
-file   arch/xen/xen/xen_machdep.c
+file   arch/xen/xen/xen_machdep.c      xenpv
 
-file   arch/xen/xen/clock.c
+file   arch/xen/xen/clock.c            xenpv
 file   arch/x86/isa/rtc.c              dom0ops
 file   arch/xen/xen/evtchn.c
 
@@ -133,12 +133,12 @@
 
 file   arch/x86/x86/bus_dma.c          machdep
 file   arch/x86/x86/core_machdep.c     coredump
-file   arch/xen/x86/xen_bus_dma.c      machdep
+file   arch/xen/x86/xen_bus_dma.c      machdep & xenpv
 file   arch/x86/x86/bus_space.c        machdep
-file   arch/xen/x86/consinit.c         machdep
+file   arch/xen/x86/consinit.c         machdep & xenpv
 file   arch/x86/x86/identcpu.c         machdep
-file   arch/xen/x86/pintr.c            machdep & dom0ops
-file   arch/xen/x86/xen_ipi.c          multiprocessor
+file   arch/xen/x86/pintr.c            machdep & dom0ops & xenpv
+file   arch/xen/x86/xen_ipi.c          multiprocessor & xenpv
 file   arch/x86/x86/idt.c              machdep
 file   arch/x86/x86/pmap.c             machdep
 file   arch/x86/x86/x86_tlb.c          machdep
@@ -253,7 +253,7 @@
 include "dev/apm/files.apm"
 
 include "dev/acpi/files.acpi"
-file   arch/xen/xen/xen_acpi_machdep.c acpi
+file   arch/xen/xen/xen_acpi_machdep.c acpi & xenpv
 file   arch/x86/x86/mpacpi.c           acpi
 file   arch/x86/x86/i8259.c            dom0ops
 
@@ -289,8 +289,7 @@
 
 device vcpu
 attach vcpu at xendevbus
-
-file   arch/xen/x86/cpu.c              cpu | vcpu
+file   arch/xen/x86/cpu.c              xenpv & vcpu
 
 # CPU features
 #
diff -r 898b5f63793d -r 38d4dcebf547 sys/arch/xen/include/amd64/vmparam.h
--- a/sys/arch/xen/include/amd64/vmparam.h      Thu Feb 14 06:47:32 2019 +0000
+++ b/sys/arch/xen/include/amd64/vmparam.h      Thu Feb 14 06:59:24 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.2 2007/11/22 16:17:02 bouyer Exp $       */
+/*     $NetBSD: vmparam.h,v 1.3 2019/02/14 06:59:24 cherry Exp $       */
 
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
@@ -29,10 +29,13 @@
 #if !defined(_VMPARAM_H_)
 #include <amd64/vmparam.h>
 
+#ifdef XENPV
 #undef VM_PHYSSEG_MAX
 #define        VM_PHYSSEG_MAX  1
 
 #undef VM_NFREELIST
 #undef VM_FREELIST_FIRST16
 #define        VM_NFREELIST    1
+#endif /* XENPV */
 #endif /* _VMPARAM_H_ */
+
diff -r 898b5f63793d -r 38d4dcebf547 sys/arch/xen/include/bus_private.h
--- a/sys/arch/xen/include/bus_private.h        Thu Feb 14 06:47:32 2019 +0000
+++ b/sys/arch/xen/include/bus_private.h        Thu Feb 14 06:59:24 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_private.h,v 1.9 2008/01/23 19:46:45 bouyer Exp $   */
+/*     $NetBSD: bus_private.h,v 1.10 2019/02/14 06:59:24 cherry Exp $  */
 
 /*-
  * Copyright (c)2005 YAMAMOTO Takashi,
@@ -29,6 +29,7 @@
 #include <uvm/uvm_extern.h>
 #include "opt_xen.h"
 
+#ifdef XENPV
 #define        _BUS_PHYS_TO_BUS(pa)    ((bus_addr_t)xpmap_ptom(pa))
 #define        _BUS_BUS_TO_PHYS(ba)    ((paddr_t)xpmap_mtop(ba))
 #define        _BUS_VIRT_TO_BUS(pm, va) _bus_virt_to_bus((pm), (va))
@@ -65,5 +66,6 @@
 #else
 #define _BUS_AVAIL_END ((bus_addr_t)0xffffffff)
 #endif
+#endif /* XENPV */
+#include <x86/bus_private.h>
 
-#include <x86/bus_private.h>