diff options
| author | Alexander Graf <agraf@suse.de> | 2012-12-20 08:52:39 +0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-01-10 16:42:21 +0400 |
| commit | b8c649a99d582a6d8afd8457ba6145c624b8a76f (patch) | |
| tree | 55d877c732c79b6b799d5c04300d11e4a18e86c9 /arch/powerpc/kvm | |
| parent | f2be655004ddc36f2c5fc5e541d481dcd782ab83 (diff) | |
| download | linux-b8c649a99d582a6d8afd8457ba6145c624b8a76f.tar.xz | |
KVM: PPC: BookE: Allow irq deliveries to inject requests
When injecting an interrupt into guest context, we usually don't need
to check for requests anymore. At least not until today.
With the introduction of EPR, we will have to create a request when the
guest has successfully accepted an external interrupt though.
So we need to prepare the interrupt delivery to abort guest entry
gracefully. Otherwise we'd delay the EPR request.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/powerpc/kvm')
| -rw-r--r-- | arch/powerpc/kvm/booke.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 69f114015780..964f4475f55c 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -581,6 +581,11 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) kvmppc_core_check_exceptions(vcpu); + if (vcpu->requests) { + /* Exception delivery raised request; start over */ + return 1; + } + if (vcpu->arch.shared->msr & MSR_WE) { local_irq_enable(); kvm_vcpu_block(vcpu); |