From 8384ed2564b9552aea3c57fb82a65f813f956c8a Mon Sep 17 00:00:00 2001 From: Mingqiang Chi Date: Wed, 23 May 2018 10:33:32 +0800 Subject: [PATCH] hv:rename data structure intr_ctx rename intr_ctx to intr_excp_ctx Signed-off-by: Mingqiang Chi Reviewed-by: Jason Chen CJ Acked-by: Eddie Dong --- hypervisor/arch/x86/interrupt.c | 2 +- hypervisor/arch/x86/irq.c | 4 ++-- hypervisor/debug/dump.c | 4 ++-- hypervisor/include/arch/x86/irq.h | 4 ++-- hypervisor/include/debug/dump.h | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hypervisor/arch/x86/interrupt.c b/hypervisor/arch/x86/interrupt.c index ef2a872f8..409357770 100644 --- 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 index 9dc9416e0..c93957ae4 100644 --- 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 index 87fb33441..58d6b94d5 100644 --- 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 index 77ff27b39..5df76e7d6 100644 --- 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 index 1d3ebf30b..005294ca1 100644 --- 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