Commit 0fc60ca5 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/tcg: unlock NMI 



Nothing hindering us anymore from unlocking the restart code (used for
NMI).

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-29-david@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent ca26c5d3

hw/s390x/s390-virtio-ccw.c

+1 −3
Original line number Diff line number Diff line
@@ -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)

target/s390x/sigp.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

}