From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVFfy-0002sM-FD for qemu-devel@nongnu.org; Tue, 10 Mar 2015 04:38:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVFfr-0000ne-FH for qemu-devel@nongnu.org; Tue, 10 Mar 2015 04:38:06 -0400 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:41705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVFfr-0000mY-4Z for qemu-devel@nongnu.org; Tue, 10 Mar 2015 04:37:59 -0400 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 10 Mar 2015 08:37:58 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3CFB317D806E for ; Tue, 10 Mar 2015 08:38:17 +0000 (GMT) Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2A8bt4q56557670 for ; Tue, 10 Mar 2015 08:37:55 GMT Received: from d06av06.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2A3X2j4008027 for ; Mon, 9 Mar 2015 23:33:03 -0400 From: Christian Borntraeger Date: Tue, 10 Mar 2015 09:38:03 +0100 Message-Id: <1425976693-18087-11-git-send-email-borntraeger@de.ibm.com> In-Reply-To: <1425976693-18087-1-git-send-email-borntraeger@de.ibm.com> References: <1425976693-18087-1-git-send-email-borntraeger@de.ibm.com> Subject: [Qemu-devel] [PULL 10/20] s390x/kvm: deliver SIGP RESTART directly if stopped List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Christian Borntraeger , qemu-devel , Alexander Graf , David Hildenbrand , Jens Freimann , Cornelia Huck , Richard Henderson From: David Hildenbrand According to the PoP, a restart irq has to be delivered "without first honoring any other pending interruptions", if a cpu is in the STOPPED state. While it is hard to implement this case in kvm, it can easily be handled in qemu. Reviewed-by: Thomas Huth Reviewed-by: Cornelia Huck Signed-off-by: Jens Freimann Signed-off-by: David Hildenbrand Message-Id: <1424783731-43426-10-git-send-email-jfrei@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger --- target-s390x/kvm.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 7023513..ec64b7e 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -1254,8 +1254,17 @@ static void sigp_restart(void *arg) .type = KVM_S390_RESTART, }; - kvm_s390_vcpu_interrupt(si->cpu, &irq); - s390_cpu_set_state(CPU_STATE_OPERATING, si->cpu); + switch (s390_cpu_get_state(si->cpu)) { + case CPU_STATE_STOPPED: + /* the restart irq has to be delivered prior to any other pending irq */ + cpu_synchronize_state(CPU(si->cpu)); + do_restart_interrupt(&si->cpu->env); + s390_cpu_set_state(CPU_STATE_OPERATING, si->cpu); + break; + case CPU_STATE_OPERATING: + kvm_s390_vcpu_interrupt(si->cpu, &irq); + break; + } si->cc = SIGP_CC_ORDER_CODE_ACCEPTED; } -- 2.3.0