From: Jens Freimann <jfrei@linux.vnet.ibm.com>
Date: Mon, 6 Feb 2012 09:59:06 +0000 (+0100)
Subject: KVM: s390: add stop_on_stop flag when doing stop and store
X-Git-Tag: upstream/snapshot3+hdmi~7836^2~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ec2d6dc6c4d4792b85dec2f09d39387fb7157d1;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

KVM: s390: add stop_on_stop flag when doing stop and store

When we do a stop and store status we need to pass ACTION_STOP_ON_STOP
flag to __sigp_stop().

Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
index f3d5cc2..0ad4cf2 100644
--- a/arch/s390/kvm/sigp.c
+++ b/arch/s390/kvm/sigp.c
@@ -385,7 +385,8 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu)
 		break;
 	case SIGP_STOP_STORE_STATUS:
 		vcpu->stat.instruction_sigp_stop++;
-		rc = __sigp_stop(vcpu, cpu_addr, ACTION_STORE_ON_STOP);
+		rc = __sigp_stop(vcpu, cpu_addr, ACTION_STORE_ON_STOP |
+						 ACTION_STOP_ON_STOP);
 		break;
 	case SIGP_SET_ARCH:
 		vcpu->stat.instruction_sigp_arch++;