diff options
| author | Greg Kurz <groug@kaod.org> | 2019-09-27 13:53:55 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2019-10-22 16:29:02 +1100 |
| commit | 8db29ea2391cc6f5b73cc9c04b2dee4409b9fc05 (patch) | |
| tree | 2ab71ed7ee4181ec6a7eb6afee2c1bb9bb6a36c5 /arch/powerpc/kvm/book3s_xive_native.c | |
| parent | 8a4e7597ba1e41030189b73cd7261f4383588d1d (diff) | |
KVM: PPC: Book3S HV: XIVE: Compute the VP id in a common helper
Reduce code duplication by consolidating the checking of vCPU ids and VP
ids to a common helper used by both legacy and native XIVE KVM devices.
And explain the magic with a comment.
Signed-off-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm/book3s_xive_native.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_xive_native.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/powerpc/kvm/book3s_xive_native.c b/arch/powerpc/kvm/book3s_xive_native.c index 43a86858390a..5bb480b2aafd 100644 --- a/arch/powerpc/kvm/book3s_xive_native.c +++ b/arch/powerpc/kvm/book3s_xive_native.c @@ -118,19 +118,12 @@ int kvmppc_xive_native_connect_vcpu(struct kvm_device *dev, return -EPERM; if (vcpu->arch.irq_type != KVMPPC_IRQ_DEFAULT) return -EBUSY; - if (server_num >= (KVM_MAX_VCPUS * vcpu->kvm->arch.emul_smt_mode)) { - pr_devel("Out of bounds !\n"); - return -EINVAL; - } mutex_lock(&xive->lock); - vp_id = kvmppc_xive_vp(xive, server_num); - if (kvmppc_xive_vp_in_use(xive->kvm, vp_id)) { - pr_devel("Duplicate !\n"); - rc = -EEXIST; + rc = kvmppc_xive_compute_vp_id(xive, server_num, &vp_id); + if (rc) goto bail; - } xc = kzalloc(sizeof(*xc), GFP_KERNEL); if (!xc) { |