Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 971eb77f authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Avi Kivity
Browse files

KVM: s390: Fix build failure due to centralized vcpu locking patches 



This patch fixes
ERROR: "__kvm_s390_vcpu_store_status" [arch/s390/kvm/kvm.ko] undefined!

triggered by
commit 3268c56840dcee78c3e928336550f4e1861504c4 (kvm.git)
Author: Avi Kivity <avi@redhat.com>
Date:   Thu May 13 12:21:46 2010 +0300
    KVM: s390: Centrally lock arch specific vcpu ioctls

Reported-by: default avatarSachin Sant <sachinp@in.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d1ac91d8

arch/s390/kvm/intercept.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int handle_stop(struct kvm_vcpu *vcpu) 
	spin_lock_bh(&vcpu->arch.local_int.lock);

	if (vcpu->arch.local_int.action_bits & ACTION_STORE_ON_STOP) {

		vcpu->arch.local_int.action_bits &= ~ACTION_STORE_ON_STOP;

		rc = __kvm_s390_vcpu_store_status(vcpu,

		rc = kvm_s390_vcpu_store_status(vcpu,

						  KVM_S390_STORE_STATUS_NOADDR);

		if (rc >= 0)

			rc = -EOPNOTSUPP;

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static int __guestcopy(struct kvm_vcpu *vcpu, u64 guestdest, const void *from, 
 * KVM_S390_STORE_STATUS_NOADDR: -> 0x1200 on 64 bit

 * KVM_S390_STORE_STATUS_PREFIXED: -> prefix

 */

static int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)

int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)

{

	const unsigned char archmode = 1;

	int prefix;

arch/s390/kvm/kvm-s390.h

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int kvm_s390_handle_b2(struct kvm_vcpu *vcpu); 
int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu);



/* implemented in kvm-s390.c */

int __kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu,

int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu,

				 unsigned long addr);

/* implemented in diag.c */

int kvm_s390_handle_diag(struct kvm_vcpu *vcpu);