[src/trunk]: src/sys/arch switch from xen3-public to xen-public.

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

details:   https://anonhg.NetBSD.org/src/rev/39525db093a5
branches:  trunk
changeset: 771902:39525db093a5
user:      cegger <cegger%NetBSD.org@localhost>
date:      Wed Dec 07 15:47:41 2011 +0000

description:
switch from xen3-public to xen-public.

diffstat:

 sys/arch/amd64/amd64/genassym.cf        |   4 ++--
 sys/arch/i386/i386/genassym.cf          |   4 ++--
 sys/arch/x86/include/cpu.h              |   6 +++---
 sys/arch/x86/x86/pmap.c                 |   6 +++---
 sys/arch/xen/include/amd64/hypercalls.h |   4 +++-
 sys/arch/xen/include/granttables.h      |   6 +++---
 sys/arch/xen/include/hypervisor.h       |  20 ++++++++++----------
 sys/arch/xen/include/i386/hypercalls.h  |   4 +++-
 sys/arch/xen/include/xenbus.h           |  10 +++++-----
 sys/arch/xen/x86/cpu.c                  |   6 +++---
 sys/arch/xen/x86/xen_ipi.c              |  10 +++++-----
 sys/arch/xen/x86/xen_pmap.c             |   6 +++---
 sys/arch/xen/xen/clock.c                |   6 +++---
 sys/arch/xen/xen/evtchn.c               |  12 ++++++------
 sys/arch/xen/xen/hypervisor.c           |   6 +++---
 sys/arch/xen/xen/if_xennet_xenbus.c     |  10 +++++-----
 sys/arch/xen/xen/pciback.c              |   6 +++---
 sys/arch/xen/xen/xbd_xenbus.c           |  10 +++++-----
 sys/arch/xen/xen/xbdback_xenbus.c       |   6 +++---
 sys/arch/xen/xen/xencons.c              |   6 +++---
 sys/arch/xen/xen/xpci_xenbus.c          |   6 +++---
 21 files changed, 79 insertions(+), 75 deletions(-)

diffs (truncated from 576 to 300 lines):

diff -r 18075f005fa3 -r 39525db093a5 sys/arch/amd64/amd64/genassym.cf
--- a/sys/arch/amd64/amd64/genassym.cf  Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/amd64/amd64/genassym.cf  Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.48 2011/07/01 19:24:14 dyoung Exp $
+#      $NetBSD: genassym.cf,v 1.49 2011/12/07 15:47:41 cegger Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
 endif
 
 ifdef XEN
-include <xen/xen3-public/xen.h>
+include <xen/xen-public/xen.h>
 endif  
 
 include <sys/bus.h>
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf    Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/i386/i386/genassym.cf    Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.90 2011/07/01 18:14:15 dyoung Exp $
+#      $NetBSD: genassym.cf,v 1.91 2011/12/07 15:47:42 cegger Exp $
 
 #
 # Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
 include <machine/segments.h>
 
 ifdef XEN
-include <xen/xen3-public/sched.h>
+include <xen/xen-public/sched.h>
 endif
 
 if defined(_KERNEL) && defined(_KERNEL_OPT)
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/x86/include/cpu.h
--- a/sys/arch/x86/include/cpu.h        Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/x86/include/cpu.h        Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.43 2011/11/19 17:13:39 cherry Exp $  */
+/*     $NetBSD: cpu.h,v 1.44 2011/12/07 15:47:42 cegger Exp $  */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -68,8 +68,8 @@
 #include <sys/device_if.h> /* for device_t */
 
 #ifdef XEN
-#include <xen/xen3-public/xen.h>
-#include <xen/xen3-public/event_channel.h>
+#include <xen/xen-public/xen.h>
+#include <xen/xen-public/event_channel.h>
 #endif /* XEN */
 
 struct intrsource;
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/x86/x86/pmap.c   Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.143 2011/12/04 16:24:13 chs Exp $   */
+/*     $NetBSD: pmap.c,v 1.144 2011/12/07 15:47:42 cegger Exp $        */
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.143 2011/12/04 16:24:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.144 2011/12/07 15:47:42 cegger Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -209,7 +209,7 @@
 #include <x86/i82489var.h>
 
 #ifdef XEN
