diff options
| author | Alexander Graf <agraf@suse.de> | 2011-08-08 17:29:42 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-09-25 19:52:26 +0300 |
| commit | 930b412a005bde2ea3f05911eaaeeb10f11d79ab (patch) | |
| tree | aac017faf38837319a24fe9276e056fa6af1f4d8 | |
| parent | a668f2bd3f14ce7f92e119f4b5d9b50cdc59e855 (diff) | |
| download | linux-3.10-930b412a005bde2ea3f05911eaaeeb10f11d79ab.tar.gz linux-3.10-930b412a005bde2ea3f05911eaaeeb10f11d79ab.tar.bz2 linux-3.10-930b412a005bde2ea3f05911eaaeeb10f11d79ab.zip | |
KVM: PPC: Enable the PAPR CAP for Book3S
Now that Book3S PV mode can also run PAPR guests, we can add a PAPR cap and
enable it for all Book3S targets. Enabling that CAP switches KVM into PAPR
mode.
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 5 | ||||
| -rw-r--r-- | include/linux/kvm.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 17a5c83e1cc..13bc798a444 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -189,6 +189,7 @@ int kvm_dev_ioctl_check_extension(long ext) #else case KVM_CAP_PPC_SEGSTATE: case KVM_CAP_PPC_HIOR: + case KVM_CAP_PPC_PAPR: #endif case KVM_CAP_PPC_UNSET_IRQ: case KVM_CAP_PPC_IRQ_LEVEL: @@ -572,6 +573,10 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu, r = 0; vcpu->arch.osi_enabled = true; break; + case KVM_CAP_PPC_PAPR: + r = 0; + vcpu->arch.papr_enabled = true; + break; default: r = -EINVAL; break; diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 490b041aba4..68840544006 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@ -555,6 +555,7 @@ struct kvm_ppc_pvinfo { #define KVM_CAP_PPC_RMA 65 #define KVM_CAP_MAX_VCPUS 66 /* returns max vcpus per vm */ #define KVM_CAP_PPC_HIOR 67 +#define KVM_CAP_PPC_PAPR 68 #define KVM_CAP_S390_GMAP 71 #ifdef KVM_CAP_IRQ_ROUTING |