summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm/book3s_pr.c
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2011-11-08 18:23:20 -0600
committerAvi Kivity <avi@redhat.com>2012-03-05 14:52:25 +0200
commit7e28e60ef974d0eeb43112ef264d8c130f7b7bf4 (patch)
tree8abf647afcd01a0768c1163e019a26856bd706d8 /arch/powerpc/kvm/book3s_pr.c
parent1d1ef22208876511224a8797657e40e287e1f93d (diff)
downloadblackbird-op-linux-7e28e60ef974d0eeb43112ef264d8c130f7b7bf4.tar.gz
blackbird-op-linux-7e28e60ef974d0eeb43112ef264d8c130f7b7bf4.zip
KVM: PPC: Rename deliver_interrupts to prepare_to_enter
This function also updates paravirt int_pending, so rename it to be more obvious that this is a collection of checks run prior to (re)entering a guest. Signed-off-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm/book3s_pr.c')
-rw-r--r--arch/powerpc/kvm/book3s_pr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index e2cfb9e1e20e..f3628581fb7c 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -764,7 +764,7 @@ program_interrupt:
/* In case an interrupt came in that was triggered
* from userspace (like DEC), we need to check what
* to inject now! */
- kvmppc_core_deliver_interrupts(vcpu);
+ kvmppc_core_prepare_to_enter(vcpu);
}
}
OpenPOWER on IntegriCloud