From 511638161566d4944a572a31d787eb27bbc0bc8e Mon Sep 17 00:00:00 2001 From: Thomas Huth <thuth@redhat.com> Date: Fri, 29 May 2020 05:53:45 -0400 Subject: [PATCH 03/42] s390x: Don't do a normal reset on the initial cpu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Thomas Huth <thuth@redhat.com> Message-id: <20200529055420.16855-4-thuth@redhat.com> Patchwork-id: 97017 O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 03/38] s390x: Don't do a normal reset on the initial cpu Bugzilla: 1828317 RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com> RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com> RH-Acked-by: Cornelia Huck <cohuck@redhat.com> RH-Acked-by: David Hildenbrand <david@redhat.com> From: Janosch Frank <frankja@linux.ibm.com> The initiating cpu needs to be reset with an initial reset. While doing a normal reset followed by a initial reset is not wrong per se, the Ultravisor will only allow the correct reset to be performed. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Message-Id: <20191127175046.4911-2-frankja@linux.ibm.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com> (cherry picked from commit ec9227339fce99412830d44a37eb0bd2fadd5f75) Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com> --- hw/s390x/s390-virtio-ccw.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index c2c83d2fce..4ea01c53c0 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -348,6 +348,9 @@ static void s390_machine_reset(MachineState *machine) break; case S390_RESET_LOAD_NORMAL: CPU_FOREACH(t) { + if (t == cs) { + continue; + } run_on_cpu(t, s390_do_cpu_reset, RUN_ON_CPU_NULL); } subsystem_reset(); -- 2.27.0