From 520db63f3a50c6a5564dd2ce21912cfe011900a9 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Mon, 29 Jan 2018 13:56:09 +0100 Subject: s390x/tcg: simplify machine check handling We currently only support CRW machine checks. This is a preparation for real floating interrupt support. Get rid of the queue and handle it via the bit INTERRUPT_MCHK. We don't rename it for now, as it will be soon gone (when moving crw machine checks into the flic). Please note that this is the same way also KVM handles it: only one instance of a machine check can be pending at a time. So no need for a queue. While at it, make sure we try to deliver only if env->cregs[14] actually indicates that CRWs are accepted. Drop two unused defines on the way (we already have PSW_MASK_...). Signed-off-by: David Hildenbrand Message-Id: <20180129125623.21729-5-david@redhat.com> Signed-off-by: Cornelia Huck --- target/s390x/cpu.h | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'target/s390x/cpu.h') diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index a1123ad621..f32a5ad6c9 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -54,10 +54,6 @@ #define MMU_USER_IDX 0 #define MAX_IO_QUEUE 16 -#define MAX_MCHK_QUEUE 16 - -#define PSW_MCHK_MASK 0x0004000000000000 -#define PSW_IO_MASK 0x0200000000000000 #define S390_MAX_CPUS 248 @@ -73,10 +69,6 @@ typedef struct IOIntQueue { uint32_t word; } IOIntQueue; -typedef struct MchkQueue { - uint16_t type; -} MchkQueue; - struct CPUS390XState { uint64_t regs[16]; /* GP registers */ /* @@ -123,14 +115,12 @@ struct CPUS390XState { uint64_t cregs[16]; /* control registers */ IOIntQueue io_queue[MAX_IO_QUEUE][8]; - MchkQueue mchk_queue[MAX_MCHK_QUEUE]; int pending_int; uint32_t service_param; uint16_t external_call_addr; DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS); int io_index[8]; - int mchk_index; uint64_t ckc; uint64_t cputm; -- cgit v1.2.3