Received: by 2002:ac2:5042:0:0:0:0:0 with SMTP id a2csp1281804lfm; Wed, 22 Jul 2020 19:57:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgvBQEtdB2Nsx0yGUP9WDe/VjB3GxDkbyDDVWd2Ss+uB76Lxd/FvTZvjsvQMjXedyFHSbw X-Received: by 2002:a25:9383:: with SMTP id a3mr3478215ybm.450.1595473077648; Wed, 22 Jul 2020 19:57:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595473077; cv=none; d=google.com; s=arc-20160816; b=jQkROjSOVnxIY1kVV197k3B0vV6dXx45xeK4Mqs22Z5bPko5cWay+W3OuBKwcvCFad YV16sspxvNEsN6SoHN+KdKfuYSfqe0aEs4VQLMxqWzJggi5ik4tMaUFM07RjC531QdBT WomUIeYRsnBlSK0JxNueXZ4D0UUbZ6zRy75ZVtsbK2mUMComtPDv3M2afmodweRQpxOG xAua5idKaumbsHn5Wqzu7CE1Fdgq96BBX0Z/UQouNEW9TfZprQuDDxXj4XEvFvGfVoQ7 93UuQdeDotwav98QdM4KsiKrPWwKMTmqgAR4evZA+AjeUKILB1kDdM1qKocZWZ+CZE/c SN5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=lH3HMQmOIS/Dw9roYPW2upwhhHq6VYeH36GnifqWruY=; b=FuxSicoMlRBMY9MEiN/3Q0uL5+ZsPFj+yGhGEOl5ctKXaZgJmb4N5ao8QEsdBKfb19 apoikPJAz2B9Nd9RqtJIDbsGrCUPkHqd6zWVUCumiBxtXkyC2EbsGHtR8R3JBmL4S7jG tRXneftNmWTO4/tP63/HnbLmjC05aKljL62o14OLPwsSmU9qgMoFm2KqPHfuA+/u3QW5 pEtL+FG9DtvmKowNnfmn6bx0HbSH5AT0c+VCXgDgNeVydudzC6UFURCpTbjzXoVJW22X 9CZijYENODMJSaIaRGvn5nk8bkKirfOav6lmti67NNMYJZPvnoB9X3A85jFbRncf9rmj pFjQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of bauerman@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=bauerman@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id m1si1416404ybt.173.2020.07.22.19.57.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2020 19:57:57 -0700 (PDT) Received-SPF: pass (google.com: domain of bauerman@linux.ibm.com designates 148.163.158.5 as permitted sender) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of bauerman@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=bauerman@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06N2Vqr4048847; Wed, 22 Jul 2020 22:57:39 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 32f1pp0qy0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Jul 2020 22:57:39 -0400 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 06N2iFL6093589; Wed, 22 Jul 2020 22:57:38 -0400 Received: from ppma05wdc.us.ibm.com (1b.90.2fa9.ip4.static.sl-reverse.com [169.47.144.27]) by mx0a-001b2d01.pphosted.com with ESMTP id 32f1pp0qxr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Jul 2020 22:57:38 -0400 Received: from pps.filterd (ppma05wdc.us.ibm.com [127.0.0.1]) by ppma05wdc.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 06N2nNiB009738; Thu, 23 Jul 2020 02:57:37 GMT Received: from b01cxnp22035.gho.pok.ibm.com (b01cxnp22035.gho.pok.ibm.com [9.57.198.25]) by ppma05wdc.us.ibm.com with ESMTP id 32brq910wb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Jul 2020 02:57:37 +0000 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 06N2vbHC46268810 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Jul 2020 02:57:37 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 53DEDAC05E; Thu, 23 Jul 2020 02:57:37 +0000 (GMT) Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5D265AC059; Thu, 23 Jul 2020 02:57:30 +0000 (GMT) Received: from morokweng.localdomain.com (unknown [9.211.93.190]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP; Thu, 23 Jul 2020 02:57:30 +0000 (GMT) From: Thiago Jung Bauermann To: qemu-ppc@nongnu.org Cc: qemu-arm@nongnu.org, qemu-s390x@nongnu.org, qemu-devel@nongnu.org, David Gibson , Paolo Bonzini , Marcel Apfelbaum , Eduardo Habkost , Richard Henderson , Peter Maydell , Aleksandar Markovic , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , Mark Cave-Ayland , Artyom Tarasenko , Cornelia Huck , Thomas Huth , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Greg Kurz , Thiago Jung Bauermann Subject: [PATCH v3 2/8] target/arm: Move setting of CPU halted state to generic code Date: Wed, 22 Jul 2020 23:56:51 -0300 Message-Id: <20200723025657.644724-3-bauerman@linux.ibm.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200723025657.644724-1-bauerman@linux.ibm.com> References: <20200723025657.644724-1-bauerman@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-07-22_17:2020-07-22,2020-07-22 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 bulkscore=0 phishscore=0 clxscore=1015 impostorscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=1 mlxlogscore=999 spamscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007230014 X-TUID: VcFcAkgeTTvT This change is in a separate patch because it's not so obvious that it won't cause a regression. Suggested-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thiago Jung Bauermann --- hw/core/cpu.c | 2 +- target/arm/cpu.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) NB: I wasn't able to run this patch on an ARM machine. I did run it on a ppc64le pseries KVM guest. diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 594441a150..71bb7859f1 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -258,7 +258,7 @@ static void cpu_common_reset(DeviceState *dev) } cpu->interrupt_request = 0; - cpu->halted = 0; + cpu->halted = cpu->start_powered_off; cpu->mem_io_pc = 0; cpu->icount_extra = 0; atomic_set(&cpu->icount_decr_ptr->u32, 0); diff --git a/target/arm/cpu.c b/target/arm/cpu.c index ec65c7653f..b6c65e4df6 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -175,7 +175,6 @@ static void arm_cpu_reset(DeviceState *dev) env->vfp.xregs[ARM_VFP_MVFR2] = cpu->isar.mvfr2; cpu->power_state = s->start_powered_off ? PSCI_OFF : PSCI_ON; - s->halted = s->start_powered_off; if (arm_feature(env, ARM_FEATURE_IWMMXT)) { env->iwmmxt.cregs[ARM_IWMMXT_wCID] = 0x69051000 | 'Q';