PERFORCE change 132608 for review
Kip Macy
kmacy at FreeBSD.org
Sat Jan 5 18:34:54 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=132608
Change 132608 by kmacy at pandemonium:kmacy:xen31 on 2008/01/06 02:34:00
Move files in sys/i386/include/xen/xen-public to sys/xen/interface as they are
intended to be shared across architectures. Remove hypervisor-ifs.h
Affected files ...
.. //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#8 edit
.. //depot/projects/xen31/sys/dev/xen/blkfront/block.h#4 edit
.. //depot/projects/xen31/sys/dev/xen/console/console.c#6 edit
.. //depot/projects/xen31/sys/dev/xen/console/xencons_ring.c#6 edit
.. //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#5 edit
.. //depot/projects/xen31/sys/i386/i386/genassym.c#5 edit
.. //depot/projects/xen31/sys/i386/i386/machdep.c#11 edit
.. //depot/projects/xen31/sys/i386/include/xen/features.h#2 edit
.. //depot/projects/xen31/sys/i386/include/xen/hypercall.h#6 edit
.. //depot/projects/xen31/sys/i386/include/xen/hypervisor-ifs.h#4 delete
.. //depot/projects/xen31/sys/i386/include/xen/hypervisor.h#5 edit
.. //depot/projects/xen31/sys/i386/include/xen/xen-os.h#5 edit
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/COPYING#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/acm.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/acm_ops.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-ia64.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-powerpc.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86/xen-x86_32.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86/xen-x86_64.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86/xen.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86_32.h#5 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/arch-x86_64.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/callback.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/dom0_ops.h#4 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/domctl.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/elfnote.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/elfstructs.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/event_channel.h#4 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/features.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/Makefile#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/mkchecker.py#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/mkheader.py#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/reference.size#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/foreign/structs.py#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/grant_table.h#5 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/e820.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/hvm_info_table.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/hvm_op.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/ioreq.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/params.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/save.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/hvm/vmx_assist.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/blkif.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/console.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/fbif.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/kbdif.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/netif.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/pciif.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/protocols.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/ring.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/tpmif.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/xenbus.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/xs_wire.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/kexec.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/libelf.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/memory.h#4 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/nmi.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/physdev.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/platform.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/sched.h#4 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/sysctl.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/trace.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/vcpu.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/version.h#3 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/xen-compat.h#4 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/xen.h#6 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/xencomm.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xen-public/xenoprof.h#2 delete
.. //depot/projects/xen31/sys/i386/include/xen/xenbus.h#3 edit
.. //depot/projects/xen31/sys/i386/xen/clock.c#3 edit
.. //depot/projects/xen31/sys/i386/xen/locore.s#7 edit
.. //depot/projects/xen31/sys/i386/xen/pmap.c#13 edit
.. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#13 edit
.. //depot/projects/xen31/sys/xen/evtchn/evtchn.c#6 edit
.. //depot/projects/xen31/sys/xen/gnttab.h#3 edit
.. //depot/projects/xen31/sys/xen/interface/COPYING#1 branch
.. //depot/projects/xen31/sys/xen/interface/acm.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/acm_ops.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/arch-ia64.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/arch-powerpc.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/arch-x86/xen-x86_32.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/arch-x86/xen-x86_64.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/arch-x86/xen.h#1 add
.. //depot/projects/xen31/sys/xen/interface/arch-x86_32.h#1 add
.. //depot/projects/xen31/sys/xen/interface/arch-x86_64.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/callback.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/dom0_ops.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/domctl.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/elfnote.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/elfstructs.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/event_channel.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/features.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/foreign/Makefile#1 branch
.. //depot/projects/xen31/sys/xen/interface/foreign/mkchecker.py#1 branch
.. //depot/projects/xen31/sys/xen/interface/foreign/mkheader.py#1 branch
.. //depot/projects/xen31/sys/xen/interface/foreign/reference.size#1 branch
.. //depot/projects/xen31/sys/xen/interface/foreign/structs.py#1 branch
.. //depot/projects/xen31/sys/xen/interface/grant_table.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/hvm/e820.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/hvm/hvm_info_table.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/hvm/hvm_op.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/hvm/ioreq.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/hvm/params.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/hvm/save.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/hvm/vmx_assist.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/blkif.h#1 add
.. //depot/projects/xen31/sys/xen/interface/io/console.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/fbif.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/kbdif.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/netif.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/pciif.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/protocols.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/ring.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/tpmif.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/xenbus.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/io/xs_wire.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/kexec.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/libelf.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/memory.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/nmi.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/physdev.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/platform.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/sched.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/sysctl.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/trace.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/vcpu.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/version.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/xen-compat.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/xen.h#1 add
.. //depot/projects/xen31/sys/xen/interface/xencomm.h#1 branch
.. //depot/projects/xen31/sys/xen/interface/xenoprof.h#1 branch
Differences ...
==== //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#8 (text+ko) ====
@@ -38,12 +38,11 @@
#include <machine/vmparam.h>
#include <machine/xen/hypervisor.h>
-#include <machine/xen/hypervisor-ifs.h>
#include <machine/xen/xen-os.h>
#include <machine/xen/xen_intr.h>
#include <machine/xen/xenbus.h>
#include <machine/xen/evtchn.h>
-#include <machine/xen/xen-public/grant_table.h>
+#include <xen/interface/grant_table.h>
#include <geom/geom_disk.h>
#include <machine/xen/xenfunc.h>
==== //depot/projects/xen31/sys/dev/xen/blkfront/block.h#4 (text+ko) ====
@@ -1,6 +1,6 @@
#ifndef __XEN_DRIVERS_BLOCK_H__
#define __XEN_DRIVERS_BLOCK_H__
-#include <machine/xen/xen-public/io/blkif.h>
+#include <xen/interface/io/blkif.h>
struct xlbd_type_info
{
==== //depot/projects/xen31/sys/dev/xen/console/console.c#6 (text+ko) ====
@@ -21,7 +21,7 @@
#include <sys/priv.h>
#include <dev/xen/console/xencons_ring.h>
-#include <machine/xen/xen-public/io/console.h>
+#include <xen/interface/io/console.h>
#include "opt_ddb.h"
==== //depot/projects/xen31/sys/dev/xen/console/xencons_ring.c#6 (text+ko) ====
@@ -22,7 +22,7 @@
#include <dev/xen/console/xencons_ring.h>
#include <machine/xen/evtchn.h>
-#include <machine/xen/xen-public/io/console.h>
+#include <xen/interface/io/console.h>
#define console_evtchn console.domU.evtchn
==== //depot/projects/xen31/sys/dev/xen/netfront/netfront.c#5 (text+ko) ====
@@ -58,15 +58,14 @@
#include <machine/xen/xen-os.h>
#include <machine/xen/hypervisor.h>
-#include <machine/xen/hypervisor-ifs.h>
#include <machine/xen/xen_intr.h>
#include <machine/xen/evtchn.h>
#include <machine/xen/xenbus.h>
#include <xen/gnttab.h>
-#include <machine/xen/xen-public/memory.h>
+#include <xen/interface/memory.h>
#include <dev/xen/netfront/mbufq.h>
#include <machine/xen/features.h>
-#include <machine/xen/xen-public/io/netif.h>
+#include <xen/interface/io/netif.h>
#define GRANT_INVALID_REF 0
==== //depot/projects/xen31/sys/i386/i386/genassym.c#5 (text+ko) ====
@@ -233,7 +233,7 @@
#endif
#ifdef XEN
-#include <machine/xen/xen-public/arch-x86_32.h>
+#include <machine/xen/hypervisor.h>
ASSYM(PC_CR3, offsetof(struct pcpu, pc_cr3));
ASSYM(HYPERVISOR_VIRT_START, __HYPERVISOR_VIRT_START);
#endif
==== //depot/projects/xen31/sys/i386/i386/machdep.c#11 (text+ko) ====
@@ -144,9 +144,8 @@
#ifdef XEN
/* XEN includes */
-#include <machine/xen/hypervisor-ifs.h>
+#include <machine/xen/hypervisor.h>
#include <machine/xen/xen-os.h>
-#include <machine/xen/hypervisor.h>
#include <machine/xen/xenvar.h>
#include <machine/xen/xenfunc.h>
#include <machine/xen/xen_intr.h>
==== //depot/projects/xen31/sys/i386/include/xen/features.h#2 (text+ko) ====
@@ -9,7 +9,7 @@
#ifndef __ASM_XEN_FEATURES_H__
#define __ASM_XEN_FEATURES_H__
-#include <machine/xen/xen-public/version.h>
+#include <xen/interface/version.h>
extern void setup_xen_features(void);
==== //depot/projects/xen31/sys/i386/include/xen/hypercall.h#6 (text+ko) ====
@@ -30,8 +30,8 @@
#ifndef __HYPERCALL_H__
#define __HYPERCALL_H__
-#include <machine/xen/xen-public/xen.h>
-#include <machine/xen/xen-public/sched.h>
+#include <xen/interface/xen.h>
+#include <xen/interface/sched.h>
#define _hypercall0(type, name) \
({ \
==== //depot/projects/xen31/sys/i386/include/xen/hypervisor.h#5 (text+ko) ====
@@ -16,11 +16,11 @@
#endif
#include <sys/cdefs.h>
-#include <machine/xen/xen-public/xen.h>
-#include <machine/xen/xen-public/platform.h>
-#include <machine/xen/xen-public/event_channel.h>
-#include <machine/xen/xen-public/physdev.h>
-#include <machine/xen/xen-public/sched.h>
+#include <xen/interface/xen.h>
+#include <xen/interface/platform.h>
+#include <xen/interface/event_channel.h>
+#include <xen/interface/physdev.h>
+#include <xen/interface/sched.h>
#include <machine/xen/hypercall.h>
#if defined(__amd64__)
==== //depot/projects/xen31/sys/i386/include/xen/xen-os.h#5 (text+ko) ====
@@ -70,7 +70,7 @@
/* Everything below this point is not included by assembler (.S) files. */
#ifndef __ASSEMBLY__
#include <sys/types.h>
-#include <machine/xen/xen-public/xen.h>
+#include <machine/xen/hypervisor.h>
void printk(const char *fmt, ...);
==== //depot/projects/xen31/sys/i386/include/xen/xenbus.h#3 (text+ko) ====
@@ -34,8 +34,8 @@
#include <sys/queue.h>
#include <sys/bus.h>
#include <sys/eventhandler.h>
-#include <machine/xen/xen-public/io/xenbus.h>
-#include <machine/xen/xen-public/io/xs_wire.h>
+#include <xen/interface/io/xenbus.h>
+#include <xen/interface/io/xs_wire.h>
LIST_HEAD(xendev_list_head, xenbus_device);
==== //depot/projects/xen31/sys/i386/xen/clock.c#3 (text+ko) ====
@@ -82,10 +82,10 @@
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/pmap.h>
-#include <machine/xen/hypervisor-ifs.h>
+#include <machine/xen/hypervisor.h>
#include <machine/xen/xen-os.h>
#include <machine/xen/xenfunc.h>
-#include <machine/xen/xen-public/vcpu.h>
+#include <xen/interface/vcpu.h>
#include <machine/cpu.h>
/*
==== //depot/projects/xen31/sys/i386/xen/locore.s#7 (text+ko) ====
@@ -55,7 +55,7 @@
#include <machine/specialreg.h>
#define __ASSEMBLY__
-#include <machine/xen/xen-public/elfnote.h>
+#include <xen/interface/elfnote.h>
/* The defines below have been lifted out of <machine/xen-public/arch-x86_32.h> */
#define FLAT_RING1_CS 0xe019 /* GDT index 259 */
==== //depot/projects/xen31/sys/i386/xen/pmap.c#13 (text+ko) ====
@@ -150,7 +150,7 @@
#include <machine/xbox.h>
#endif
-#include <machine/xen/xen-public/xen.h>
+#include <xen/interface/xen.h>
#include <machine/xen/hypervisor.h>
#include <machine/xen/hypercall.h>
#include <machine/xen/xenvar.h>
==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#13 (text+ko) ====
@@ -56,13 +56,13 @@
-#include <machine/xen/xen-public/xen.h>
+#include <machine/xen/hypervisor.h>
#include <machine/xen/xenvar.h>
#include <machine/xen/xenfunc.h>
#include <machine/xen/xenpmap.h>
#include <machine/xen/xenbus.h>
#include <machine/xen/xenfunc.h>
-#include <machine/xen/xen-public/memory.h>
+#include <xen/interface/memory.h>
#include <machine/xen/features.h>
#ifdef SMP
#include <machine/privatespace.h>
==== //depot/projects/xen31/sys/xen/evtchn/evtchn.c#6 (text+ko) ====
@@ -22,8 +22,6 @@
#include <machine/xen/synch_bitops.h>
#include <machine/xen/evtchn.h>
#include <machine/xen/hypervisor.h>
-#include <machine/xen/hypervisor-ifs.h>
-
/* linux helper functions that got sucked in
==== //depot/projects/xen31/sys/xen/gnttab.h#3 (text+ko) ====
@@ -36,8 +36,8 @@
#ifndef __ASM_GNTTAB_H__
-#include <machine/xen/xen-public/xen.h>
-#include <machine/xen/xen-public/grant_table.h>
+#include <machine/xen/hypervisor.h>
+#include <xen/interface/grant_table.h>
#include <machine/xen/xen-os.h>
#include <machine/xen/hypervisor.h>
#include <machine/xen/features.h>
More information about the p4-projects
mailing list