Xen project Mailing List

[Xen-devel] [patch 1/5] arch-x86_32/64.h: separate typedef from structure definition

From: Chris Wright <chrisw@xxxxxxxxxxxx>

Date: Fri, 19 May 2006 00:00:01 -0700

Cc: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

Delivery-date: Fri, 19 May 2006 02:55:51 -0700

List-id: Xen developer discussion <xen-devel.lists.xensource.com>

This makes sharing the file with Linux easier, as the typedefs won't be accepted. Signed-off-by: Chris Wright <chrisw@xxxxxxxxxxxx> --- xen/include/public/arch-x86_32.h | 32 +++++++++++++++++++------------- xen/include/public/arch-x86_64.h | 27 ++++++++++++++++----------- 2 files changed, 35 insertions(+), 24 deletions(-) --- xen-unstable.orig/xen/include/public/arch-x86_32.h +++ xen-unstable/xen/include/public/arch-x86_32.h @@ -95,15 +95,16 @@ DEFINE_XEN_GUEST_HANDLE(void); #define TI_GET_IF(_ti) ((_ti)->flags & 4) #define TI_SET_DPL(_ti,_dpl) ((_ti)->flags |= (_dpl)) #define TI_SET_IF(_ti,_if) ((_ti)->flags |= ((!!(_if))<<2)) -typedef struct trap_info { +struct trap_info { uint8_t vector; /* exception vector */ uint8_t flags; /* 0-3: privilege level; 4: clear event enable? */ uint16_t cs; /* code selector */ unsigned long address; /* code offset */ -} trap_info_t; +}; +typedef struct trap_info trap_info_t; DEFINE_XEN_GUEST_HANDLE(trap_info_t); -typedef struct cpu_user_regs { +struct cpu_user_regs { uint32_t ebx; uint32_t ecx; uint32_t edx; @@ -124,7 +125,8 @@ typedef struct cpu_user_regs { uint16_t ds, _pad3; uint16_t fs, _pad4; uint16_t gs, _pad5; -} cpu_user_regs_t; +}; +typedef struct cpu_user_regs cpu_user_regs_t; DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */ @@ -133,14 +135,14 @@ typedef uint64_t tsc_timestamp_t; /* RDT * The following is all CPU context. Note that the fpu_ctxt block is filled * in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used. */ -typedef struct vcpu_guest_context { +struct vcpu_guest_context { /* FPU registers come first so they can be aligned for FXSAVE/FXRSTOR. */ struct { char x[512]; } fpu_ctxt; /* User-level FPU registers */ #define VGCF_I387_VALID (1<<0) #define VGCF_HVM_GUEST (1<<1) #define VGCF_IN_KERNEL (1<<2) unsigned long flags; /* VGCF_* flags */ - cpu_user_regs_t user_regs; /* User-level CPU registers */ + struct cpu_user_regs user_regs; /* User-level CPU registers */ struct trap_info trap_ctxt[256]; /* Virtual IDT */ unsigned long ldt_base, ldt_ents; /* LDT (linear address, # ents) */ unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) */ @@ -152,25 +154,29 @@ typedef struct vcpu_guest_context { unsigned long failsafe_callback_cs; /* CS:EIP of failsafe callback */ unsigned long failsafe_callback_eip; unsigned long vm_assist; /* VMASST_TYPE_* bitmap */ -} vcpu_guest_context_t; +}; +typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); -typedef struct arch_shared_info { +struct arch_shared_info { unsigned long max_pfn; /* max pfn that appears in table */ /* Frame containing list of mfns containing list of mfns containing p2m. */ unsigned long pfn_to_mfn_frame_list_list; unsigned long nmi_reason; -} arch_shared_info_t; +}; +typedef struct arch_shared_info arch_shared_info_t; -typedef struct { +struct arch_vcpu_info { unsigned long cr2; unsigned long pad[5]; /* sizeof(vcpu_info_t) == 64 */ -} arch_vcpu_info_t; +}; +typedef struct arch_vcpu_info arch_vcpu_info_t; -typedef struct { +struct xen_callback { unsigned long cs; unsigned long eip; -} xen_callback_t; +}; +typedef struct xen_callback xen_callback_t; #endif /* !__ASSEMBLY__ */ --- xen-unstable.orig/xen/include/public/arch-x86_64.h +++ xen-unstable/xen/include/public/arch-x86_64.h @@ -150,12 +150,13 @@ struct iret_context { #define TI_GET_IF(_ti) ((_ti)->flags & 4) #define TI_SET_DPL(_ti,_dpl) ((_ti)->flags |= (_dpl)) #define TI_SET_IF(_ti,_if) ((_ti)->flags |= ((!!(_if))<<2)) -typedef struct trap_info { +struct trap_info { uint8_t vector; /* exception vector */ uint8_t flags; /* 0-3: privilege level; 4: clear event enable? */ uint16_t cs; /* code selector */ unsigned long address; /* code offset */ -} trap_info_t; +}; +typedef struct trap_info trap_info_t; DEFINE_XEN_GUEST_HANDLE(trap_info_t); #ifdef __GNUC__ @@ -166,7 +167,7 @@ DEFINE_XEN_GUEST_HANDLE(trap_info_t); #define __DECL_REG(name) uint64_t r ## name #endif -typedef struct cpu_user_regs { +struct cpu_user_regs { uint64_t r15; uint64_t r14; uint64_t r13; @@ -195,7 +196,8 @@ typedef struct cpu_user_regs { uint16_t ds, _pad4[3]; uint16_t fs, _pad5[3]; /* Non-zero => takes precedence over fs_base. */ uint16_t gs, _pad6[3]; /* Non-zero => takes precedence over gs_base_usr. */ -} cpu_user_regs_t; +}; +typedef struct cpu_user_regs cpu_user_regs_t; DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); #undef __DECL_REG @@ -206,14 +208,14 @@ typedef uint64_t tsc_timestamp_t; /* RDT * The following is all CPU context. Note that the fpu_ctxt block is filled * in by FXSAVE if the CPU has feature FXSR; otherwise FSAVE is used. */ -typedef struct vcpu_guest_context { +struct vcpu_guest_context { /* FPU registers come first so they can be aligned for FXSAVE/FXRSTOR. */ struct { char x[512]; } fpu_ctxt; /* User-level FPU registers */ #define VGCF_I387_VALID (1<<0) #define VGCF_HVM_GUEST (1<<1) #define VGCF_IN_KERNEL (1<<2) unsigned long flags; /* VGCF_* flags */ - cpu_user_regs_t user_regs; /* User-level CPU registers */ + struct cpu_user_regs user_regs; /* User-level CPU registers */ struct trap_info trap_ctxt[256]; /* Virtual IDT */ unsigned long ldt_base, ldt_ents; /* LDT (linear address, # ents) */ unsigned long gdt_frames[16], gdt_ents; /* GDT (machine frames, # ents) */ @@ -228,20 +230,23 @@ typedef struct vcpu_guest_context { uint64_t fs_base; uint64_t gs_base_kernel; uint64_t gs_base_user; -} vcpu_guest_context_t; +}; +typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); -typedef struct arch_shared_info { +struct arch_shared_info { unsigned long max_pfn; /* max pfn that appears in table */ /* Frame containing list of mfns containing list of mfns containing p2m. */ unsigned long pfn_to_mfn_frame_list_list; unsigned long nmi_reason; -} arch_shared_info_t; +}; +typedef struct arch_shared_info arch_shared_info_t; -typedef struct { +struct arch_vcpu_info { unsigned long cr2; unsigned long pad; /* sizeof(vcpu_info_t) == 64 */ -} arch_vcpu_info_t; +}; +typedef struct arch_vcpu_info arch_vcpu_info_t; typedef unsigned long xen_callback_t; -- _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.