Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Switch NetBSD/xen to use XEN api tag RELEASE-4.11.1
details: https://anonhg.NetBSD.org/src/rev/357bdc862e41
branches: trunk
changeset: 448423:357bdc862e41
user: cherry <cherry%NetBSD.org@localhost>
date: Sat Feb 02 12:32:54 2019 +0000
description:
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/
diffstat:
sys/arch/amd64/amd64/genassym.cf | 4 +-
sys/arch/amd64/amd64/locore.S | 6 ++--
sys/arch/amd64/conf/std.xen | 3 +-
sys/arch/i386/i386/genassym.cf | 4 +-
sys/arch/x86/include/cpu.h | 6 ++--
sys/arch/x86/x86/cpu_ucode.c | 6 ++--
sys/arch/x86/x86/pmap.c | 6 ++--
sys/arch/xen/conf/Makefile.xen | 4 +-
sys/arch/xen/conf/std.xen | 4 ++-
sys/arch/xen/include/amd64/hypercalls.h | 4 +-
sys/arch/xen/include/granttables.h | 6 ++--
sys/arch/xen/include/hypervisor.h | 22 +++++++++++---------
sys/arch/xen/include/i386/hypercalls.h | 4 +-
sys/arch/xen/include/intr.h | 5 ++-
sys/arch/xen/include/xen.h | 4 +-
sys/arch/xen/include/xenbus.h | 10 ++++----
sys/arch/xen/include/xenring.h | 34 +++++++++++++++++++++++++++++++++
sys/arch/xen/x86/cpu.c | 6 ++--
sys/arch/xen/x86/xen_ipi.c | 8 +++---
sys/arch/xen/x86/xen_pmap.c | 6 ++--
sys/arch/xen/xen/clock.c | 6 ++--
sys/arch/xen/xen/hypervisor.c | 6 ++--
sys/arch/xen/xen/if_xennet_xenbus.c | 6 ++--
sys/arch/xen/xen/pciback.c | 6 ++--
sys/arch/xen/xen/xbd_xenbus.c | 8 +++---
sys/arch/xen/xen/xbdback_xenbus.c | 7 +++--
sys/arch/xen/xen/xen_machdep.c | 6 ++--
sys/arch/xen/xen/xencons.c | 6 ++--
sys/arch/xen/xen/xpci_xenbus.c | 6 ++--
29 files changed, 125 insertions(+), 84 deletions(-)
diffs (truncated from 707 to 300 lines):
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/amd64/amd64/genassym.cf
--- a/sys/arch/amd64/amd64/genassym.cf Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/amd64/amd64/genassym.cf Sat Feb 02 12:32:54 2019 +0000
@@ -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 @@
endif
ifdef XEN
-include <xen/xen-public/xen.h>
+include <xen/include/public/xen.h>
endif
include <sys/bus.h>
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/amd64/amd64/locore.S
--- a/sys/arch/amd64/amd64/locore.S Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/amd64/amd64/locore.S Sat Feb 02 12:32:54 2019 +0000
@@ -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 ; \
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/amd64/conf/std.xen
--- a/sys/arch/amd64/conf/std.xen Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/amd64/conf/std.xen Sat Feb 02 12:32:54 2019 +0000
@@ -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 @@
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
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/i386/i386/genassym.cf
--- a/sys/arch/i386/i386/genassym.cf Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/i386/i386/genassym.cf Sat Feb 02 12:32:54 2019 +0000
@@ -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/segments.h>
ifdef XEN
-include <xen/xen-public/sched.h>
+include <xen/include/public/sched.h>
endif
if defined(_KERNEL) && defined(_KERNEL_OPT)
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/x86/include/cpu.h
--- a/sys/arch/x86/include/cpu.h Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/x86/include/cpu.h Sat Feb 02 12:32:54 2019 +0000
@@ -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 */
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/x86/x86/cpu_ucode.c
--- a/sys/arch/x86/x86/cpu_ucode.c Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/x86/x86/cpu_ucode.c Sat Feb 02 12:32:54 2019 +0000
@@ -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 @@
#include <x86/cpu_ucode.h>
#ifdef XEN
-#include <xen/xen-public/xen.h>
+#include <xen/include/public/xen.h>
#include <xen/hypervisor.h>
#endif
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/x86/x86/pmap.c Sat Feb 02 12:32:54 2019 +0000
@@ -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 @@
#include <x86/i82489var.h>
#ifdef XEN
-#include <xen/xen-public/xen.h>
+#include <xen/include/public/xen.h>
#include <xen/hypervisor.h>
#endif
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/xen/conf/Makefile.xen
--- a/sys/arch/xen/conf/Makefile.xen Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/xen/conf/Makefile.xen Sat Feb 02 12:32:54 2019 +0000
@@ -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 @@
##
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
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/xen/conf/std.xen
--- a/sys/arch/xen/conf/std.xen Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/xen/conf/std.xen Sat Feb 02 12:32:54 2019 +0000
@@ -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
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/xen/include/amd64/hypercalls.h
--- a/sys/arch/xen/include/amd64/hypercalls.h Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/xen/include/amd64/hypercalls.h Sat Feb 02 12:32:54 2019 +0000
@@ -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 @@
}
#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)
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/xen/include/granttables.h
--- a/sys/arch/xen/include/granttables.h Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/xen/include/granttables.h Sat Feb 02 12:32:54 2019 +0000
@@ -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);
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/xen/include/hypervisor.h
--- a/sys/arch/xen/include/hypervisor.h Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/xen/include/hypervisor.h Sat Feb 02 12:32:54 2019 +0000
@@ -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 @@
#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>
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/xen/include/i386/hypercalls.h
--- a/sys/arch/xen/include/i386/hypercalls.h Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/xen/include/i386/hypercalls.h Sat Feb 02 12:32:54 2019 +0000
@@ -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 @@
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)
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/xen/include/intr.h
--- a/sys/arch/xen/include/intr.h Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/xen/include/intr.h Sat Feb 02 12:32:54 2019 +0000
@@ -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>
diff -r 9fd7a927981b -r 357bdc862e41 sys/arch/xen/include/xen.h
--- a/sys/arch/xen/include/xen.h Sat Feb 02 12:12:04 2019 +0000
+++ b/sys/arch/xen/include/xen.h Sat Feb 02 12:32:54 2019 +0000
@@ -1,4 +1,4 @@
Home |
Main Index |
Thread Index |
Old Index