From ec64243e1ee1f024f83ab2ebfbc5275cce27f7ec Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 4 Nov 2009 11:59:01 +0200 Subject: [PATCH] --- yaml --- r: 172333 b: refs/heads/master c: 65ac7264043740572ba804edca03c374d70427c9 h: refs/heads/master i: 172331: 7722269f6a90f3691145e7b27fdbb4829ff2310a v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 11 ++++++++--- trunk/include/linux/kvm.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 841c0d052176..113101869aeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9c7399d6cda0a092b347f8ee49bbe44f6e1fe66 +refs/heads/master: 65ac7264043740572ba804edca03c374d70427c9 diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index c0e66dd58a47..22fcd27a0b58 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -2744,9 +2744,14 @@ static int handle_exception(struct kvm_vcpu *vcpu) return handle_machine_check(vcpu); if ((vect_info & VECTORING_INFO_VALID_MASK) && - !is_page_fault(intr_info)) - printk(KERN_ERR "%s: unexpected, vectoring info 0x%x " - "intr info 0x%x\n", __func__, vect_info, intr_info); + !is_page_fault(intr_info)) { + vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR; + vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_SIMUL_EX; + vcpu->run->internal.ndata = 2; + vcpu->run->internal.data[0] = vect_info; + vcpu->run->internal.data[1] = intr_info; + return 0; + } if ((intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR) return 1; /* already handled by vmx_vcpu_run() */ diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h index 172639e94392..976f4d181858 100644 --- a/trunk/include/linux/kvm.h +++ b/trunk/include/linux/kvm.h @@ -163,6 +163,7 @@ struct kvm_pit_config { /* For KVM_EXIT_INTERNAL_ERROR */ #define KVM_INTERNAL_ERROR_EMULATION 1 +#define KVM_INTERNAL_ERROR_SIMUL_EX 2 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ struct kvm_run {