diff options
| author | Janosch Frank <frankja@linux.ibm.com> | 2019-11-27 12:50:41 -0500 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2019-12-14 10:25:50 +0100 |
| commit | ec9227339fce99412830d44a37eb0bd2fadd5f75 (patch) | |
| tree | 6576478f1bf0e0f302713eb66a8ddd6167ab679a | |
| parent | 3eb74d2087d3bd6cb51c06a49ba94222248d2de4 (diff) | |
| download | focaccia-qemu-ec9227339fce99412830d44a37eb0bd2fadd5f75.tar.gz focaccia-qemu-ec9227339fce99412830d44a37eb0bd2fadd5f75.zip | |
s390x: Don't do a normal reset on the initial cpu
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>
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 01e7e209a5..e0e28139a2 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(); |