 @@ -1,14 +1,14 @@
-#	$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.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Charles M. Hannum, and by Andrew Doran.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 @@ -109,27 +109,27 @@ if defined(_KERNEL) && defined(_KERNEL_O
 include "isa.h"
 include "ioapic.h"
 endif
 if NISA > 0
 include <machine/isa_machdep.h>
 endif
 if NIOAPIC > 0
 include <machine/i82093reg.h>
 include <machine/i82093var.h>
 endif
 ifdef XEN
-include <xen/xen3-public/xen.h>
+include <xen/xen-public/xen.h>
 endif
 include <sys/bus.h>
 define	LSRUN			LSRUN
 define	LSONPROC		LSONPROC
 define	UPAGES			UPAGES
 define	USPACE			USPACE
 define	KERNBASE_LO		KERNBASE_LO
 define	KERNBASE_HI		KERNBASE_HI
 define	KERNBASE		KERNBASE

 @@ -1,14 +1,14 @@
-#	$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.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Charles M. Hannum, and by Andrew Doran.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 @@ -89,27 +89,27 @@ include
 include <netinet/ip6.h>
 include <netinet/ip_var.h>
 include <uvm/uvm.h>
 include <machine/trap.h>
 include <machine/pmap.h>
 include <machine/vmparam.h>
 include <machine/intr.h>
 include <machine/types.h>
 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)
 include "ioapic.h"
 ifndef XEN
 include "apmbios.h"
 endif
 endif
 if NAPMBIOS > 0
 include <machine/bioscall.h>
 include <machine/apmvar.h>
 endif

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -58,28 +58,28 @@
 #include <machine/frame.h>
 #include <machine/pte.h>
 #include <machine/segments.h>
 #include <machine/tss.h>
 #include <machine/intrdefs.h>
 #include <x86/cacheinfo.h>
 #include <sys/cpu_data.h>
 #include <sys/evcnt.h>
 #include <sys/device_if.h> /* for device_t */
 #ifdef XEN
-#include <xen/xen3-public/xen.h>
+#include <xen/xen-public/xen.h>
-#include <xen/xen3-public/event_channel.h>
+#include <xen/xen-public/event_channel.h>
 #endif /* XEN */
 struct intrsource;
 struct pmap;
 struct device;
 #ifdef __x86_64__
 #define	i386tss	x86_64_tss
 #endif
 #define	NIOPORTS	1024		/* # of ports we allow to be mapped */
 #define	IOMAPSIZE	(NIOPORTS / 8)	/* I/O bitmap size in bytes */

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -161,27 +161,27 @@
  *     Hibler/Jolitz pmap, as modified for FreeBSD by John S. Dyson
  *     and David Greenman.
+ *
  * [3] the Mach pmap.   this pmap, from CMU, seems to have migrated
  *     between several processors.   the VAX version was done by
  *     Avadis Tevanian, Jr., and Michael Wayne Young.    the i386
  *     version was done by Lance Berc, Mike Kupfer, Bob Baron,
  *     David Golub, and Richard Draves.    the alpha version was
  *     done by Alessandro Forin (CMU/Mach) and Chris Demetriou
  *     (NetBSD/alpha).
  */
 #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"
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #if !defined(__x86_64__)
 #include "opt_kstack_dr0.h"
 #endif /* !defined(__x86_64__) */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 @@ -199,27 +199,27 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.1
 #include <machine/specialreg.h>
 #include <machine/gdt.h>
 #include <machine/isa_machdep.h>
 #include <machine/cpuvar.h>
 #include <machine/cputypes.h>
 #include <x86/pmap.h>
 #include <x86/pmap_pv.h>
 #include <x86/i82489reg.h>
 #include <x86/i82489var.h>
 #ifdef XEN
