On Thu, 28 Sep 2017 22:37:06 +0200 David Hildenbrand <[email protected]> wrote:
> Nothing hindering us anymore from unlocking the restart code (used for > NMI). > > Signed-off-by: David Hildenbrand <[email protected]> > --- > hw/s390x/s390-virtio-ccw.c | 4 +--- > target/s390x/sigp.c | 5 ----- > 2 files changed, 1 insertion(+), 8 deletions(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 3a23fd3f27..7f7e4908b1 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -402,9 +402,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 c5a5dac911..964c75a736 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; > } We might want to make this void. But I'll apply as-is for now.
