diff options
author | Gleb Natapov <gleb@redhat.com> | 2009-04-21 10:45:11 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-06-10 04:48:49 -0400 |
commit | 14d0bc1f7c8226d5088e7182c3b53e0c7e91d1af (patch) | |
tree | 021a440648ed2117a33a4c8c1bcc91dcb22311cf /arch/x86/kvm/svm.c | |
parent | 16d7a191170f0ca48c2c3277017b3e6d275e0711 (diff) |
KVM: Get rid of get_irq() callback
It just returns pending IRQ vector from the queue for VMX/SVM.
Get IRQ directly from the queue before migration and put it back
after.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 18072888efc5..d96a6d3edec7 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
@@ -966,13 +966,6 @@ static int svm_guest_debug(struct kvm_vcpu *vcpu, struct kvm_guest_debug *dbg) | |||
966 | return 0; | 966 | return 0; |
967 | } | 967 | } |
968 | 968 | ||
969 | static int svm_get_irq(struct kvm_vcpu *vcpu) | ||
970 | { | ||
971 | if (!vcpu->arch.interrupt.pending) | ||
972 | return -1; | ||
973 | return vcpu->arch.interrupt.nr; | ||
974 | } | ||
975 | |||
976 | static void load_host_msrs(struct kvm_vcpu *vcpu) | 969 | static void load_host_msrs(struct kvm_vcpu *vcpu) |
977 | { | 970 | { |
978 | #ifdef CONFIG_X86_64 | 971 | #ifdef CONFIG_X86_64 |
@@ -2647,7 +2640,6 @@ static struct kvm_x86_ops svm_x86_ops = { | |||
2647 | .handle_exit = handle_exit, | 2640 | .handle_exit = handle_exit, |
2648 | .skip_emulated_instruction = skip_emulated_instruction, | 2641 | .skip_emulated_instruction = skip_emulated_instruction, |
2649 | .patch_hypercall = svm_patch_hypercall, | 2642 | .patch_hypercall = svm_patch_hypercall, |
2650 | .get_irq = svm_get_irq, | ||
2651 | .set_irq = svm_set_irq, | 2643 | .set_irq = svm_set_irq, |
2652 | .set_nmi = svm_inject_nmi, | 2644 | .set_nmi = svm_inject_nmi, |
2653 | .queue_exception = svm_queue_exception, | 2645 | .queue_exception = svm_queue_exception, |