From patchwork Wed Jan 27 16:53:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Rosato X-Patchwork-Id: 8135911 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8157A9F1C0 for ; Wed, 27 Jan 2016 16:57:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CFCA5201FE for ; Wed, 27 Jan 2016 16:57:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 43D5B201FA for ; Wed, 27 Jan 2016 16:57:45 +0000 (UTC) Received: from localhost ([::1]:51427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOTPc-0005Pl-Co for patchwork-qemu-devel@patchwork.kernel.org; Wed, 27 Jan 2016 11:57:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOTLy-0006x0-FV for qemu-devel@nongnu.org; Wed, 27 Jan 2016 11:54:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOTLu-0003jC-6g for qemu-devel@nongnu.org; Wed, 27 Jan 2016 11:53:58 -0500 Received: from e37.co.us.ibm.com ([32.97.110.158]:54281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOTLt-0003j6-Uv for qemu-devel@nongnu.org; Wed, 27 Jan 2016 11:53:54 -0500 Received: from localhost by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 27 Jan 2016 09:53:53 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 27 Jan 2016 09:53:44 -0700 X-IBM-Helo: d03dlp03.boulder.ibm.com X-IBM-MailFrom: mjrosato@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from b01cxnp22036.gho.pok.ibm.com (b01cxnp22036.gho.pok.ibm.com [9.57.198.26]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 4296019D804C for ; Wed, 27 Jan 2016 09:41:44 -0700 (MST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u0RGrhNY20316198 for ; Wed, 27 Jan 2016 16:53:43 GMT Received: from d01av01.pok.ibm.com (localhost [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u0RGrhTK003213 for ; Wed, 27 Jan 2016 11:53:43 -0500 Received: from rosatomj-ThinkPad-W530.endicott.ibm.com (rosatomj-thinkpad-w530.endicott.ibm.com [9.60.85.43]) by d01av01.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u0RGrfog002899; Wed, 27 Jan 2016 11:53:43 -0500 From: Matthew Rosato To: qemu-devel@nongnu.org Date: Wed, 27 Jan 2016 11:53:37 -0500 Message-Id: <1453913621-20961-7-git-send-email-mjrosato@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453913621-20961-1-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1453913621-20961-1-git-send-email-mjrosato@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16012716-0025-0000-0000-000020CC4E83 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 32.97.110.158 Cc: agraf@suse.de, borntraeger@de.ibm.com, bharata@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 06/10] s390x/cpu: Set initial CPU state in common routine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Both initial and hotplugged CPUs need to set the same initial state. Signed-off-by: Matthew Rosato Reviewed-by: David Hildenbrand --- hw/s390x/s390-virtio.c | 4 ---- target-s390x/cpu.c | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index e5d3875..4a0aab0 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -107,14 +107,10 @@ void s390_init_cpus(MachineState *machine) for (i = 0; i < smp_cpus; i++) { S390CPU *cpu; - CPUState *cs; cpu = cpu_s390x_init(machine->cpu_model); - cs = CPU(cpu); ipi_states[i] = cpu; - cs->halted = 1; - cs->exception_index = EXCP_HLT; } } diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index e5a3f65..b0f95ce 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -218,6 +218,8 @@ static void s390_cpu_initfn(Object *obj) #endif cs->env_ptr = env; + cs->halted = 1; + cs->exception_index = EXCP_HLT; cpu_exec_init(cs, &error_abort); #if !defined(CONFIG_USER_ONLY) qemu_register_reset(s390_cpu_machine_reset_cb, cpu);