diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-07-19 12:51:09 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-08-20 15:41:01 +0100 |
| commit | f07cb646ff013b631a6efb53bb0e38ea9b2e7c60 (patch) | |
| tree | 29a74304ff3af07ace4853b6bd8e9d220dccd988 /xen/include/public | |
| parent | 6bba043afe0f29ff4f87b839b55b58b15cca1c08 (diff) | |
| download | xen-f07cb646ff013b631a6efb53bb0e38ea9b2e7c60.tar.gz xen-f07cb646ff013b631a6efb53bb0e38ea9b2e7c60.tar.bz2 xen-f07cb646ff013b631a6efb53bb0e38ea9b2e7c60.zip | |
xen: arm: include public/xen.h in foreign interface checking
mkheader.py doesn't cope with
struct foo { };
so add a newline.
Define unsigned long and long to a non-existent type on ARM so as to catch
their use.
Teach mkheader.py to cope with structs which are ifdef'd. This cannot cope
with #defines between the #ifdef and the struct definitions, so move
MAX_GUEST_CMDLINE to be next to its only usage.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'xen/include/public')
| -rw-r--r-- | xen/include/public/arch-arm.h | 8 | ||||
| -rw-r--r-- | xen/include/public/xen.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index e9842b8d4f..5d359afa3e 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -257,14 +257,16 @@ struct vcpu_guest_context { typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); -struct arch_vcpu_info { }; +struct arch_vcpu_info { +}; typedef struct arch_vcpu_info arch_vcpu_info_t; -struct arch_shared_info { }; +struct arch_shared_info { +}; typedef struct arch_shared_info arch_shared_info_t; typedef uint64_t xen_callback_t; -#endif /* ifndef __ASSEMBLY __ */ +#endif /* PSR bits (CPSR, SPSR)*/ diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 2414e7e3ca..037540df45 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -717,7 +717,6 @@ typedef struct shared_info shared_info_t; * pages preceding pt_base and mark them as reserved/unused. */ #ifdef XEN_HAVE_PV_GUEST_ENTRY -#define MAX_GUEST_CMDLINE 1024 struct start_info { /* THE FOLLOWING ARE FILLED IN BOTH ON INITIAL BOOT AND ON RESUME. */ char magic[32]; /* "xen-<version>-<platform>". */ @@ -744,6 +743,7 @@ struct start_info { /* (PFN of pre-loaded module if */ /* SIF_MOD_START_PFN set in flags). */ unsigned long mod_len; /* Size (bytes) of pre-loaded module. */ +#define MAX_GUEST_CMDLINE 1024 int8_t cmd_line[MAX_GUEST_CMDLINE]; /* The pfn range here covers both page table and p->m table frames. */ unsigned long first_p2m_pfn;/* 1st pfn forming initial P->M table. */ |