hv:rename data structure intr_ctx

mingqiangchi · lijinxia · commit 8384ed2564b9 · 2018-05-23T13:38:52.000+08:00
rename intr_ctx to intr_excp_ctx

Signed-off-by: Mingqiang Chi &lt;mingqiang.chi@intel.com&gt;
Reviewed-by: Jason Chen CJ &lt;jason.cj.chen@intel.com&gt;
Acked-by: Eddie Dong &lt;eddie.dong@intel.com&gt;
diff --git a/hypervisor/arch/x86/interrupt.c b/hypervisor/arch/x86/interrupt.c
@@ -277,7 +277,7 @@ int interrupt_window_vmexit_handler(struct vcpu *vcpu)
 int external_interrupt_vmexit_handler(struct vcpu *vcpu)
 {
 	uint32_t intr_info;
-	struct intr_ctx ctx;
+	struct intr_excp_ctx ctx;
 
 	intr_info = exec_vmread(VMX_EXIT_INT_INFO);
 	if ((!(intr_info & VMX_INT_INFO_VALID)) ||
diff --git a/hypervisor/arch/x86/irq.c b/hypervisor/arch/x86/irq.c
@@ -427,7 +427,7 @@ int init_default_irqs(unsigned int cpu_id)
 	return 0;
 }
 
-void dispatch_exception(struct intr_ctx *ctx)
+void dispatch_exception(struct intr_excp_ctx *ctx)
 {
 	unsigned int cpu_id = get_cpu_id();
 
@@ -456,7 +456,7 @@ void handle_spurious_interrupt(int vector)
 }
 
 /* do_IRQ() */
-void dispatch_interrupt(struct intr_ctx *ctx)
+void dispatch_interrupt(struct intr_excp_ctx *ctx)
 {
 	int vr = ctx->vector;
 	int irq = vector_to_irq[vr];
diff --git a/hypervisor/debug/dump.c b/hypervisor/debug/dump.c
@@ -293,7 +293,7 @@ void __assert(uint32_t line, const char *file, char *txt)
 	} while (1);
 }
 
-void dump_exception(struct intr_ctx *ctx, uint32_t cpu_id)
+void dump_exception(struct intr_excp_ctx *ctx, uint32_t cpu_id)
 {
 	const char *name = "Not defined";
 	static int nested = 1;
@@ -340,7 +340,7 @@ void dump_exception(struct intr_ctx *ctx, uint32_t cpu_id)
 	printf("===========================\n");
 }
 
