[src/bouyer-xenpvh]: src/sys/arch More #ifndef XEN -> #ifndef XENPV

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/bouyer-xenpvh]: src/sys/arch More #ifndef XEN -> #ifndef XENPV
From: bouyer <bouyer%NetBSD.org@localhost>
Date: Thu, 16 Apr 2020 13:24:55 +0000
details:   https://anonhg.NetBSD.org/src/rev/72546f00ee36
branches:  bouyer-xenpvh
changeset: 930880:72546f00ee36
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Apr 16 09:45:56 2020 +0000

description:
More #ifndef XEN -> #ifndef XENPV

diffstat:

 sys/arch/amd64/amd64/locore.S             |   4 ++--
 sys/arch/amd64/amd64/machdep.c            |   6 +++---
 sys/arch/x86/include/pci_machdep_common.h |   4 ++--
 sys/arch/x86/x86/consinit.c               |   6 +++---
 sys/arch/x86/x86/cpu.c                    |   6 +++---
 sys/arch/x86/x86/cpu_ucode_amd.c          |   6 +++---
 sys/arch/x86/x86/identcpu.c               |  12 ++++++------
 sys/arch/x86/x86/intr.c                   |   6 +++---
 sys/arch/x86/x86/pmap.c                   |  14 +++++++-------
 sys/arch/x86/x86/x86_autoconf.c           |   6 +++---
 sys/arch/x86/x86/x86_machdep.c            |   6 +++---
 11 files changed, 38 insertions(+), 38 deletions(-)

diffs (truncated from 334 to 300 lines):

diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S     Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/amd64/amd64/locore.S     Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.200.4.1 2020/04/08 17:59:16 bouyer Exp $  */
+/*     $NetBSD: locore.S,v 1.200.4.2 2020/04/16 09:45:56 bouyer Exp $  */
 
 /*
  * Copyright-o-rama!
@@ -1110,7 +1110,7 @@
 .Lskip_svs:
 #endif
 
-#ifndef XEN
+#ifndef XENPV
        movq    %r13,%rdi
        movq    %r12,%rsi
        callq   _C_LABEL(speculation_barrier)
diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.346.4.1 2020/04/09 16:12:50 bouyer Exp $ */
+/*     $NetBSD: machdep.c,v 1.346.4.2 2020/04/16 09:45:56 bouyer Exp $ */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.346.4.1 2020/04/09 16:12:50 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.346.4.2 2020/04/16 09:45:56 bouyer Exp $");
 
 #include "opt_modular.h"
 #include "opt_user_ldt.h"
@@ -1696,7 +1696,7 @@
        svs_init();
 #endif
        cpu_init_msrs(&cpu_info_primary, true);
-#ifndef XEN
+#ifndef XENPV
        cpu_speculation_init(&cpu_info_primary);
 #endif
 
diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/x86/include/pci_machdep_common.h
--- a/sys/arch/x86/include/pci_machdep_common.h Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/x86/include/pci_machdep_common.h Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep_common.h,v 1.23 2016/07/11 06:14:51 knakahara Exp $        */
+/*     $NetBSD: pci_machdep_common.h,v 1.23.28.1 2020/04/16 09:45:56 bouyer Exp $      */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -37,7 +37,7 @@
  * Machine-specific definitions for PCI autoconfiguration.
  */
 #define        __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
-#ifndef XEN
+#ifndef XENPV
 #define        __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_DISESTABLISH
 #endif
 
diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/x86/x86/consinit.c
--- a/sys/arch/x86/x86/consinit.c       Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/x86/x86/consinit.c       Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: consinit.c,v 1.31 2019/05/31 03:10:31 nonaka Exp $     */
+/*     $NetBSD: consinit.c,v 1.31.8.1 2020/04/16 09:45:56 bouyer Exp $ */
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.31 2019/05/31 03:10:31 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.31.8.1 2020/04/16 09:45:56 bouyer Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_puc.h"
@@ -91,7 +91,7 @@
 #include <dev/usb/ukbdvar.h>
 #endif
 
-#ifndef XEN
+#ifndef XENPV
 #include "hvkbd.h"
 #if NHVKBD > 0
 #include <dev/hyperv/hvkbdvar.h>
diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/x86/x86/cpu.c
--- a/sys/arch/x86/x86/cpu.c    Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/x86/x86/cpu.c    Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.181.4.1 2020/04/10 14:37:54 bouyer Exp $     */
+/*     $NetBSD: cpu.c,v 1.181.4.2 2020/04/16 09:45:56 bouyer Exp $     */
 
 /*
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.181.4.1 2020/04/10 14:37:54 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.181.4.2 2020/04/16 09:45:56 bouyer Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"                /* for MPDEBUG */
@@ -123,7 +123,7 @@
 
 #include "tsc.h"
 
-#ifndef XEN
+#ifndef XENPV
 #include "hyperv.h"
 #if NHYPERV > 0
 #include <x86/x86/hypervvar.h>
diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/x86/x86/cpu_ucode_amd.c
--- a/sys/arch/x86/x86/cpu_ucode_amd.c  Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/x86/x86/cpu_ucode_amd.c  Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_amd.c,v 1.10.6.1 2020/04/16 08:46:35 bouyer Exp $ */
+/* $NetBSD: cpu_ucode_amd.c,v 1.10.6.2 2020/04/16 09:45:56 bouyer Exp $ */
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_amd.c,v 1.10.6.1 2020/04/16 08:46:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_amd.c,v 1.10.6.2 2020/04/16 09:45:56 bouyer Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_xen.h"
@@ -302,4 +302,4 @@
        kmem_free(mc.mc_amd, sizeof(*mc.mc_amd));
        return error;
 }
