Module Name: src
Committed By: cherry
Date: Sat Feb 2 12:32:55 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: genassym.cf locore.S
src/sys/arch/amd64/conf: std.xen
src/sys/arch/i386/i386: genassym.cf
src/sys/arch/x86/include: cpu.h
src/sys/arch/x86/x86: cpu_ucode.c pmap.c
src/sys/arch/xen/conf: Makefile.xen std.xen
src/sys/arch/xen/include: granttables.h hypervisor.h intr.h xen.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 hypervisor.c if_xennet_xenbus.c pciback.c
xbd_xenbus.c xbdback_xenbus.c xen_machdep.c xencons.c xpci_xenbus.c
Added Files:
src/sys/arch/xen/include: xenring.h
Log Message:
Switch NetBSD/xen to use XEN api tag RELEASE-4.11.1
The headers for this api are in sys/external/mit/xen-include-public/dist/
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.174 -r1.175 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/conf/std.xen
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x86/x86/cpu_ucode.c
cvs rdiff -u -r1.319 -r1.320 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/xen/conf/Makefile.xen
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/xen/conf/std.xen
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/xen/include/granttables.h
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/xen/include/hypervisor.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/xen/include/intr.h
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/include/xen.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/xen/include/xenbus.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/xen/include/xenring.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/xen/include/amd64/hypercalls.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/xen/include/i386/hypercalls.h
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/xen/x86/cpu.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/xen/x86/xen_ipi.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/xen/x86/xen_pmap.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/xen/xen/clock.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/xen/xen/pciback.c
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/xen/xen/xbdback_xenbus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/xen/xen/xen_machdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/xen/xen/xencons.c
cvs rdiff -u -r1.21 -r1.22 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.71 src/sys/arch/amd64/amd64/genassym.cf:1.72
--- src/sys/arch/amd64/amd64/genassym.cf:1.71 Tue Dec 25 06:50:11 2018
+++ src/sys/arch/amd64/amd64/genassym.cf Sat Feb 2 12:32:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.71 2018/12/25 06:50:11 cherry Exp $
+# $NetBSD: genassym.cf,v 1.72 2019/02/02 12:32:54 cherry Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@ include <machine/i82093var.h>
endif
ifdef XEN
-include <xen/xen-public/xen.h>
+include <xen/include/public/xen.h>
endif
include <sys/bus.h>
Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.174 src/sys/arch/amd64/amd64/locore.S:1.175
--- src/sys/arch/amd64/amd64/locore.S:1.174 Sun Aug 12 15:31:01 2018
+++ src/sys/arch/amd64/amd64/locore.S Sat Feb 2 12:32:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.174 2018/08/12 15:31:01 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.175 2019/02/02 12:32:54 cherry Exp $ */
/*
* Copyright-o-rama!
@@ -276,8 +276,8 @@
#ifdef XEN
#define __ASSEMBLY__
-#include <xen/xen-public/elfnote.h>
-#include <xen/xen-public/xen.h>
+#include <xen/include/public/elfnote.h>
+#include <xen/include/public/xen.h>
#define ELFNOTE(name, type, desctype, descdata...) \
.pushsection .note.name ; \
.align 4 ; \
Index: src/sys/arch/amd64/conf/std.xen
diff -u src/sys/arch/amd64/conf/std.xen:1.9 src/sys/arch/amd64/conf/std.xen:1.10
--- src/sys/arch/amd64/conf/std.xen:1.9 Thu Jan 12 05:24:36 2017
+++ src/sys/arch/amd64/conf/std.xen Sat Feb 2 12:32:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: std.xen,v 1.9 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: std.xen,v 1.10 2019/02/02 12:32:54 cherry Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp
#
# standard, required NetBSD/i386 'options'
@@ -7,6 +7,7 @@ machine xen amd64
include "conf/std" # MI standard options
options XEN #Xen support
+options __XEN_INTERFACE_VERSION__=0x00030201 # Xen 3.1 interface
#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface
options CPU_IN_CKSUM
Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.108 src/sys/arch/i386/i386/genassym.cf:1.109
--- src/sys/arch/i386/i386/genassym.cf:1.108 Tue Dec 25 06:50:11 2018
+++ src/sys/arch/i386/i386/genassym.cf Sat Feb 2 12:32:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.108 2018/12/25 06:50:11 cherry Exp $
+# $NetBSD: genassym.cf,v 1.109 2019/02/02 12:32:54 cherry Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@ include <machine/types.h>
include <machine/segments.h>
ifdef XEN
-include <xen/xen-public/sched.h>
+include <xen/include/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.101 src/sys/arch/x86/include/cpu.h:1.102
--- src/sys/arch/x86/include/cpu.h:1.101 Tue Dec 25 06:50:11 2018
+++ src/sys/arch/x86/include/cpu.h Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.101 2018/12/25 06:50:11 cherry Exp $ */
+/* $NetBSD: cpu.h,v 1.102 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -69,8 +69,8 @@
#include <sys/device_if.h> /* for device_t */
#ifdef XEN
-#include <xen/xen-public/xen.h>
-#include <xen/xen-public/event_channel.h>
+#include <xen/include/public/xen.h>
+#include <xen/include/public/event_channel.h>
#include <sys/mutex.h>
#endif /* XEN */
Index: src/sys/arch/x86/x86/cpu_ucode.c
diff -u src/sys/arch/x86/x86/cpu_ucode.c:1.10 src/sys/arch/x86/x86/cpu_ucode.c:1.11
--- src/sys/arch/x86/x86/cpu_ucode.c:1.10 Sun Jan 27 02:08:39 2019
+++ src/sys/arch/x86/x86/cpu_ucode.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode.c,v 1.10 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: cpu_ucode.c,v 1.11 2019/02/02 12:32:55 cherry 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.c,v 1.10 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode.c,v 1.11 2019/02/02 12:32:55 cherry Exp $");
#if defined(_KERNEL_OPT)
#include "opt_cpu_ucode.h"
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_ucode.c,
#include <x86/cpu_ucode.h>
#ifdef XEN
-#include <xen/xen-public/xen.h>
+#include <xen/include/public/xen.h>
#include <xen/hypervisor.h>
#endif
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.319 src/sys/arch/x86/x86/pmap.c:1.320
--- src/sys/arch/x86/x86/pmap.c:1.319 Fri Feb 1 11:35:13 2019
+++ src/sys/arch/x86/x86/pmap.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.319 2019/02/01 11:35:13 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.320 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.319 2019/02/01 11:35:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.320 2019/02/02 12:32:55 cherry Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -171,7 +171,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.3
#include <x86/i82489var.h>
#ifdef XEN
-#include <xen/xen-public/xen.h>
+#include <xen/include/public/xen.h>
#include <xen/hypervisor.h>
#endif
Index: src/sys/arch/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.47 src/sys/arch/xen/conf/Makefile.xen:1.48
--- src/sys/arch/xen/conf/Makefile.xen:1.47 Sat Sep 22 12:24:04 2018
+++ src/sys/arch/xen/conf/Makefile.xen Sat Feb 2 12:32:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xen,v 1.47 2018/09/22 12:24:04 rin Exp $
+# $NetBSD: Makefile.xen,v 1.48 2019/02/02 12:32:54 cherry Exp $
# NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp
# Makefile for NetBSD
@@ -42,7 +42,7 @@ ARCH_INC= $S/arch/xen/include/${XEN_BUIL
##
CPPFLAGS+= -D${XEN_BUILD}
AFLAGS+= -x assembler-with-cpp ${DBG} -D__XEN__
-EXTRA_INCLUDES= -I${.CURDIR}/xen-ma
+EXTRA_INCLUDES= -I${.CURDIR}/xen-ma -I$S/external/mit/xen-include-public/dist/
.if ${XEN_BUILD} == "amd64"
DEFCOPTS= -O2 -fno-omit-frame-pointer
Index: src/sys/arch/xen/conf/std.xen
diff -u src/sys/arch/xen/conf/std.xen:1.8 src/sys/arch/xen/conf/std.xen:1.9
--- src/sys/arch/xen/conf/std.xen:1.8 Fri Sep 23 22:07:12 2016
+++ src/sys/arch/xen/conf/std.xen Sat Feb 2 12:32:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: std.xen,v 1.8 2016/09/23 22:07:12 joerg Exp $
+# $NetBSD: std.xen,v 1.9 2019/02/02 12:32:54 cherry Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp
#
# standard, required NetBSD/i386 'options'
@@ -6,6 +6,8 @@
machine xen i386
include "conf/std" # MI standard options
+options __XEN_INTERFACE_VERSION__=0x00030201 # Xen 3.1 interface
+
options EXEC_AOUT # exec a.out binaries
options EXEC_ELF32 # exec ELF binaries
options EXEC_SCRIPT # exec #! scripts
Index: src/sys/arch/xen/include/granttables.h
diff -u src/sys/arch/xen/include/granttables.h:1.9 src/sys/arch/xen/include/granttables.h:1.10
--- src/sys/arch/xen/include/granttables.h:1.9 Wed Dec 7 15:47:42 2011
+++ src/sys/arch/xen/include/granttables.h Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: granttables.h,v 1.9 2011/12/07 15:47:42 cegger Exp $ */
+/* $NetBSD: granttables.h,v 1.10 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
*
@@ -25,8 +25,8 @@
*/
/* Interface to the Xen Grant tables */
-#include <xen/xen-public/xen.h>
-#include <xen/xen-public/grant_table.h>
+#include <xen/include/public/xen.h>
+#include <xen/include/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.46 src/sys/arch/xen/include/hypervisor.h:1.47
--- src/sys/arch/xen/include/hypervisor.h:1.46 Fri Oct 26 05:33:21 2018
+++ src/sys/arch/xen/include/hypervisor.h Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.h,v 1.46 2018/10/26 05:33:21 cherry Exp $ */
+/* $NetBSD: hypervisor.h,v 1.47 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -80,17 +80,19 @@ struct xen_npx_attach_args {
#define s32 int32_t
#define s64 int64_t
-#include <xen/xen-public/xen.h>
-#include <xen/xen-public/sched.h>
-#include <xen/xen-public/platform.h>
+#include <external/bsd/common/include/asm/barrier.h> /* Linux mb() and friends */
+
+#include <xen/include/public/xen.h>
+#include <xen/include/public/sched.h>
+#include <xen/include/public/platform.h>
#if __XEN_INTERFACE_VERSION__ < 0x00030204
-#include <xen/xen-public/dom0_ops.h>
+#include <xen/include/public/dom0_ops.h>
#endif
-#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 <xen/include/public/event_channel.h>
+#include <xen/include/public/physdev.h>
+#include <xen/include/public/memory.h>
+#include <xen/include/public/io/netif.h>
+#include <xen/include/public/io/blkif.h>
#include <machine/hypercalls.h>
Index: src/sys/arch/xen/include/intr.h
diff -u src/sys/arch/xen/include/intr.h:1.51 src/sys/arch/xen/include/intr.h:1.52
--- src/sys/arch/xen/include/intr.h:1.51 Tue Dec 25 06:50:12 2018
+++ src/sys/arch/xen/include/intr.h Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.51 2018/12/25 06:50:12 cherry Exp $ */
+/* $NetBSD: intr.h,v 1.52 2019/02/02 12:32:55 cherry Exp $ */
/* NetBSD intr.h,v 1.15 2004/10/31 10:39:34 yamt Exp */
/*-
@@ -36,7 +36,8 @@
#include <machine/intrdefs.h>
#ifndef _LOCORE
-#include <xen/xen-public/xen.h>
+#include <xen/include/public/xen.h>
+#include <xen/include/public/event_channel.h>
#include <x86/intr.h>
#include <xen/xen.h>
#include <xen/hypervisor.h>
Index: src/sys/arch/xen/include/xen.h
diff -u src/sys/arch/xen/include/xen.h:1.41 src/sys/arch/xen/include/xen.h:1.42
--- src/sys/arch/xen/include/xen.h:1.41 Wed Oct 10 04:16:58 2018
+++ src/sys/arch/xen/include/xen.h Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xen.h,v 1.41 2018/10/10 04:16:58 cherry Exp $ */
+/* $NetBSD: xen.h,v 1.42 2019/02/02 12:32:55 cherry Exp $ */
/*
*
@@ -341,7 +341,7 @@ xen_atomic_clear_bit(volatile void *ptr,
void wbinvd(void);
-#include <xen/xen-public/features.h>
+#include <xen/include/public/features.h>
#include <sys/systm.h>
extern bool xen_feature_tables[];
Index: src/sys/arch/xen/include/xenbus.h
diff -u src/sys/arch/xen/include/xenbus.h:1.13 src/sys/arch/xen/include/xenbus.h:1.14
--- src/sys/arch/xen/include/xenbus.h:1.13 Wed Dec 7 15:47:42 2011
+++ src/sys/arch/xen/include/xenbus.h Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus.h,v 1.13 2011/12/07 15:47:42 cegger Exp $ */
+/* $NetBSD: xenbus.h,v 1.14 2019/02/02 12:32:55 cherry Exp $ */
/******************************************************************************
* xenbus.h
*
@@ -34,10 +34,10 @@
#include <sys/device.h>
#include <sys/queue.h>
-#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 */
+#include <xen/include/public/xen.h>
+#include <xen/include/public/io/xenbus.h>
+#include <xen/include/public/io/xs_wire.h>
+#include <xen/include/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.10 src/sys/arch/xen/include/amd64/hypercalls.h:1.11
--- src/sys/arch/xen/include/amd64/hypercalls.h:1.10 Thu Jan 24 04:16:16 2019
+++ src/sys/arch/xen/include/amd64/hypercalls.h Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hypercalls.h,v 1.10 2019/01/24 04:16:16 cherry Exp $ */
+/* $NetBSD: hypercalls.h,v 1.11 2019/02/02 12:32:55 cherry Exp $ */
/******************************************************************************
* hypercall.h
*
@@ -404,7 +404,7 @@ HYPERVISOR_dom0_op(
}
#endif /* __XEN_INTERFACE_VERSION__ */
-#include <xen/xen-public/arch-x86/xen-mca.h>
+#include <xen/include/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.17 src/sys/arch/xen/include/i386/hypercalls.h:1.18
--- src/sys/arch/xen/include/i386/hypercalls.h:1.17 Thu Jan 24 04:16:16 2019
+++ src/sys/arch/xen/include/i386/hypercalls.h Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hypercalls.h,v 1.17 2019/01/24 04:16:16 cherry Exp $ */
+/* $NetBSD: hypercalls.h,v 1.18 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -163,7 +163,7 @@ HYPERVISOR_get_debugreg(int reg)
return ret;
}
-#include <xen/xen-public/arch-x86/xen-mca.h>
+#include <xen/include/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.127 src/sys/arch/xen/x86/cpu.c:1.128
--- src/sys/arch/xen/x86/cpu.c:1.127 Mon Sep 3 16:29:29 2018
+++ src/sys/arch/xen/x86/cpu.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.127 2018/09/03 16:29:29 riastradh Exp $ */
+/* $NetBSD: cpu.c,v 1.128 2019/02/02 12:32:55 cherry Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.127 2018/09/03 16:29:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.128 2019/02/02 12:32:55 cherry Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -105,7 +105,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.12
#include <x86/fpu.h>
#include <xen/xen.h>
-#include <xen/xen-public/vcpu.h>
+#include <xen/include/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.31 src/sys/arch/xen/x86/xen_ipi.c:1.32
--- src/sys/arch/xen/x86/xen_ipi.c:1.31 Sun Jan 27 05:08:58 2019
+++ src/sys/arch/xen/x86/xen_ipi.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.31 2019/01/27 05:08:58 dholland Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.32 2019/02/02 12:32:55 cherry 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.31 2019/01/27 05:08:58 dholland Exp $");
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.32 2019/02/02 12:32:55 cherry Exp $");
*/
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.31 2019/01/27 05:08:58 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.32 2019/02/02 12:32:55 cherry Exp $");
#include "opt_ddb.h"
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v
#include <xen/intr.h>
#include <xen/intrdefs.h>
#include <xen/hypervisor.h>
-#include <xen/xen-public/vcpu.h>
+#include <xen/include/public/vcpu.h>
#ifdef DDB
extern void ddb_ipi(struct trapframe);
Index: src/sys/arch/xen/x86/xen_pmap.c
diff -u src/sys/arch/xen/x86/xen_pmap.c:1.27 src/sys/arch/xen/x86/xen_pmap.c:1.28
--- src/sys/arch/xen/x86/xen_pmap.c:1.27 Thu Jul 26 17:20:09 2018
+++ src/sys/arch/xen/x86/xen_pmap.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_pmap.c,v 1.27 2018/07/26 17:20:09 maxv Exp $ */
+/* $NetBSD: xen_pmap.c,v 1.28 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.27 2018/07/26 17:20:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.28 2019/02/02 12:32:55 cherry Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -132,7 +132,7 @@ __KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v
#include <x86/i82489reg.h>
#include <x86/i82489var.h>
-#include <xen/xen-public/xen.h>
+#include <xen/include/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.76 src/sys/arch/xen/xen/clock.c:1.77
--- src/sys/arch/xen/xen/clock.c:1.76 Tue Dec 25 06:50:12 2018
+++ src/sys/arch/xen/xen/clock.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.76 2018/12/25 06:50:12 cherry Exp $ */
+/* $NetBSD: clock.c,v 1.77 2019/02/02 12:32:55 cherry Exp $ */
/*-
* Copyright (c) 2017, 2018 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.76 2018/12/25 06:50:12 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.77 2019/02/02 12:32:55 cherry Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.
#include <xen/evtchn.h>
#include <xen/hypervisor.h>
-#include <xen/xen-public/vcpu.h>
+#include <xen/include/public/vcpu.h>
#include <xen/xen.h>
#include <x86/rtc.h>
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.69 src/sys/arch/xen/xen/hypervisor.c:1.70
--- src/sys/arch/xen/xen/hypervisor.c:1.69 Mon Jul 11 11:31:50 2016
+++ src/sys/arch/xen/xen/hypervisor.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.69 2016/07/11 11:31:50 msaitoh Exp $ */
+/* $NetBSD: hypervisor.c,v 1.70 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.69 2016/07/11 11:31:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.70 2019/02/02 12:32:55 cherry Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: hypervisor.c
#include <xen/xen.h>
#include <xen/hypervisor.h>
#include <xen/evtchn.h>
-#include <xen/xen-public/version.h>
+#include <xen/include/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.82 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.83
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.82 Mon Dec 24 14:55:42 2018
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.82 2018/12/24 14:55:42 cherry Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.83 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.82 2018/12/24 14:55:42 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.83 2019/02/02 12:32:55 cherry Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -123,7 +123,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_xennet_xe
#include <xen/hypervisor.h>
#include <xen/evtchn.h>
#include <xen/granttables.h>
-#include <xen/xen-public/io/netif.h>
+#include <xen/include/public/io/netif.h>
#include <xen/xenpmap.h>
#include <xen/xenbus.h>
Index: src/sys/arch/xen/xen/pciback.c
diff -u src/sys/arch/xen/xen/pciback.c:1.18 src/sys/arch/xen/xen/pciback.c:1.19
--- src/sys/arch/xen/xen/pciback.c:1.18 Mon Dec 24 14:55:42 2018
+++ src/sys/arch/xen/xen/pciback.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pciback.c,v 1.18 2018/12/24 14:55:42 cherry Exp $ */
+/* $NetBSD: pciback.c,v 1.19 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2009 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciback.c,v 1.18 2018/12/24 14:55:42 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciback.c,v 1.19 2019/02/02 12:32:55 cherry Exp $");
#include "opt_xen.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/xen-public/io/pciif.h>
+#include <xen/include/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.91 src/sys/arch/xen/xen/xbd_xenbus.c:1.92
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.91 Mon Dec 24 14:55:42 2018
+++ src/sys/arch/xen/xen/xbd_xenbus.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd_xenbus.c,v 1.91 2018/12/24 14:55:42 cherry Exp $ */
+/* $NetBSD: xbd_xenbus.c,v 1.92 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.91 2018/12/24 14:55:42 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.92 2019/02/02 12:32:55 cherry Exp $");
#include "opt_xen.h"
@@ -76,8 +76,8 @@ __KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c
#include <xen/hypervisor.h>
#include <xen/evtchn.h>
#include <xen/granttables.h>
-#include <xen/xen-public/io/blkif.h>
-#include <xen/xen-public/io/protocols.h>
+#include <xen/include/public/io/blkif.h>
+#include <xen/include/public/io/protocols.h>
#include <xen/xenbus.h>
#include "locators.h"
Index: src/sys/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.70 src/sys/arch/xen/xen/xbdback_xenbus.c:1.71
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.70 Mon Dec 24 14:55:42 2018
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.70 2018/12/24 14:55:42 cherry Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.71 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.70 2018/12/24 14:55:42 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.71 2019/02/02 12:32:55 cherry Exp $");
#include <sys/atomic.h>
#include <sys/buf.h>
@@ -52,7 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: xbdback_xenb
#include <xen/xen_shm.h>
#include <xen/evtchn.h>
#include <xen/xenbus.h>
-#include <xen/xen-public/io/protocols.h>
+#include <xen/xenring.h>
+#include <xen/include/public/io/protocols.h>
/* #define XENDEBUG_VBD */
#ifdef XENDEBUG_VBD
Index: src/sys/arch/xen/xen/xen_machdep.c
diff -u src/sys/arch/xen/xen/xen_machdep.c:1.19 src/sys/arch/xen/xen/xen_machdep.c:1.20
--- src/sys/arch/xen/xen/xen_machdep.c:1.19 Thu Jul 26 15:38:26 2018
+++ src/sys/arch/xen/xen/xen_machdep.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_machdep.c,v 1.19 2018/07/26 15:38:26 maxv Exp $ */
+/* $NetBSD: xen_machdep.c,v 1.20 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.19 2018/07/26 15:38:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.20 2019/02/02 12:32:55 cherry Exp $");
#include "opt_xen.h"
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: xen_machdep.
#include <xen/hypervisor.h>
#include <xen/shutdown_xenbus.h>
-#include <xen/xen-public/version.h>
+#include <xen/include/public/version.h>
#define DPRINTK(x) printk x
#if 0
Index: src/sys/arch/xen/xen/xencons.c
diff -u src/sys/arch/xen/xen/xencons.c:1.47 src/sys/arch/xen/xen/xencons.c:1.48
--- src/sys/arch/xen/xen/xencons.c:1.47 Mon Dec 24 14:55:42 2018
+++ src/sys/arch/xen/xen/xencons.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xencons.c,v 1.47 2018/12/24 14:55:42 cherry Exp $ */
+/* $NetBSD: xencons.c,v 1.48 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.47 2018/12/24 14:55:42 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.48 2019/02/02 12:32:55 cherry 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/xen-public/io/console.h>
+#include <xen/include/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.21 src/sys/arch/xen/xen/xpci_xenbus.c:1.22
--- src/sys/arch/xen/xen/xpci_xenbus.c:1.21 Mon Dec 24 14:55:42 2018
+++ src/sys/arch/xen/xen/xpci_xenbus.c Sat Feb 2 12:32:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xpci_xenbus.c,v 1.21 2018/12/24 14:55:42 cherry Exp $ */
+/* $NetBSD: xpci_xenbus.c,v 1.22 2019/02/02 12:32:55 cherry Exp $ */
/*
* Copyright (c) 2009 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.21 2018/12/24 14:55:42 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.22 2019/02/02 12:32:55 cherry Exp $");
#include "opt_xen.h"
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.
#include <xen/hypervisor.h>
#include <xen/evtchn.h>
#include <xen/granttables.h>
-#include <xen/xen-public/io/pciif.h>
+#include <xen/include/public/io/pciif.h>
#include <xen/xenbus.h>
#include "locators.h"
Added files:
Index: src/sys/arch/xen/include/xenring.h
diff -u /dev/null src/sys/arch/xen/include/xenring.h:1.1
--- /dev/null Sat Feb 2 12:32:56 2019
+++ src/sys/arch/xen/include/xenring.h Sat Feb 2 12:32:55 2019
@@ -0,0 +1,34 @@
+/* $NetBSD: xenring.h,v 1.1 2019/02/02 12:32:55 cherry Exp $ */
+
+/*
+ * Glue goop for xbd ring request/response protocol structures.
+ *
+ * These are used only from __XEN_INTERFACE_VERSION__ >= 0x00030201
+ * prior to which they were part of the public XEN api.
+ */
+
+#ifndef _XEN_RING_H
+#define _XEN_RING_H
+
+#if __XEN_INTERFACE_VERSION__ >= 0x00030201
+
+#include <xen/include/public/io/ring.h>
+
+DEFINE_RING_TYPES(blkif_x86_32, struct blkif_request, struct blkif_response);
+DEFINE_RING_TYPES(blkif_x86_64, struct blkif_request, struct blkif_response);
+
+typedef struct blkif_request blkif_x86_64_request_t;
+typedef struct blkif_response blkif_x86_64_response_t;
+typedef struct blkif_request blkif_x86_32_request_t;
+typedef struct blkif_response blkif_x86_32_response_t;
+
+
+union blkif_back_ring_proto {
+ blkif_back_ring_t ring_n; /* native/common members */
+ blkif_x86_32_back_ring_t ring_32;
+ blkif_x86_64_back_ring_t ring_64;
+};
+typedef union blkif_back_ring_proto blkif_back_ring_proto_t;
+
+#endif /* __XEN_INTERFACE_VERSION__ >= 0x00030201 */
+#endif /* _XEN_RING_H_ */
