From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTWGd-0003xN-9R for qemu-devel@nongnu.org; Fri, 28 Mar 2014 08:52:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WTWGT-0000NI-Ou for qemu-devel@nongnu.org; Fri, 28 Mar 2014 08:52:15 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:53092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTWGT-0000M7-1Y for qemu-devel@nongnu.org; Fri, 28 Mar 2014 08:52:05 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 28 Mar 2014 22:52:00 +1000 From: Alexey Kardashevskiy Date: Fri, 28 Mar 2014 23:51:50 +1100 Message-Id: <1396011112-23559-4-git-send-email-aik@ozlabs.ru> In-Reply-To: <1396011112-23559-1-git-send-email-aik@ozlabs.ru> References: <1396011112-23559-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v2 3/5] target-s390: Implement nmi() callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Paolo Bonzini , qemu-ppc@nongnu.org, Alexander Graf , Thomas Huth Signed-off-by: Alexey Kardashevskiy --- target-s390x/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index dfd83e8..89470a2 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -156,6 +156,11 @@ static void s390_cpu_full_reset(CPUState *s) tlb_flush(s, 1); } +static int s390_cpu_nmi(CPUState *cs) +{ + return s390_cpu_restart(S390_CPU(cs)); +} + #if !defined(CONFIG_USER_ONLY) static void s390_cpu_machine_reset_cb(void *opaque) { @@ -241,6 +246,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) scc->cpu_reset = s390_cpu_reset; scc->initial_cpu_reset = s390_cpu_initial_reset; cc->reset = s390_cpu_full_reset; + cc->nmi = s390_cpu_nmi; cc->has_work = s390_cpu_has_work; cc->do_interrupt = s390_cpu_do_interrupt; cc->dump_state = s390_cpu_dump_state; -- 1.8.4.rc4