-#endif /* ! XEN */
+#endif /* ! XENPV */
diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: identcpu.c,v 1.102.2.1 2020/04/08 17:59:16 bouyer Exp $        */
+/*     $NetBSD: identcpu.c,v 1.102.2.2 2020/04/16 09:45:57 bouyer Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.102.2.1 2020/04/08 17:59:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.102.2.2 2020/04/16 09:45:57 bouyer Exp $");
 
 #include "opt_xen.h"
 
@@ -53,7 +53,7 @@
 #include <x86/x86/vmtreg.h>    /* for vmt_hvcall() */
 #include <x86/x86/vmtvar.h>    /* for vmt_hvcall() */
 
-#ifndef XEN
+#ifndef XENPV
 #include "hyperv.h"
 #if NHYPERV > 0
 #include <x86/x86/hypervvar.h>
@@ -461,7 +461,7 @@
         * even be in here, it should be in there. XXX
         */
        uint8_t c3;
-#ifndef XEN
+#ifndef XENPV
        extern int clock_broken_latch;
 
        switch (ci->ci_signature) {
@@ -973,7 +973,7 @@
                cpu_probe_fpu(ci);
        }
 
-#ifndef XEN
+#ifndef XENPV
        x86_cpu_topology(ci);
 #endif
 
@@ -990,7 +990,7 @@
                        cpu_feature[i] = ci->ci_feat_val[i];
                }
                identify_hypervisor();
-#ifndef XEN
+#ifndef XENPV
                /* Early patch of text segment. */
                x86_patch(true);
 #endif
diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c   Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/x86/x86/intr.c   Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.150.6.2 2020/04/12 17:25:52 bouyer Exp $    */
+/*     $NetBSD: intr.c,v 1.150.6.3 2020/04/16 09:45:57 bouyer Exp $    */
 
 /*
  * Copyright (c) 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.150.6.2 2020/04/12 17:25:52 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.150.6.3 2020/04/16 09:45:57 bouyer Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -166,7 +166,7 @@
 #include "lapic.h"
 #include "pci.h"
 #include "acpica.h"
-#ifndef XEN
+#ifndef XENPV
 #include "hyperv.h"
 #if NHYPERV > 0
 #include <dev/hyperv/hypervvar.h>
diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/x86/x86/pmap.c   Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.381 2020/04/05 00:21:11 ad Exp $    */
+/*     $NetBSD: pmap.c,v 1.381.2.1 2020/04/16 09:45:57 bouyer Exp $    */
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017, 2019, 2020 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.381 2020/04/05 00:21:11 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.381.2.1 2020/04/16 09:45:57 bouyer Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -3001,7 +3001,7 @@
 pmap_zap_ptp(struct pmap *pmap, struct vm_page *ptp, pt_entry_t *pte,
     vaddr_t startva, vaddr_t blkendva)
 {
-#ifndef XEN
+#ifndef XENPV
        struct pv_entry *pve;
        struct vm_page *pg;
        struct pmap_page *pp;
@@ -3111,13 +3111,13 @@
 #ifdef DIAGNOSTIC
        rb_tree_init(tree, &pmap_rbtree_ops);
 #endif
-#else  /* !XEN */
+#else  /* !XENPV */
        /*
         * XXXAD For XEN, it's not clear to me that we can do this, because
         * I guess the hypervisor keeps track of PTEs too.
         */
        pmap_remove_ptes(pmap, ptp, (vaddr_t)pte, startva, blkendva);
-#endif /* !XEN */
+#endif /* !XENPV */
 }
 
 /*
@@ -5517,7 +5517,7 @@
        return pflag;
 }
 
-#if defined(__HAVE_DIRECT_MAP) && defined(__x86_64__) && !defined(XEN)
+#if defined(__HAVE_DIRECT_MAP) && defined(__x86_64__) && !defined(XENPV)
 
 /*
  * -----------------------------------------------------------------------------
@@ -6384,4 +6384,4 @@
        memset(pmap->pm_pdir, 0, PAGE_SIZE);
 }
 
-#endif /* __HAVE_DIRECT_MAP && __x86_64__ && !XEN */
+#endif /* __HAVE_DIRECT_MAP && __x86_64__ && !XENPV */
diff -r ee9d97a37802 -r 72546f00ee36 sys/arch/x86/x86/x86_autoconf.c
--- a/sys/arch/x86/x86/x86_autoconf.c   Thu Apr 16 08:46:34 2020 +0000
+++ b/sys/arch/x86/x86/x86_autoconf.c   Thu Apr 16 09:45:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_autoconf.c,v 1.79 2019/11/10 21:16:34 chs Exp $    */
+/*     $NetBSD: x86_autoconf.c,v 1.79.6.1 2020/04/16 09:45:57 bouyer Exp $     */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.79 2019/11/10 21:16:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.79.6.1 2020/04/16 09:45:57 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,7 +58,7 @@
Prev by Date: [src/bouyer-xenpvh]: src/sys/arch/amd64/conf Well, no, SVS does't quite work ...
Next by Date: [src/trunk]: src/sys/arch/xen/xen when checking for physio request check for ...
Previous by Thread: [src/bouyer-xenpvh]: src/sys/arch/amd64/conf Well, no, SVS does't quite work ...
Next by Thread: [src/trunk]: src/sys/arch/xen/xen when checking for physio request check for ...
Indexes:
Home | Main Index | Thread Index | Old Index