From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC818C432C0 for ; Thu, 28 Nov 2019 16:46:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 85B8D217AB for ; Thu, 28 Nov 2019 16:46:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PcK1NBnm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85B8D217AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaMvj-0000bz-Me for qemu-devel@archiver.kernel.org; Thu, 28 Nov 2019 11:46:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33482) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaLlT-0007lt-9D for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:31:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaLkK-0007c0-1t for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:30:22 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:51778 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iaLkJ-0007Xn-Ra for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:30:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574955017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:openpgp:openpgp; bh=nKpmQDeOmCSuPn+Ua2rOrBfQDwfIH01UUgrhvdL2BhE=; b=PcK1NBnm8NkxUwKBI/X6aNRqpo4lHWIq2B8rx6g7YPh2mbtcJlnh0xx+PQdjO3p2ljDLFp M38fj3wms6p1bXW1KGNpCa9CQkHw8nOqGnaOXUej+/rL1SoWPFxwFsBq8FupFV7Bx+TJuc h9/cYvXjJzu7dnVG/S6WjTn8EcBsI5Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-vrDNxMijOtSMxq2NFYJVLQ-1; Thu, 28 Nov 2019 10:30:14 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B6641005510; Thu, 28 Nov 2019 15:30:13 +0000 (UTC) Received: from thuth.remote.csb (ovpn-116-114.ams2.redhat.com [10.36.116.114]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6BE3D60BE2; Thu, 28 Nov 2019 15:30:08 +0000 (UTC) Subject: Re: [PATCH 15/15] s390x: protvirt: Handle SIGP store status correctly To: Janosch Frank , qemu-devel@nongnu.org References: <20191120114334.2287-1-frankja@linux.ibm.com> <20191120114334.2287-16-frankja@linux.ibm.com> From: Thomas Huth Openpgp: preference=signencrypt Message-ID: Date: Thu, 28 Nov 2019 16:30:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191120114334.2287-16-frankja@linux.ibm.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: vrDNxMijOtSMxq2NFYJVLQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pmorel@linux.ibm.com, david@redhat.com, cohuck@redhat.com, borntraeger@de.ibm.com, qemu-s390x@nongnu.org, mihajlov@linux.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 20/11/2019 12.43, Janosch Frank wrote: > Status storing is obviously not done by qemu anymore. > > Signed-off-by: Janosch Frank > --- > target/s390x/sigp.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c > index 2ce22d4dc1..68634d694a 100644 > --- a/target/s390x/sigp.c > +++ b/target/s390x/sigp.c > @@ -144,7 +144,9 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg) > case S390_CPU_STATE_STOPPED: > /* already stopped, just store the status */ > cpu_synchronize_state(cs); > - s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); > + if (!cpu->env.pv) { > + s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); > + } > break; > } > si->cc = SIGP_CC_ORDER_CODE_ACCEPTED; > @@ -497,7 +499,8 @@ void do_stop_interrupt(CPUS390XState *env) > if (s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu) == 0) { > qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); > } > - if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) { > + /* Storing will occur on next SIE entry for fmt 4 */ > + if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS && !env->pv) { > s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); > } > env->sigp_order = 0; > Maybe move the check into the s390_store_status() function instead? Anyway, Reviewed-by: Thomas Huth