diff options
| -rw-r--r-- | docs/Makefile | 2 | ||||
| -rw-r--r-- | xen/include/public/arch-x86/xen.h | 6 | ||||
| -rw-r--r-- | xen/include/public/xen.h | 11 | ||||
| -rw-r--r-- | xen/include/xen/errno.h | 5 |
4 files changed, 21 insertions, 3 deletions
diff --git a/docs/Makefile b/docs/Makefile index 92ecb20e8f..ace60bacda 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -159,7 +159,7 @@ html/hypercall/stamp: ./xen-headers -O $(@D) \ -T 'arch-x86_64 - Xen public headers' \ -X arch-ia64 -X arch-x86_32 -X xen-x86_32 \ - ../xen include/public + ../xen include/public include/xen/errno.h touch $@ txt/%.txt: %.txt diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 79ec633725..d663cefb14 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -82,7 +82,13 @@ typedef unsigned long xen_pfn_t; typedef unsigned long xen_ulong_t; /* + * ` enum neg_errnoval + * ` HYPERVISOR_set_trap_table(const struct trap_info traps[]); + * ` + */ +/* * Send an array of these to HYPERVISOR_set_trap_table(). + * Terminate the array with a sentinel entry, with traps[].address==0. * The privilege level specifies which modes may enter a trap via a software * interrupt. On x86/64, since rings 1 and 2 are unavailable, we allocate * privilege levels as follows: diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index fde9fa5091..f2c9e6fc97 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -55,6 +55,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t); * HYPERCALLS */ +/* ` enum hypercall_num { // __HYPERVISOR_* => HYPERVISOR_*() */ + #define __HYPERVISOR_set_trap_table 0 #define __HYPERVISOR_mmu_update 1 #define __HYPERVISOR_set_gdt 2 @@ -105,6 +107,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t); #define __HYPERVISOR_arch_6 54 #define __HYPERVISOR_arch_7 55 +/* ` } */ + /* * HYPERCALL COMPATIBILITY. */ @@ -163,8 +167,11 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t); #define NR_VIRQS 24 /* - * HYPERVISOR_mmu_update(reqs, count, pdone, foreigndom) - * + * ` enum neg_errnoval + * ` HYPERVISOR_mmu_update(const struct mmu_update reqs[], + * ` unsigned count, unsigned *done_out, + * ` unsigned foreigndom) + * ` * @reqs is an array of mmu_update_t structures ((ptr, val) pairs). * @count is the length of the above array. * @pdone is an output parameter indicating number of completed operations diff --git a/xen/include/xen/errno.h b/xen/include/xen/errno.h index 7cf599f4de..39147beee1 100644 --- a/xen/include/xen/errno.h +++ b/xen/include/xen/errno.h @@ -1,6 +1,9 @@ #ifndef _I386_ERRNO_H #define _I386_ERRNO_H +/* ` enum neg_errnoval { [ -Efoo for each Efoo in the list below ] } */ +/* ` enum errnoval { */ + #define EPERM 1 /* Operation not permitted */ #define ENOENT 2 /* No such file or directory */ #define ESRCH 3 /* No such process */ @@ -129,4 +132,6 @@ #define ENOMEDIUM 123 /* No medium found */ #define EMEDIUMTYPE 124 /* Wrong medium type */ +/* ` } */ + #endif |