diff options
author | Jens Freimann <jfrei@linux.vnet.ibm.com> | 2012-02-06 04:59:05 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2012-03-08 07:10:16 -0500 |
commit | 24a13044a84be51a6a4885a72ac9d5f4ed0742d0 (patch) | |
tree | 7dcd606daff06c71b2eed197683d4ddd1b4235bc /arch/s390/kvm/sigp.c | |
parent | 151104a7b3a82f9c56d636595ae58084049d2559 (diff) |
KVM: s390: ignore sigp stop overinitiative
In __inject_sigp_stop() do nothing when the CPU is already in stopped
state.
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>
Diffstat (limited to 'arch/s390/kvm/sigp.c')
-rw-r--r-- | arch/s390/kvm/sigp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c index c703b1cbb0aa..f3d5cc297012 100644 --- a/arch/s390/kvm/sigp.c +++ b/arch/s390/kvm/sigp.c | |||
@@ -160,12 +160,15 @@ static int __inject_sigp_stop(struct kvm_s390_local_interrupt *li, int action) | |||
160 | inti->type = KVM_S390_SIGP_STOP; | 160 | inti->type = KVM_S390_SIGP_STOP; |
161 | 161 | ||
162 | spin_lock_bh(&li->lock); | 162 | spin_lock_bh(&li->lock); |
163 | if ((atomic_read(li->cpuflags) & CPUSTAT_STOPPED)) | ||
164 | goto out; | ||
163 | list_add_tail(&inti->list, &li->list); | 165 | list_add_tail(&inti->list, &li->list); |
164 | atomic_set(&li->active, 1); | 166 | atomic_set(&li->active, 1); |
165 | atomic_set_mask(CPUSTAT_STOP_INT, li->cpuflags); | 167 | atomic_set_mask(CPUSTAT_STOP_INT, li->cpuflags); |
166 | li->action_bits |= action; | 168 | li->action_bits |= action; |
167 | if (waitqueue_active(&li->wq)) | 169 | if (waitqueue_active(&li->wq)) |
168 | wake_up_interruptible(&li->wq); | 170 | wake_up_interruptible(&li->wq); |
171 | out: | ||
169 | spin_unlock_bh(&li->lock); | 172 | spin_unlock_bh(&li->lock); |
170 | 173 | ||
171 | return 0; /* order accepted */ | 174 | return 0; /* order accepted */ |