diff options
author | Gleb Natapov <gleb@redhat.com> | 2009-07-09 08:33:52 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-09-10 01:33:13 -0400 |
commit | a1b37100d9e29c1f8dc3e2f5490a205c80180e01 (patch) | |
tree | 0e1448e35c8da68b865816a1173540f8e05234e4 /arch/ia64/kvm/kvm-ia64.c | |
parent | 0b71785dc05f1f66e6268022b9953c0d6a9985c6 (diff) |
KVM: Reduce runnability interface with arch support code
Remove kvm_cpu_has_interrupt() and kvm_arch_interrupt_allowed() from
interface between general code and arch code. kvm_arch_vcpu_runnable()
checks for interrupts instead.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index d7aa6bb8f477..0ad09f05efa9 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -1935,19 +1935,6 @@ int kvm_highest_pending_irq(struct kvm_vcpu *vcpu) | |||
1935 | return find_highest_bits((int *)&vpd->irr[0]); | 1935 | return find_highest_bits((int *)&vpd->irr[0]); |
1936 | } | 1936 | } |
1937 | 1937 | ||
1938 | int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu) | ||
1939 | { | ||
1940 | if (kvm_highest_pending_irq(vcpu) != -1) | ||
1941 | return 1; | ||
1942 | return 0; | ||
1943 | } | ||
1944 | |||
1945 | int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu) | ||
1946 | { | ||
1947 | /* do real check here */ | ||
1948 | return 1; | ||
1949 | } | ||
1950 | |||
1951 | int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) | 1938 | int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) |
1952 | { | 1939 | { |
1953 | return vcpu->arch.timer_fired; | 1940 | return vcpu->arch.timer_fired; |
@@ -1960,7 +1947,8 @@ gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn) | |||
1960 | 1947 | ||
1961 | int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) | 1948 | int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) |
1962 | { | 1949 | { |
1963 | return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE; | 1950 | return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE) || |
1951 | (kvm_highest_pending_irq(vcpu) != -1); | ||
1964 | } | 1952 | } |
1965 | 1953 | ||
1966 | int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, | 1954 | int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, |