Module Name: src
Committed By: cegger
Date: Wed Dec 7 15:47:43 UTC 2011
Modified Files:
src/sys/arch/amd64/amd64: genassym.cf
src/sys/arch/i386/i386: genassym.cf
src/sys/arch/x86/include: cpu.h
src/sys/arch/x86/x86: pmap.c
src/sys/arch/xen/include: granttables.h hypervisor.h xenbus.h
src/sys/arch/xen/include/amd64: hypercalls.h
src/sys/arch/xen/include/i386: hypercalls.h
src/sys/arch/xen/x86: cpu.c xen_ipi.c xen_pmap.c
src/sys/arch/xen/xen: clock.c evtchn.c hypervisor.c if_xennet_xenbus.c
pciback.c xbd_xenbus.c xbdback_xenbus.c xencons.c xpci_xenbus.c
Log Message:
switch from xen3-public to xen-public.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.143 -r1.144 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/xen/include/granttables.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/xen/include/hypervisor.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/include/xenbus.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/xen/include/amd64/hypercalls.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/include/i386/hypercalls.h
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/xen/x86/cpu.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/xen/x86/xen_ipi.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/xen/x86/xen_pmap.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/xen/xen/clock.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/xen/xen/evtchn.c \
src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/xen/pciback.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/xen/xen/xbdback_xenbus.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/xen/xen/xencons.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/xen/xen/xpci_xenbus.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/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.48 src/sys/arch/amd64/amd64/genassym.cf:1.49
--- src/sys/arch/amd64/amd64/genassym.cf:1.48 Fri Jul 1 19:24:14 2011
+++ src/sys/arch/amd64/amd64/genassym.cf Wed Dec 7 15:47:41 2011
@@ -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 @@ include <machine/i82093var.h>
endif
ifdef XEN
-include <xen/xen3-public/xen.h>
+include <xen/xen-public/xen.h>
endif
include <sys/bus.h>
Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.90 src/sys/arch/i386/i386/genassym.cf:1.91
--- src/sys/arch/i386/i386/genassym.cf:1.90 Fri Jul 1 18:14:15 2011
+++ src/sys/arch/i386/i386/genassym.cf Wed Dec 7 15:47:42 2011
@@ -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/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)
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.43 src/sys/arch/x86/include/cpu.h:1.44
--- src/sys/arch/x86/include/cpu.h:1.43 Sat Nov 19 17:13:39 2011
+++ src/sys/arch/x86/include/cpu.h Wed Dec 7 15:47:42 2011
@@ -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;
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.143 src/sys/arch/x86/x86/pmap.c:1.144
--- src/sys/arch/x86/x86/pmap.c:1.143 Sun Dec 4 16:24:13 2011
+++ src/sys/arch/x86/x86/pmap.c Wed Dec 7 15:47:42 2011
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.1
#include <x86/i82489var.h>
#ifdef XEN
-#include <xen/xen3-public/xen.h>
+#include <xen/xen-public/xen.h>
#include <xen/hypervisor.h>
#endif
Index: src/sys/arch/xen/include/granttables.h
diff -u src/sys/arch/xen/include/granttables.h:1.8 src/sys/arch/xen/include/granttables.h:1.9
--- src/sys/arch/xen/include/granttables.h:1.8 Tue Sep 20 00:12:23 2011
+++ src/sys/arch/xen/include/granttables.h Wed Dec 7 15:47:42 2011
@@ -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);
Index: src/sys/arch/xen/include/hypervisor.h
diff -u src/sys/arch/xen/include/hypervisor.h:1.35 src/sys/arch/xen/include/hypervisor.h:1.36
--- src/sys/arch/xen/include/hypervisor.h:1.35 Sat Nov 19 17:13:39 2011
+++ src/sys/arch/xen/include/hypervisor.h Wed Dec 7 15:47:42 2011
@@ -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 @@ struct xen_npx_attach_args {
#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>
Index: src/sys/arch/xen/include/xenbus.h
diff -u src/sys/arch/xen/include/xenbus.h:1.12 src/sys/arch/xen/include/xenbus.h:1.13
--- src/sys/arch/xen/include/xenbus.h:1.12 Tue Sep 20 00:12:24 2011
+++ src/sys/arch/xen/include/xenbus.h Wed Dec 7 15:47:42 2011
@@ -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 {
Index: src/sys/arch/xen/include/amd64/hypercalls.h
diff -u src/sys/arch/xen/include/amd64/hypercalls.h:1.6 src/sys/arch/xen/include/amd64/hypercalls.h:1.7
--- src/sys/arch/xen/include/amd64/hypercalls.h:1.6 Wed Mar 30 22:57:24 2011
+++ src/sys/arch/xen/include/amd64/hypercalls.h Wed Dec 7 15:47:42 2011
@@ -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 @@ HYPERVISOR_dom0_op(
}
#endif /* __XEN_INTERFACE_VERSION__ */
+#include <xen/xen3-public/arch-x86/xen-mca.h>
+
static inline int
HYPERVISOR_machine_check(struct xen_mc *mc)
{
Index: src/sys/arch/xen/include/i386/hypercalls.h
diff -u src/sys/arch/xen/include/i386/hypercalls.h:1.12 src/sys/arch/xen/include/i386/hypercalls.h:1.13
--- src/sys/arch/xen/include/i386/hypercalls.h:1.12 Tue Jun 7 14:53:03 2011
+++ src/sys/arch/xen/include/i386/hypercalls.h Wed Dec 7 15:47:42 2011
@@ -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 @@ HYPERVISOR_get_debugreg(int reg)
return ret;
}
+#include <xen/xen3-public/arch-x86/xen-mca.h>
+
static __inline int
HYPERVISOR_machine_check(struct xen_mc *mc)
{
Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.70 src/sys/arch/xen/x86/cpu.c:1.71
--- src/sys/arch/xen/x86/cpu.c:1.70 Sun Nov 6 15:18:19 2011
+++ src/sys/arch/xen/x86/cpu.c Wed Dec 7 15:47:43 2011
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.70
#endif
#include <xen/xen.h>
-#include <xen/xen3-public/vcpu.h>
+#include <xen/xen-public/vcpu.h>
#include <xen/vcpuvar.h>
#if NLAPIC > 0
Index: src/sys/arch/xen/x86/xen_ipi.c
diff -u src/sys/arch/xen/x86/xen_ipi.c:1.6 src/sys/arch/xen/x86/xen_ipi.c:1.7
--- src/sys/arch/xen/x86/xen_ipi.c:1.6 Mon Nov 7 15:51:31 2011
+++ src/sys/arch/xen/x86/xen_ipi.c Wed Dec 7 15:47:43 2011
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v
#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 @@ xen_ipi_init(void)
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;
Index: src/sys/arch/xen/x86/xen_pmap.c
diff -u src/sys/arch/xen/x86/xen_pmap.c:1.10 src/sys/arch/xen/x86/xen_pmap.c:1.11
--- src/sys/arch/xen/x86/xen_pmap.c:1.10 Wed Nov 23 00:56:56 2011
+++ src/sys/arch/xen/x86/xen_pmap.c Wed Dec 7 15:47:43 2011
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v
#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>
Index: src/sys/arch/xen/xen/clock.c
diff -u src/sys/arch/xen/xen/clock.c:1.57 src/sys/arch/xen/xen/clock.c:1.58
--- src/sys/arch/xen/xen/clock.c:1.57 Fri Nov 18 06:01:50 2011
+++ src/sys/arch/xen/xen/clock.c Wed Dec 7 15:47:43 2011
@@ -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 $ */
/*
*
@@ -29,7 +29,7 @@
#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>
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.
#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>
Index: src/sys/arch/xen/xen/evtchn.c
diff -u src/sys/arch/xen/xen/evtchn.c:1.58 src/sys/arch/xen/xen/evtchn.c:1.59
--- src/sys/arch/xen/xen/evtchn.c:1.58 Wed Dec 7 13:49:04 2011
+++ src/sys/arch/xen/xen/evtchn.c Wed Dec 7 15:47:43 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -54,7 +54,7 @@
#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"
@@ -96,10 +96,10 @@ static kmutex_t evtlock[NR_EVENT_CHANNEL
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];
@@ -149,11 +149,11 @@ 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. */
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.58 src/sys/arch/xen/xen/hypervisor.c:1.59
--- src/sys/arch/xen/xen/hypervisor.c:1.58 Thu Sep 22 23:02:35 2011
+++ src/sys/arch/xen/xen/hypervisor.c Wed Dec 7 15:47:43 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -53,7 +53,7 @@
#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>
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: hypervisor.c
#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>
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.55 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.56
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.55 Sun Dec 4 15:15:41 2011
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Wed Dec 7 15:47:43 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -85,7 +85,7 @@
*/
#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"
@@ -128,7 +128,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_xennet_xe
#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>
@@ -153,8 +153,8 @@ int xennet_debug = 0xff;
#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_RX_RING_SIZE __RING_SIZE((netif_rx_sring_t *)0, PAGE_SIZE)
+#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE)
+#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE)
struct xennet_txreq {
SLIST_ENTRY(xennet_txreq) txreq_next;
Index: src/sys/arch/xen/xen/pciback.c
diff -u src/sys/arch/xen/xen/pciback.c:1.5 src/sys/arch/xen/xen/pciback.c:1.6
--- src/sys/arch/xen/xen/pciback.c:1.5 Mon Oct 19 18:41:11 2009
+++ src/sys/arch/xen/xen/pciback.c Wed Dec 7 15:47:43 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -26,7 +26,7 @@
*/
#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"
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciback.c,v
#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>
Index: src/sys/arch/xen/xen/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.49 src/sys/arch/xen/xen/xbd_xenbus.c:1.50
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.49 Sat Nov 19 22:51:21 2011
+++ src/sys/arch/xen/xen/xbd_xenbus.c Wed Dec 7 15:47:43 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -50,7 +50,7 @@
*/
#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"
@@ -80,8 +80,8 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c
#include <xen/hypervisor.h>
#include <xen/evtchn.h>
#include <xen/granttables.h>
-#include <xen/xen3-public/io/blkif.h>
-#include <xen/xen3-public/io/protocols.h>
+#include <xen/xen-public/io/blkif.h>
+#include <xen/xen-public/io/protocols.h>
#include <xen/xenbus.h>
#include "locators.h"
@@ -95,7 +95,7 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c
#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)
Index: src/sys/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.54 src/sys/arch/xen/xen/xbdback_xenbus.c:1.55
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.54 Sat Dec 3 22:36:28 2011
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Wed Dec 7 15:47:43 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -26,7 +26,7 @@
*/
#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>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: xbdback_xenb
#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
Index: src/sys/arch/xen/xen/xencons.c
diff -u src/sys/arch/xen/xen/xencons.c:1.38 src/sys/arch/xen/xen/xencons.c:1.39
--- src/sys/arch/xen/xen/xencons.c:1.38 Tue Sep 20 00:12:24 2011
+++ src/sys/arch/xen/xen/xencons.c Wed Dec 7 15:47:43 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -53,7 +53,7 @@
#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"
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: xencons.c,v
#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>
Index: src/sys/arch/xen/xen/xpci_xenbus.c
diff -u src/sys/arch/xen/xen/xpci_xenbus.c:1.8 src/sys/arch/xen/xen/xpci_xenbus.c:1.9
--- src/sys/arch/xen/xen/xpci_xenbus.c:1.8 Thu Sep 1 15:10:31 2011
+++ src/sys/arch/xen/xen/xpci_xenbus.c Wed Dec 7 15:47:43 2011
@@ -1,4 +1,4 @@
-/* $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.
@@ -26,7 +26,7 @@
*/
#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"
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.
#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"