-#include <xen/xen3-public/xen.h>
+#include <xen/xen-public/xen.h>
 #include <xen/hypervisor.h>
 #endif
 /*
  * general info:
+ *
  *  - for an explanation of how the i386 MMU hardware works see
  *    the comments in <machine/pte.h>.
+ *
  *  - for an explanation of the general memory structure used by
  *    this pmap (including the recursive mapping), see the comments
  *    in <machine/pmap.h>.
+ *

 @@ -1,42 +1,42 @@
-/* $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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /* Interface to the Xen Grant tables */
-#include <xen/xen3-public/xen.h>
+#include <xen/xen-public/xen.h>
-#include <xen/xen3-public/grant_table.h>
+#include <xen/xen-public/grant_table.h>
 void xengnt_init(void);
 /* suspend/resume grant table, for save/restore operations */
 bool xengnt_suspend(void);
 bool xengnt_resume(void);
 /*
  * grant access to a remote domain. Returns a handle on the allocated grant
  * entry in table in grant_ref_t *.
  */
 int xengnt_grant_access(domid_t, paddr_t, int, grant_ref_t *);

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -69,37 +69,37 @@ struct xen_npx_attach_args {
 	const char 		*xa_device;
 };
 #define	u8 uint8_t
 #define	u16 uint16_t
 #define	u32 uint32_t
 #define	u64 uint64_t
 #define	s8 int8_t
 #define	s16 int16_t
 #define	s32 int32_t
 #define	s64 int64_t
-#include <xen/xen3-public/xen.h>
+#include <xen/xen-public/xen.h>
-#include <xen/xen3-public/sched.h>
+#include <xen/xen-public/sched.h>
-#include <xen/xen3-public/platform.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/xen-public/event_channel.h>
-#include <xen/xen3-public/physdev.h>
+#include <xen/xen-public/physdev.h>
-#include <xen/xen3-public/memory.h>
+#include <xen/xen-public/memory.h>
-#include <xen/xen3-public/io/netif.h>
+#include <xen/xen-public/io/netif.h>
-#include <xen/xen3-public/io/blkif.h>
+#include <xen/xen-public/io/blkif.h>
 #include <machine/cpu.h>
 #include <machine/hypercalls.h>
 #undef u8
 #undef u16
 #undef u32
 #undef u64
 #undef s8
 #undef s16
 #undef s32
 #undef s64

 @@ -1,14 +1,14 @@