-void dump_interrupt(struct intr_ctx *ctx)
+void dump_interrupt(struct intr_excp_ctx *ctx)
 {
 	printf("\n\n==========================================");
 	printf("======================================\n=\n");
diff --git a/hypervisor/include/arch/x86/irq.h b/hypervisor/include/arch/x86/irq.h
@@ -94,7 +94,7 @@ struct irq_routing_entry {
 /*
  * Definition of the stack frame layout
  */
-struct intr_ctx {
+struct intr_excp_ctx {
 	uint64_t r12;
 	uint64_t r13;
 	uint64_t r14;
@@ -141,7 +141,7 @@ void update_irq_handler(int irq, irq_handler_t func);
 
 int init_default_irqs(unsigned int cpu);
 
-void dispatch_interrupt(struct intr_ctx *ctx);
+void dispatch_interrupt(struct intr_excp_ctx *ctx);
 
 struct dev_handler_node*
 pri_register_handler(int irq,
diff --git a/hypervisor/include/debug/dump.h b/hypervisor/include/debug/dump.h
@@ -31,23 +31,23 @@
 #ifndef DUMP_H
 #define DUMP_H
 
-struct intr_ctx;
+struct intr_excp_ctx;
 
 #ifdef HV_DEBUG
 #define CALL_TRACE_HIERARCHY_MAX    20
 #define DUMP_STACK_SIZE 0x200
 
-void dump_exception(struct intr_ctx *ctx, uint32_t cpu_id);
-void dump_interrupt(struct intr_ctx *ctx);
+void dump_exception(struct intr_excp_ctx *ctx, uint32_t cpu_id);
+void dump_interrupt(struct intr_excp_ctx *ctx);
 
 #else
 
-static inline void dump_exception(__unused struct intr_ctx *ctx,
+static inline void dump_exception(__unused struct intr_excp_ctx *ctx,
 				__unused uint32_t cpu_id)
 {
 }
 
-static inline void dump_interrupt(__unused struct intr_ctx *ctx)
+static inline void dump_interrupt(__unused struct intr_excp_ctx *ctx)
 {
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ int interrupt_window_vmexit_handler(struct vcpu *vcpu)`
`277`	`277`	`int external_interrupt_vmexit_handler(struct vcpu *vcpu)`
`278`	`278`	`{`
`279`	`279`	`uint32_t intr_info;`
`280`		`- struct intr_ctx ctx;`
	`280`	`+ struct intr_excp_ctx ctx;`
`281`	`281`
`282`	`282`	`intr_info = exec_vmread(VMX_EXIT_INT_INFO);`
`283`	`283`	`if ((!(intr_info & VMX_INT_INFO_VALID)) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ int init_default_irqs(unsigned int cpu_id)`
`427`	`427`	`return 0;`
`428`	`428`	`}`
`429`	`429`
`430`		`-void dispatch_exception(struct intr_ctx *ctx)`
	`430`	`+void dispatch_exception(struct intr_excp_ctx *ctx)`
`431`	`431`	`{`
`432`	`432`	`unsigned int cpu_id = get_cpu_id();`
`433`	`433`
`@@ -456,7 +456,7 @@ void handle_spurious_interrupt(int vector)`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`/* do_IRQ() */`
`459`		`-void dispatch_interrupt(struct intr_ctx *ctx)`
	`459`	`+void dispatch_interrupt(struct intr_excp_ctx *ctx)`
`460`	`460`	`{`
`461`	`461`	`int vr = ctx->vector;`
`462`	`462`	`int irq = vector_to_irq[vr];`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ void __assert(uint32_t line, const char file, char txt)`
`293`	`293`	`} while (1);`
`294`	`294`	`}`
`295`	`295`
`296`		`-void dump_exception(struct intr_ctx *ctx, uint32_t cpu_id)`
	`296`	`+void dump_exception(struct intr_excp_ctx *ctx, uint32_t cpu_id)`
`297`	`297`	`{`
`298`	`298`	`const char *name = "Not defined";`
`299`	`299`	`static int nested = 1;`
`@@ -340,7 +340,7 @@ void dump_exception(struct intr_ctx *ctx, uint32_t cpu_id)`
`340`	`340`	`printf("===========================\n");`
`341`	`341`	`}`
`342`	`342`
`343`		`-void dump_interrupt(struct intr_ctx *ctx)`
	`343`	`+void dump_interrupt(struct intr_excp_ctx *ctx)`
`344`	`344`	`{`
`345`	`345`	`printf("\n\n==========================================");`
`346`	`346`	`printf("======================================\n=\n");`
Original file line number	Diff line number	Diff line change
`@@ -31,23 +31,23 @@`
`31`	`31`	`#ifndef DUMP_H`
`32`	`32`	`#define DUMP_H`
`33`	`33`
`34`		`-struct intr_ctx;`
	`34`	`+struct intr_excp_ctx;`
`35`	`35`
`36`	`36`	`#ifdef HV_DEBUG`
`37`	`37`	`#define CALL_TRACE_HIERARCHY_MAX 20`
`38`	`38`	`#define DUMP_STACK_SIZE 0x200`
`39`	`39`
`40`		`-void dump_exception(struct intr_ctx *ctx, uint32_t cpu_id);`
`41`		`-void dump_interrupt(struct intr_ctx *ctx);`
	`40`	`+void dump_exception(struct intr_excp_ctx *ctx, uint32_t cpu_id);`
	`41`	`+void dump_interrupt(struct intr_excp_ctx *ctx);`
`42`	`42`
`43`	`43`	`#else`
`44`	`44`
`45`		`-static inline void dump_exception(__unused struct intr_ctx *ctx,`
	`45`	`+static inline void dump_exception(__unused struct intr_excp_ctx *ctx,`
`46`	`46`	`__unused uint32_t cpu_id)`
`47`	`47`	`{`
`48`	`48`	`}`
`49`	`49`
`50`		`-static inline void dump_interrupt(__unused struct intr_ctx *ctx)`
	`50`	`+static inline void dump_interrupt(__unused struct intr_excp_ctx *ctx)`
`51`	`51`	`{`
`52`	`52`	`}`
`53`	`53`	`#endif`