-#include <xen/xen3-public/xen.h>
+#include <xen/xen-public/xen.h>
 #include <xen/hypervisor.h>
 #endif
 
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/xen/include/amd64/hypercalls.h
--- a/sys/arch/xen/include/amd64/hypercalls.h   Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/xen/include/amd64/hypercalls.h   Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hypercalls.h,v 1.6 2011/03/30 22:57:24 jym Exp $ */
+/* $NetBSD: hypercalls.h,v 1.7 2011/12/07 15:47:42 cegger Exp $ */
 /******************************************************************************
  * hypercall.h
  * 
@@ -399,6 +399,8 @@
 }
 #endif /* __XEN_INTERFACE_VERSION__ */
 
+#include <xen/xen3-public/arch-x86/xen-mca.h>
+
 static inline int
 HYPERVISOR_machine_check(struct xen_mc *mc)
 {
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/xen/include/granttables.h
--- a/sys/arch/xen/include/granttables.h        Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/xen/include/granttables.h        Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: granttables.h,v 1.8 2011/09/20 00:12:23 jym Exp $ */
+/* $NetBSD: granttables.h,v 1.9 2011/12/07 15:47:42 cegger Exp $ */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
  *
@@ -25,8 +25,8 @@
  */
 
 /* Interface to the Xen Grant tables */
-#include <xen/xen3-public/xen.h>
-#include <xen/xen3-public/grant_table.h>
+#include <xen/xen-public/xen.h>
+#include <xen/xen-public/grant_table.h>
 
 void xengnt_init(void);
 
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/xen/include/hypervisor.h
--- a/sys/arch/xen/include/hypervisor.h Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/xen/include/hypervisor.h Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hypervisor.h,v 1.35 2011/11/19 17:13:39 cherry Exp $   */
+/*     $NetBSD: hypervisor.h,v 1.36 2011/12/07 15:47:42 cegger Exp $   */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -79,17 +79,17 @@
 #define        s32 int32_t
 #define        s64 int64_t
 
-#include <xen/xen3-public/xen.h>
-#include <xen/xen3-public/sched.h>
-#include <xen/xen3-public/platform.h>
+#include <xen/xen-public/xen.h>
+#include <xen/xen-public/sched.h>
+#include <xen/xen-public/platform.h>
 #if __XEN_INTERFACE_VERSION__ < 0x00030204
-#include <xen/xen3-public/dom0_ops.h>
+#include <xen/xen-public/dom0_ops.h>
 #endif
-#include <xen/xen3-public/event_channel.h>
-#include <xen/xen3-public/physdev.h>
-#include <xen/xen3-public/memory.h>
-#include <xen/xen3-public/io/netif.h>
-#include <xen/xen3-public/io/blkif.h>
+#include <xen/xen-public/event_channel.h>
+#include <xen/xen-public/physdev.h>
+#include <xen/xen-public/memory.h>
+#include <xen/xen-public/io/netif.h>
+#include <xen/xen-public/io/blkif.h>
 
 #include <machine/cpu.h>
 #include <machine/hypercalls.h>
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/xen/include/i386/hypercalls.h
--- a/sys/arch/xen/include/i386/hypercalls.h    Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/xen/include/i386/hypercalls.h    Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hypercalls.h,v 1.12 2011/06/07 14:53:03 bouyer Exp $   */
+/*     $NetBSD: hypercalls.h,v 1.13 2011/12/07 15:47:42 cegger Exp $   */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -173,6 +173,8 @@
     return ret;
 }
 
