From 284f43f4fd6dccfff3b72afded0be03b3fe45091 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 30 May 2012 09:27:51 +0100 Subject: xen: Define new struct hvm_trap and cleanup vmx exception Define new struct hvm_trap to represent information of trap, and renames hvm_inject_exception to hvm_inject_trap, then define a couple of wrappers around that function for existing callers. Signed-off-by: Keir Fraser Signed-off-by: Xudong Hao Committed-by: Keir Fraser --- xen/include/asm-x86/hvm/vcpu.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xen/include/asm-x86/hvm/vcpu.h') diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index 537da96f5e..f2da72d750 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -164,10 +164,9 @@ struct hvm_vcpu { /* Callback into x86_emulate when emulating FPU/MMX/XMM instructions. */ void (*fpu_exception_callback)(void *, struct cpu_user_regs *); void *fpu_exception_callback_arg; - /* Pending hw/sw interrupt */ - int inject_trap; /* -1 for nothing to inject */ - int inject_error_code; - unsigned long inject_cr2; + + /* Pending hw/sw interrupt (.vector = -1 means nothing pending). */ + struct hvm_trap inject_trap; struct viridian_vcpu viridian; }; -- cgit v1.2.3