-/* $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
+ *
  * Talks to Xen Store to figure out what devices we have.
+ *
  * Copyright (C) 2005 Rusty Russell, IBM Corporation
  * Copyright (C) 2005 XenSource Ltd.
+ *
  * This file may be distributed separately from the Linux kernel, or
  * incorporated into other software packages, subject to the following license:
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this source file (the "Software"), to deal in the Software without
 @@ -24,30 +24,30 @@
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
 #ifndef _ASM_XEN_XENBUS_H
 #define _ASM_XEN_XENBUS_H
 #include <sys/device.h>
 #include <sys/queue.h>
-#include <xen/xen3-public/xen.h>
+#include <xen/xen-public/xen.h>
-#include <xen/xen3-public/io/xenbus.h>
+#include <xen/xen-public/io/xenbus.h>
-#include <xen/xen3-public/io/xs_wire.h>
+#include <xen/xen-public/io/xs_wire.h>
-#include <xen/xen3-public/grant_table.h>	/* for grant_ref_t */
+#include <xen/xen-public/grant_table.h>	/* for grant_ref_t */
 /* xenbus to hypervisor attach */
 struct xenbus_attach_args {
 	const char 		*xa_device;
 	int			xa_handle;
 };
 /* devices to xenbus attach */
 struct xenbusdev_attach_args {
 	const char		*xa_type;
 	int 			xa_id;
 	struct xenbus_device	*xa_xbusd;
 };

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -163,26 +163,28 @@ HYPERVISOR_set_debugreg(int reg, unsigne
 static __inline unsigned long
 HYPERVISOR_get_debugreg(int reg)
+{
     unsigned long ret;
     unsigned long ign1;
     _hypercall(__HYPERVISOR_get_debugreg, _harg("1" (reg)),
 	_harg("=a" (ret), "=b" (ign1)));
     return ret;
+}
 #include <xen/xen3-public/arch-x86/xen-mca.h>
 static __inline int
 HYPERVISOR_machine_check(struct xen_mc *mc)
+{
      int ret;
      unsigned long ign1;
      mc->interface_version = XEN_MCA_INTERFACE_VERSION;
      _hypercall(__HYPERVISOR_mca, _harg("1" (mc)),
 	  _harg("=a" (ret), "=b" (ign1)));
      return ret;
+}

 @@ -1,14 +1,14 @@
-/*	$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  */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -56,27 +56,27 @@
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR AND CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #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"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "opt_xen.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 @@ -99,27 +99,27 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.70
 #include <machine/specialreg.h>
 #include <machine/segments.h>
 #include <machine/gdt.h>
 #include <machine/mtrr.h>
 #include <machine/pio.h>
 #ifdef i386
 #include <machine/npx.h>
 #else
 #include <machine/fpu.h>
 #endif
 #include <xen/xen.h>
-#include <xen/xen3-public/vcpu.h>
+#include <xen/xen-public/vcpu.h>
 #include <xen/vcpuvar.h>
 #if NLAPIC > 0
 #include <machine/apicvar.h>
 #include <machine/i82489reg.h>
 #include <machine/i82489var.h>
 #endif
 #include <dev/ic/mc146818reg.h>
 #include <dev/isa/isareg.h>
 #if MAXCPUS > 32
 #error cpu_info contains 32bit bitmasks

 @@ -1,14 +1,14 @@
-/* $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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Cherry G. Mathew <cherry@zyx.in>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,54 +23,54 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>			/* RCS ID macro */
 /*
  * 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>
 #include <sys/atomic.h>
 #include <sys/mutex.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/xcall.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 #include <machine/cpu.h>
 #ifdef __x86_64__
 #include <machine/fpu.h>
 #else
 #include <machine/npx.h>
 #endif /* __x86_64__ */
 #include <machine/frame.h>
 #include <machine/segments.h>
 #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);
 #else
 extern void ddb_ipi(int, struct trapframe);
 #endif /* __x86_64__ */
 static void xen_ipi_halt(struct cpu_info *, struct intrframe *);
 static void xen_ipi_synch_fpu(struct cpu_info *, struct intrframe *);
 static void xen_ipi_ddb(struct cpu_info *, struct intrframe *);
 static void xen_ipi_xcall(struct cpu_info *, struct intrframe *);
 static void xen_ipi_hvcb(struct cpu_info *, struct intrframe *);
 @@ -106,27 +106,27 @@ xen_ipi_handler(struct cpu_info *ci, str
+}
 /* Must be called once for every cpu that expects to send/recv ipis */
 void
 xen_ipi_init(void)
+{
 	cpuid_t vcpu;
 	evtchn_port_t evtchn;
 	struct cpu_info *ci;
 	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;
 	KASSERT(evtchn != -1 && evtchn < NR_EVENT_CHANNELS);
 	if (0 != event_set_handler(evtchn, (int (*)(void *))xen_ipi_handler,
 				   ci, IPL_HIGH, "ipi")) {
 		panic("event_set_handler(...) KPI violation\n");
 		/* NOTREACHED */
+	}
 	hypervisor_enable_event(evtchn);

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -92,27 +92,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #if !defined(__x86_64__)
 #include "opt_kstack_dr0.h"
 #endif /* !defined(__x86_64__) */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 @@ -127,27 +127,27 @@ __KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v
 #include <dev/isa/isareg.h>
 #include <machine/specialreg.h>
 #include <machine/gdt.h>
 #include <machine/isa_machdep.h>
 #include <machine/cpuvar.h>
 #include <x86/pmap.h>
 #include <x86/pmap_pv.h>
 #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>
 #define COUNT(x)	/* nothing */
 static pd_entry_t * const alternate_pdes[] = APDES_INITIALIZER;
 extern pd_entry_t * const normal_pdes[];
 extern paddr_t pmap_pa_start; /* PA of first physical page for this domain */
 extern paddr_t pmap_pa_end;   /* PA of last physical page for this domain */
 void
 pmap_apte_flush(struct pmap *pmap)

 @@ -1,14 +1,14 @@
-/*	$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 $	*/
 /*
+ *
  * Copyright (c) 2004 Christian Limpach.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -19,41 +19,41 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_xen.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.57 2011/11/18 06:01:50 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.58 2011/12/07 15:47:43 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/timetc.h>
 #include <sys/timevar.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
-#include <xen/xen3-public/vcpu.h>
+#include <xen/xen-public/vcpu.h>
 #include <machine/cpu_counter.h>
 #include <dev/clock_subr.h>
 #include <x86/rtc.h>
 static int xen_timer_handler(void *, struct intrframe *);
 /* A timecounter: Xen system_time extrapolated with a TSC. */
 u_int xen_get_timecount(struct timecounter*);
 static struct timecounter xen_timecounter = {
 	.tc_get_timecount = xen_get_timecount,
 	.tc_poll_pps = NULL,
 	.tc_counter_mask = ~0U,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: evtchn.c,v 1.58 2011/12/07 13:49:04 cegger Exp $	*/
+/*	$NetBSD: evtchn.c,v 1.59 2011/12/07 15:47:43 cegger Exp $	*/
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -44,27 +44,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.58 2011/12/07 13:49:04 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1.59 2011/12/07 15:47:43 cegger Exp $");
 #include "opt_xen.h"
 #include "isa.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 @@ -86,30 +86,30 @@ __KERNEL_RCSID(0, "$NetBSD: evtchn.c,v 1
  */
 static kmutex_t evtchn_lock;
 /* event handlers */
 struct evtsource *evtsource[NR_EVENT_CHANNELS];
 /* channel locks */
 static kmutex_t evtlock[NR_EVENT_CHANNELS];
 /* Reference counts for bindings to event channels XXX: redo for SMP */
 static uint8_t evtch_bindcount[NR_EVENT_CHANNELS];
 /* event-channel <-> VCPU mapping for IPIs. XXX: redo for SMP. */
-static evtchn_port_t vcpu_ipi_to_evtch[MAX_VIRT_CPUS];
+static evtchn_port_t vcpu_ipi_to_evtch[XEN_LEGACY_MAX_VCPUS];
 /* event-channel <-> VCPU mapping for VIRQ_TIMER.  XXX: redo for SMP. */
-static int virq_timer_to_evtch[MAX_VIRT_CPUS];
+static int virq_timer_to_evtch[XEN_LEGACY_MAX_VCPUS];
 /* event-channel <-> VIRQ mapping. */
 static int virq_to_evtch[NR_VIRQS];
 #if NPCI > 0 || NISA > 0
 /* event-channel <-> PIRQ mapping */
 static int pirq_to_evtch[NR_PIRQS];
 /* PIRQ needing notify */
 static uint32_t pirq_needs_unmask_notify[NR_EVENT_CHANNELS / 32];
 int pirq_interrupt(void *);
 physdev_op_t physdev_op_notify = {
 	.cmd = PHYSDEVOP_IRQ_UNMASK_NOTIFY,
 @@ -139,31 +139,31 @@ intr_biglock_wrapper(void *vp)
 	KERNEL_UNLOCK_ONE(NULL);
 	return ret;
+}
 #endif /* MULTIPROCESSOR */
 void
 events_default_setup(void)
+{
 	int i;
 	/* No VCPU -> event mappings. */
-	for (i = 0; i < MAX_VIRT_CPUS; i++)
+	for (i = 0; i < XEN_LEGACY_MAX_VCPUS; i++)
 		vcpu_ipi_to_evtch[i] = -1;
 	/* No VIRQ_TIMER -> event mappings. */
-	for (i = 0; i < MAX_VIRT_CPUS; i++)
+	for (i = 0; i < XEN_LEGACY_MAX_VCPUS; i++)
 		virq_timer_to_evtch[i] = -1;
 	/* No VIRQ -> event mappings. */
 	for (i = 0; i < NR_VIRQS; i++)
 		virq_to_evtch[i] = -1;
 #if NPCI > 0 || NISA > 0
 	/* No PIRQ -> event mappings. */
 	for (i = 0; i < NR_PIRQS; i++)
 		pirq_to_evtch[i] = -1;
 	for (i = 0; i < NR_EVENT_CHANNELS / 32; i++)
 		pirq_needs_unmask_notify[i] = 0;
 #endif

 @@ -1,14 +1,14 @@
-/* $NetBSD: hypervisor.c,v 1.58 2011/09/22 23:02:35 jym Exp $ */
+/* $NetBSD: hypervisor.c,v 1.59 2011/12/07 15:47:43 cegger Exp $ */
 /*
  * Copyright (c) 2005 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -43,51 +43,51 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.58 2011/09/22 23:02:35 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.59 2011/12/07 15:47:43 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include "xenbus.h"
 #include "xencons.h"
 #ifndef __x86_64__
 #include "npx.h"
 #else
 #define NNPX 0
 #endif /* __x86_64__ */
 #include "isa.h"
 #include "pci.h"
 #include "acpica.h"
 #include "opt_xen.h"
 #include "opt_mpbios.h"
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
-#include <xen/xen3-public/version.h>
+#include <xen/xen-public/version.h>
 #include <sys/cpu.h>
 #include <sys/dirent.h>
 #include <sys/stat.h>
 #include <sys/tree.h>
 #include <sys/vnode.h>
 #include <miscfs/specfs/specdev.h>
 #include <miscfs/kernfs/kernfs.h>
 #include <xen/kernfs_machdep.h>
 #include <dev/isa/isavar.h>
 #include <xen/granttables.h>
 #include <xen/vcpuvar.h>
 #if NPCI > 0

 @@ -1,14 +1,14 @@
-/*      $NetBSD: if_xennet_xenbus.c,v 1.55 2011/12/04 15:15:41 cherry Exp $      */
+/*      $NetBSD: if_xennet_xenbus.c,v 1.56 2011/12/07 15:47:43 cegger Exp $      */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -75,27 +75,27 @@
  * Purpose is to process the packets received from the outside. RX buffers
  * are pre-allocated through xennet_alloc_rx_buffer(), during xennet autoconf
  * attach. During pre-allocation, frontend pushes requests in the I/O ring, in
  * preparation for incoming packets from backend.
  * When RX packets need to be processed, backend takes the requests previously
  * offered by frontend and pushes the associated responses inside the I/O ring.
  * When done, it notifies frontend through an event notification, which will
  * asynchronously call xennet_handler() in frontend.
  * xennet_handler() processes the responses, generates the associated mbuf, and
  * passes it to the MI layer for further processing.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.55 2011/12/04 15:15:41 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.56 2011/12/07 15:47:43 cegger Exp $");
 #include "opt_xen.h"
 #include "opt_nfs_boot.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/intr.h>
 #if NRND > 0
 @@ -118,53 +118,53 @@ __KERNEL_RCSID(0, "$NetBSD: if_xennet_xe
 #include <nfs/nfs.h>
 #include <nfs/nfsmount.h>
 #include <nfs/nfsdiskless.h>
 #include <xen/if_xennetvar.h>
 #endif /* defined(NFS_BOOT_BOOTSTATIC) */
 #include <xen/xennet_checksum.h>
 #include <uvm/uvm.h>
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
 #include <xen/granttables.h>
-#include <xen/xen3-public/io/netif.h>
+#include <xen/xen-public/io/netif.h>
 #include <xen/xenpmap.h>
 #include <xen/xenbus.h>
 #include "locators.h"
 #undef XENNET_DEBUG_DUMP
 #undef XENNET_DEBUG
 #ifdef XENNET_DEBUG
 #define XEDB_FOLLOW     0x01
 #define XEDB_INIT       0x02
 #define XEDB_EVENT      0x04
 #define XEDB_MBUF       0x08
 #define XEDB_MEM        0x10
 int xennet_debug = 0xff;
 #define DPRINTF(x) if (xennet_debug) printf x;
 #define DPRINTFN(n,x) if (xennet_debug & (n)) printf x;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 #define GRANT_INVALID_REF -1 /* entry is free */
 #define GRANT_STACK_REF   -2 /* entry owned by the network stack */
-#define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE)
+#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE)
-#define NET_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE)
+#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE)
 struct xennet_txreq {
 	SLIST_ENTRY(xennet_txreq) txreq_next;
 	uint16_t txreq_id; /* ID passed to backend */
 	grant_ref_t txreq_gntref; /* grant ref of this request */
 	struct mbuf *txreq_m; /* mbuf being transmitted */
 };
 struct xennet_rxreq {
 	SLIST_ENTRY(xennet_rxreq) rxreq_next;
 	uint16_t rxreq_id; /* ID passed to backend */
 	grant_ref_t rxreq_gntref; /* grant ref of this request */
 /* va/pa for this receive buf. ma will be provided by backend */

 @@ -1,14 +1,14 @@
-/*      $NetBSD: pciback.c,v 1.5 2009/10/19 18:41:11 bouyer Exp $      */
+/*      $NetBSD: pciback.c,v 1.6 2011/12/07 15:47:43 cegger Exp $      */
 /*
  * Copyright (c) 2009 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,50 +16,50 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciback.c,v 1.5 2009/10/19 18:41:11 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciback.c,v 1.6 2011/12/07 15:47:43 cegger Exp $");
 #include "opt_xen.h"
 #include "rnd.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/queue.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus_private.h>
 #include <dev/isa/isareg.h>
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
 #include <xen/granttables.h>
-#include <xen/xen3-public/io/pciif.h>
+#include <xen/xen-public/io/pciif.h>
 #include <xen/xenbus.h>
 #include <sys/stat.h>
 #include <sys/dirent.h>
 #include <miscfs/specfs/specdev.h>
 #include <miscfs/kernfs/kernfs.h>
 #include <xen/kernfs_machdep.h>
 #include "locators.h"
 #include <dev/pci/pcivar.h>
 #include <machine/i82093var.h>

 @@ -1,14 +1,14 @@
-/*      $NetBSD: xbd_xenbus.c,v 1.49 2011/11/19 22:51:21 tls Exp $      */
+/*      $NetBSD: xbd_xenbus.c,v 1.50 2011/12/07 15:47:43 cegger Exp $      */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -40,27 +40,27 @@
  * - initiate request: xbdread/write/open/ioctl/..
  * - depending on operation, it is handled directly by disk(9) subsystem or
  *   goes through physio(9) first.
  * - the request is ultimately processed by xbdstart() that prepares the
  *   xbd requests, post them in the ring I/O queue, then signal the backend.
+ *
  * When a response is available in the queue, the backend signals the frontend
  * via its event channel. This triggers xbd_handler(), which will link back
  * the response to its request through the request ID, and mark the I/O as
  * completed.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.49 2011/11/19 22:51:21 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.50 2011/12/07 15:47:43 cegger Exp $");
 #include "opt_xen.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 @@ -70,42 +70,42 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c
 #include <sys/vnode.h>
 #include <dev/dkvar.h>
 #include <uvm/uvm.h>
 #if NRND > 0
 #include <sys/rnd.h>
 #endif
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
 #include <xen/granttables.h>
-#include <xen/xen3-public/io/blkif.h>
+#include <xen/xen-public/io/blkif.h>
-#include <xen/xen3-public/io/protocols.h>
+#include <xen/xen-public/io/protocols.h>
 #include <xen/xenbus.h>
 #include "locators.h"
 #undef XBD_DEBUG
 #ifdef XBD_DEBUG
 #define DPRINTF(x) printf x;
 #else
 #define DPRINTF(x)
 #endif
 #define GRANT_INVALID_REF -1
-#define XBD_RING_SIZE __RING_SIZE((blkif_sring_t *)0, PAGE_SIZE)
+#define XBD_RING_SIZE __CONST_RING_SIZE(blkif, PAGE_SIZE)
 #define XEN_BSHIFT      9               /* log2(XEN_BSIZE) */
 #define XEN_BSIZE       (1 << XEN_BSHIFT)
 struct xbd_req {
 	SLIST_ENTRY(xbd_req) req_next;
 	uint16_t req_id; /* ID passed to backend */
 	union {
 	    struct {
 		grant_ref_t req_gntref[BLKIF_MAX_SEGMENTS_PER_REQUEST];
 		int req_nr_segments; /* number of segments in this request */
 		struct buf *req_bp; /* buffer associated with this request */
 		void *req_data; /* pointer to the data buffer */

 @@ -1,14 +1,14 @@
-/*      $NetBSD: xbdback_xenbus.c,v 1.54 2011/12/03 22:36:28 bouyer Exp $      */
+/*      $NetBSD: xbdback_xenbus.c,v 1.55 2011/12/07 15:47:43 cegger Exp $      */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,53 +16,53 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.54 2011/12/03 22:36:28 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.55 2011/12/07 15:47:43 cegger Exp $");
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/condvar.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/vnode.h>
 #include <xen/xen.h>
 #include <xen/xen_shm.h>
 #include <xen/evtchn.h>
 #include <xen/xenbus.h>
-#include <xen/xen3-public/io/protocols.h>
+#include <xen/xen-public/io/protocols.h>
 /* #define XENDEBUG_VBD */
 #ifdef XENDEBUG_VBD
 #define XENPRINTF(x) printf x
 #else
 #define XENPRINTF(x)
 #endif
 #define BLKIF_RING_SIZE __RING_SIZE((blkif_sring_t *)0, PAGE_SIZE)
 /*
  * Backend block device driver for Xen
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: xencons.c,v 1.38 2011/09/20 00:12:24 jym Exp $	*/
+/*	$NetBSD: xencons.c,v 1.39 2011/12/07 15:47:43 cegger Exp $	*/
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -43,46 +43,46 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.38 2011/09/20 00:12:24 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.39 2011/12/07 15:47:43 cegger Exp $");
 #include "opt_xen.h"
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
 #include <uvm/uvm.h>
 #include <machine/pmap.h>
-#include <xen/xen3-public/io/console.h>
+#include <xen/xen-public/io/console.h>
 #include <dev/cons.h>
 #ifdef DDB
 #include <ddb/db_output.h>	/* XXX for db_max_line */
 #endif
 #undef XENDEBUG
 #ifdef XENDEBUG
 #define XENPRINTK(x) printk x
 #else
 #define XENPRINTK(x)

 @@ -1,14 +1,14 @@
-/*      $NetBSD: xpci_xenbus.c,v 1.8 2011/09/01 15:10:31 christos Exp $      */
+/*      $NetBSD: xpci_xenbus.c,v 1.9 2011/12/07 15:47:43 cegger Exp $      */
 /*
  * Copyright (c) 2009 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,49 +16,49 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.8 2011/09/01 15:10:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.9 2011/12/07 15:47:43 cegger Exp $");
 #include "opt_xen.h"
 #include "rnd.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus_private.h>
 #include <dev/isa/isareg.h>
 #include <xen/hypervisor.h>
 #include <xen/evtchn.h>
 #include <xen/granttables.h>
-#include <xen/xen3-public/io/pciif.h>
+#include <xen/xen-public/io/pciif.h>
 #include <xen/xenbus.h>
 #include "locators.h"
 #include <dev/pci/pcivar.h>
 #undef XPCI_DEBUG
 #ifdef XPCI_DEBUG
 #define DPRINTF(x) printf x;
 #else
 #define DPRINTF(x)
 #endif

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: hypercalls.h,v 1.6 2011/03/30 22:57:24 jym Exp $ */	1	/* $NetBSD: hypercalls.h,v 1.7 2011/12/07 15:47:42 cegger Exp $ */
2	/******************************************************************************	2	/******************************************************************************
3	* hypercall.h	3	* hypercall.h
4	*	4	*
5	* Linux-specific hypervisor handling.	5	* Linux-specific hypervisor handling.
6	*	6	*
7	* Copyright (c) 2002-2004, K A Fraser	7	* Copyright (c) 2002-2004, K A Fraser
8	*	8	*
9	* 64-bit updates:	9	* 64-bit updates:
10	* Benjamin Liu <benjamin.liu@intel.com>	10	* Benjamin Liu <benjamin.liu@intel.com>
11	* Jun Nakajima <jun.nakajima@intel.com>	11	* Jun Nakajima <jun.nakajima@intel.com>
12	*	12	*
13	* This program is free software; you can redistribute it and/or	13	* This program is free software; you can redistribute it and/or
14	* modify it under the terms of the GNU General Public License version 2	14	* modify it under the terms of the GNU General Public License version 2
	@@ -389,26 +389,28 @@ HYPERVISOR_kexec_op(		@@ -389,26 +389,28 @@ HYPERVISOR_kexec_op(
389	return _hypercall2(int, kexec_op, op, args);	389	return _hypercall2(int, kexec_op, op, args);
390	}	390	}
391		391
392	#if __XEN_INTERFACE_VERSION__ < 0x00030204	392	#if __XEN_INTERFACE_VERSION__ < 0x00030204
393	static inline int	393	static inline int
394	HYPERVISOR_dom0_op(	394	HYPERVISOR_dom0_op(
395	dom0_op_t *dom0_op)	395	dom0_op_t *dom0_op)
396	{	396	{
397	dom0_op->interface_version = DOM0_INTERFACE_VERSION;	397	dom0_op->interface_version = DOM0_INTERFACE_VERSION;
398	return _hypercall1(int, dom0_op, dom0_op);	398	return _hypercall1(int, dom0_op, dom0_op);
399	}	399	}
400	#endif /* __XEN_INTERFACE_VERSION__ */	400	#endif /* __XEN_INTERFACE_VERSION__ */
401		401
		402	#include <xen/xen3-public/arch-x86/xen-mca.h>
		403
402	static inline int	404	static inline int
403	HYPERVISOR_machine_check(struct xen_mc *mc)	405	HYPERVISOR_machine_check(struct xen_mc *mc)
404	{	406	{
405	mc->interface_version = XEN_MCA_INTERFACE_VERSION;	407	mc->interface_version = XEN_MCA_INTERFACE_VERSION;
406	return _hypercall1(int, mca, mc);	408	return _hypercall1(int, mca, mc);
407	}	409	}
408		410
409	static inline int	411	static inline int
410	HYPERVISOR_sysctl(void *sysctl)	412	HYPERVISOR_sysctl(void *sysctl)
411	{	413	{
412	return _hypercall1(int, sysctl, sysctl);	414	return _hypercall1(int, sysctl, sysctl);
413	}	415	}
414		416