+#include <xen/xen3-public/arch-x86/xen-mca.h>
+
 static __inline int
 HYPERVISOR_machine_check(struct xen_mc *mc)
 {
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/xen/include/xenbus.h
--- a/sys/arch/xen/include/xenbus.h     Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/xen/include/xenbus.h     Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus.h,v 1.12 2011/09/20 00:12:24 jym Exp $ */
+/* $NetBSD: xenbus.h,v 1.13 2011/12/07 15:47:42 cegger Exp $ */
 /******************************************************************************
  * xenbus.h
  *
@@ -34,10 +34,10 @@
 
 #include <sys/device.h>
 #include <sys/queue.h>
-#include <xen/xen3-public/xen.h>
-#include <xen/xen3-public/io/xenbus.h>
-#include <xen/xen3-public/io/xs_wire.h>
-#include <xen/xen3-public/grant_table.h>       /* for grant_ref_t */
+#include <xen/xen-public/xen.h>
+#include <xen/xen-public/io/xenbus.h>
+#include <xen/xen-public/io/xs_wire.h>
+#include <xen/xen-public/grant_table.h>        /* for grant_ref_t */
 
 /* xenbus to hypervisor attach */
 struct xenbus_attach_args {
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/xen/x86/cpu.c    Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.70 2011/11/06 15:18:19 cherry Exp $  */
+/*     $NetBSD: cpu.c,v 1.71 2011/12/07 15:47:43 cegger Exp $  */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.70 2011/11/06 15:18:19 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.71 2011/12/07 15:47:43 cegger Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -109,7 +109,7 @@
 #endif
 
 #include <xen/xen.h>
-#include <xen/xen3-public/vcpu.h>
+#include <xen/xen-public/vcpu.h>
 #include <xen/vcpuvar.h>
 
 #if NLAPIC > 0
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/xen/x86/xen_ipi.c
--- a/sys/arch/xen/x86/xen_ipi.c        Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/xen/x86/xen_ipi.c        Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.6 2011/11/07 15:51:31 cherry Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.7 2011/12/07 15:47:43 cegger Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -33,10 +33,10 @@
 
 /* 
  * Based on: x86/ipi.c
- * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.6 2011/11/07 15:51:31 cherry Exp $"); 
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.7 2011/12/07 15:47:43 cegger Exp $"); 
  */
 
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.6 2011/11/07 15:51:31 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.7 2011/12/07 15:47:43 cegger Exp $");
 
 #include <sys/types.h>
 
@@ -60,7 +60,7 @@
 #include <xen/intr.h>
 #include <xen/intrdefs.h>
 #include <xen/hypervisor.h>
-#include <xen/xen3-public/vcpu.h>
+#include <xen/xen-public/vcpu.h>
 
 #ifdef __x86_64__
 extern void ddb_ipi(struct trapframe);
@@ -116,7 +116,7 @@
        ci = curcpu();
 
        vcpu = ci->ci_cpuid;
-       KASSERT(vcpu < MAX_VIRT_CPUS);
+       KASSERT(vcpu < XEN_LEGACY_MAX_VCPUS);
 
        evtchn = bind_vcpu_to_evtch(vcpu);
        ci->ci_ipi_evtchn = evtchn;
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/xen/x86/xen_pmap.c
--- a/sys/arch/xen/x86/xen_pmap.c       Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/xen/x86/xen_pmap.c       Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xen_pmap.c,v 1.10 2011/11/23 00:56:56 jym Exp $        */
+/*     $NetBSD: xen_pmap.c,v 1.11 2011/12/07 15:47:43 cegger Exp $     */
 
 /*
  * Copyright (c) 2007 Manuel Bouyer.
@@ -102,7 +102,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.10 2011/11/23 00:56:56 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.11 2011/12/07 15:47:43 cegger Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -137,7 +137,7 @@
 #include <x86/i82489reg.h>
 #include <x86/i82489var.h>
 
-#include <xen/xen3-public/xen.h>
+#include <xen/xen-public/xen.h>
 #include <xen/hypervisor.h>
 #include <xen/xenpmap.h>
 
diff -r 18075f005fa3 -r 39525db093a5 sys/arch/xen/xen/clock.c
--- a/sys/arch/xen/xen/clock.c  Wed Dec 07 15:40:15 2011 +0000
+++ b/sys/arch/xen/xen/clock.c  Wed Dec 07 15:47:41 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.57 2011/11/18 06:01:50 cherry Exp $        */
+/*     $NetBSD: clock.c,v 1.58 2011/12/07 15:47:43 cegger Exp $        */