diff options
| author | David Hildenbrand <david@redhat.com> | 2017-09-28 22:37:06 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-10-20 13:32:10 +0200 |
| commit | 0fc60ca58aa250b4f11f8c69d0be097e0140e7df (patch) | |
| tree | 477202885c451cb2984ec9c314941062e318b749 | |
| parent | ca26c5d32b08a491cc138e4b8a9c6c774fb62d40 (diff) | |
| download | qemu-0fc60ca58aa250b4f11f8c69d0be097e0140e7df.zip qemu-0fc60ca58aa250b4f11f8c69d0be097e0140e7df.tar.gz qemu-0fc60ca58aa250b4f11f8c69d0be097e0140e7df.tar.bz2 | |
s390x/tcg: unlock NMI
Nothing hindering us anymore from unlocking the restart code (used for
NMI).
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-29-david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 4 | ||||
| -rw-r--r-- | target/s390x/sigp.c | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a403645..e447458 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -398,9 +398,7 @@ static void s390_nmi(NMIState *n, int cpu_index, Error **errp) { CPUState *cs = qemu_get_cpu(cpu_index); - if (s390_cpu_restart(S390_CPU(cs))) { - error_setg(errp, QERR_UNSUPPORTED); - } + s390_cpu_restart(S390_CPU(cs)); } static void ccw_machine_class_init(ObjectClass *oc, void *data) diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c index c5a5dac..964c75a 100644 --- a/target/s390x/sigp.c +++ b/target/s390x/sigp.c @@ -480,11 +480,6 @@ int s390_cpu_restart(S390CPU *cpu) { SigpInfo si = {}; - if (tcg_enabled()) { - /* FIXME TCG */ - return -ENOSYS; - } - run_on_cpu(CPU(cpu), sigp_restart, RUN_ON_CPU_HOST_PTR(&si)); return 0; } |