[qemu.git] / target / s390x / machine.c

/*
 * S390x machine definitions and functions
 *
 * Copyright IBM Corp. 2014, 2018
 *
 * Authors:
 *   Thomas Huth <[email protected]>
 *   Christian Borntraeger <[email protected]>
 *   Jason J. Herne <[email protected]>
 *
 * This work is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published
 * by the Free Software Foundation; either version 2 of the License,
 * or (at your option) any later version.
 */

#include "qemu/osdep.h"
#include "hw/hw.h"
#include "cpu.h"
#include "internal.h"
#include "kvm_s390x.h"
#include "tcg_s390x.h"
#include "sysemu/kvm.h"

static int cpu_post_load(void *opaque, int version_id)
{
    S390CPU *cpu = opaque;

    /*
     * As the cpu state is pushed to kvm via kvm_set_mp_state rather
     * than via cpu_synchronize_state, we need update kvm here.
     */
    if (kvm_enabled()) {
        kvm_s390_set_cpu_state(cpu, cpu->env.cpu_state);
        return kvm_s390_vcpu_interrupt_post_load(cpu);
    }

    if (tcg_enabled()) {
        /* Rearm the CKC timer if necessary */
        tcg_s390_tod_updated(CPU(cpu), RUN_ON_CPU_NULL);
    }

    return 0;
}

static int cpu_pre_save(void *opaque)
{
    S390CPU *cpu = opaque;

    if (kvm_enabled()) {
        kvm_s390_vcpu_interrupt_pre_save(cpu);
    }

    return 0;
}

static inline bool fpu_needed(void *opaque)
{
    /* This looks odd, but we might want to NOT transfer fprs in the future */
    return true;
}

static const VMStateDescription vmstate_fpu = {
    .name = "cpu/fpu",
    .version_id = 1,
    .minimum_version_id = 1,
    .needed = fpu_needed,
    .fields = (VMStateField[]) {
        VMSTATE_UINT64(env.vregs[0][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[1][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[2][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[3][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[4][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[5][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[6][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[7][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[8][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[9][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[10][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[11][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[12][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[13][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[14][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[15][0].ll, S390CPU),
        VMSTATE_UINT32(env.fpc, S390CPU),
        VMSTATE_END_OF_LIST()
    }
};

static bool vregs_needed(void *opaque)
{
    return s390_has_feat(S390_FEAT_VECTOR);
}

static const VMStateDescription vmstate_vregs = {
    .name = "cpu/vregs",
    .version_id = 1,
    .minimum_version_id = 1,
    .needed = vregs_needed,
    .fields = (VMStateField[]) {
        /* vregs[0][0] -> vregs[15][0] and fregs are overlays */
        VMSTATE_UINT64(env.vregs[16][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[17][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[18][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[19][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[20][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[21][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[22][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[23][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[24][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[25][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[26][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[27][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[28][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[29][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[30][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[31][0].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[0][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[1][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[2][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[3][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[4][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[5][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[6][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[7][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[8][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[9][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[10][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[11][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[12][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[13][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[14][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[15][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[16][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[17][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[18][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[19][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[20][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[21][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[22][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[23][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[24][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[25][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[26][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[27][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[28][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[29][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[30][1].ll, S390CPU),
        VMSTATE_UINT64(env.vregs[31][1].ll, S390CPU),
        VMSTATE_END_OF_LIST()
    }
};

static bool riccb_needed(void *opaque)
{
    return s390_has_feat(S390_FEAT_RUNTIME_INSTRUMENTATION);
}

const VMStateDescription vmstate_riccb = {
    .name = "cpu/riccb",
    .version_id = 1,
    .minimum_version_id = 1,
    .needed = riccb_needed,
    .fields = (VMStateField[]) {
        VMSTATE_UINT8_ARRAY(env.riccb, S390CPU, 64),
        VMSTATE_END_OF_LIST()
    }
};

static bool exval_needed(void *opaque)
{
    S390CPU *cpu = opaque;
    return cpu->env.ex_value != 0;
}

const VMStateDescription vmstate_exval = {
    .name = "cpu/exval",
    .version_id = 1,
    .minimum_version_id = 1,
    .needed = exval_needed,
    .fields = (VMStateField[]) {
        VMSTATE_UINT64(env.ex_value, S390CPU),
        VMSTATE_END_OF_LIST()
    }
};

static bool gscb_needed(void *opaque)
{
    return s390_has_feat(S390_FEAT_GUARDED_STORAGE);
}

const VMStateDescription vmstate_gscb = {
    .name = "cpu/gscb",
    .version_id = 1,
    .minimum_version_id = 1,
    .needed = gscb_needed,
    .fields = (VMStateField[]) {
        VMSTATE_UINT64_ARRAY(env.gscb, S390CPU, 4),
        VMSTATE_END_OF_LIST()
        }
};

static bool bpbc_needed(void *opaque)
{
    return s390_has_feat(S390_FEAT_BPB);
}

const VMStateDescription vmstate_bpbc = {
    .name = "cpu/bpbc",
    .version_id = 1,
    .minimum_version_id = 1,
    .needed = bpbc_needed,
    .fields = (VMStateField[]) {
        VMSTATE_BOOL(env.bpbc, S390CPU),
        VMSTATE_END_OF_LIST()
    }
};

static bool etoken_needed(void *opaque)
{
    return s390_has_feat(S390_FEAT_ETOKEN);
}

const VMStateDescription vmstate_etoken = {
    .name = "cpu/etoken",
    .version_id = 1,
    .minimum_version_id = 1,
    .needed = etoken_needed,
    .fields = (VMStateField[]) {
        VMSTATE_UINT64(env.etoken, S390CPU),
        VMSTATE_UINT64(env.etoken_extension, S390CPU),
        VMSTATE_END_OF_LIST()
    }
};

const VMStateDescription vmstate_s390_cpu = {
    .name = "cpu",
    .post_load = cpu_post_load,
    .pre_save = cpu_pre_save,
    .version_id = 4,
    .minimum_version_id = 3,
    .fields      = (VMStateField[]) {
        VMSTATE_UINT64_ARRAY(env.regs, S390CPU, 16),
        VMSTATE_UINT64(env.psw.mask, S390CPU),
        VMSTATE_UINT64(env.psw.addr, S390CPU),
        VMSTATE_UINT64(env.psa, S390CPU),
        VMSTATE_UINT32(env.todpr, S390CPU),
        VMSTATE_UINT64(env.pfault_token, S390CPU),
        VMSTATE_UINT64(env.pfault_compare, S390CPU),
        VMSTATE_UINT64(env.pfault_select, S390CPU),
        VMSTATE_UINT64(env.cputm, S390CPU),
        VMSTATE_UINT64(env.ckc, S390CPU),
        VMSTATE_UINT64(env.gbea, S390CPU),
        VMSTATE_UINT64(env.pp, S390CPU),
        VMSTATE_UINT32_ARRAY(env.aregs, S390CPU, 16),
        VMSTATE_UINT64_ARRAY(env.cregs, S390CPU, 16),
        VMSTATE_UINT8(env.cpu_state, S390CPU),
        VMSTATE_UINT8(env.sigp_order, S390CPU),
        VMSTATE_UINT32_V(irqstate_saved_size, S390CPU, 4),
        VMSTATE_VBUFFER_UINT32(irqstate, S390CPU, 4, NULL,
                               irqstate_saved_size),
        VMSTATE_END_OF_LIST()
    },
    .subsections = (const VMStateDescription*[]) {
        &vmstate_fpu,
        &vmstate_vregs,
        &vmstate_riccb,
        &vmstate_exval,
        &vmstate_gscb,
        &vmstate_bpbc,
        &vmstate_etoken,
        NULL
    },
};
Commit	Line	Data
ef1df130 TH	1	/*
	2	* S390x machine definitions and functions
	3	*
27e84d4e	4	* Copyright IBM Corp. 2014, 2018
ef1df130 TH	5	*
	6	* Authors:
	7	* Thomas Huth <[email protected]>
	8	* Christian Borntraeger <[email protected]>
	9	* Jason J. Herne <[email protected]>
	10	*
	11	* This work is free software; you can redistribute it and/or modify
	12	* it under the terms of the GNU General Public License as published
	13	* by the Free Software Foundation; either version 2 of the License,
	14	* or (at your option) any later version.
	15	*/
	16
9615495a	17	#include "qemu/osdep.h"
ef1df130 TH	18	#include "hw/hw.h"
ef1df130 TH	19	#include "cpu.h"
4e58b838	20	#include "internal.h"
f16bbb9b	21	#include "kvm_s390x.h"
7c12f710	22	#include "tcg_s390x.h"
ef1df130 TH	23	#include "sysemu/kvm.h"
	24
	25	static int cpu_post_load(void *opaque, int version_id)
	26	{
	27	S390CPU *cpu = opaque;
	28
	29	/*
	30	* As the cpu state is pushed to kvm via kvm_set_mp_state rather
	31	* than via cpu_synchronize_state, we need update kvm here.
	32	*/
	33	if (kvm_enabled()) {
	34	kvm_s390_set_cpu_state(cpu, cpu->env.cpu_state);
3cda44f7	35	return kvm_s390_vcpu_interrupt_post_load(cpu);
ef1df130 TH	36	}
ef1df130 TH	37
7c12f710 DH	38	if (tcg_enabled()) {
	39	/* Rearm the CKC timer if necessary */
	40	tcg_s390_tod_updated(CPU(cpu), RUN_ON_CPU_NULL);
	41	}
	42
ef1df130 TH	43	return 0;
ef1df130 TH	44	}
303c681a	45
44b1ff31	46	static int cpu_pre_save(void *opaque)
3cda44f7 JF	47	{
	48	S390CPU *cpu = opaque;
	49
	50	if (kvm_enabled()) {
	51	kvm_s390_vcpu_interrupt_pre_save(cpu);
	52	}
44b1ff31 DDAG	53
44b1ff31 DDAG	54	return 0;
3cda44f7	55	}
ef1df130	56
5cd8cada JQ	57	static inline bool fpu_needed(void *opaque)
	58	{
	59	/* This looks odd, but we might want to NOT transfer fprs in the future */
	60	return true;
	61	}
	62
52c6cfb7	63	static const VMStateDescription vmstate_fpu = {
46c804de DH	64	.name = "cpu/fpu",
	65	.version_id = 1,
	66	.minimum_version_id = 1,
5cd8cada	67	.needed = fpu_needed,
46c804de	68	.fields = (VMStateField[]) {
fcb79802 EF	69	VMSTATE_UINT64(env.vregs[0][0].ll, S390CPU),
	70	VMSTATE_UINT64(env.vregs[1][0].ll, S390CPU),
	71	VMSTATE_UINT64(env.vregs[2][0].ll, S390CPU),
	72	VMSTATE_UINT64(env.vregs[3][0].ll, S390CPU),
	73	VMSTATE_UINT64(env.vregs[4][0].ll, S390CPU),
	74	VMSTATE_UINT64(env.vregs[5][0].ll, S390CPU),
	75	VMSTATE_UINT64(env.vregs[6][0].ll, S390CPU),
	76	VMSTATE_UINT64(env.vregs[7][0].ll, S390CPU),
	77	VMSTATE_UINT64(env.vregs[8][0].ll, S390CPU),
	78	VMSTATE_UINT64(env.vregs[9][0].ll, S390CPU),
	79	VMSTATE_UINT64(env.vregs[10][0].ll, S390CPU),
	80	VMSTATE_UINT64(env.vregs[11][0].ll, S390CPU),
	81	VMSTATE_UINT64(env.vregs[12][0].ll, S390CPU),
	82	VMSTATE_UINT64(env.vregs[13][0].ll, S390CPU),
	83	VMSTATE_UINT64(env.vregs[14][0].ll, S390CPU),
	84	VMSTATE_UINT64(env.vregs[15][0].ll, S390CPU),
46c804de DH	85	VMSTATE_UINT32(env.fpc, S390CPU),
	86	VMSTATE_END_OF_LIST()
	87	}
	88	};
	89
b01501db PB	90	static bool vregs_needed(void *opaque)
b01501db PB	91	{
7c72ac49	92	return s390_has_feat(S390_FEAT_VECTOR);
b01501db PB	93	}
b01501db PB	94
52c6cfb7	95	static const VMStateDescription vmstate_vregs = {
b2ac0ff5 EF	96	.name = "cpu/vregs",
	97	.version_id = 1,
	98	.minimum_version_id = 1,
5cd8cada	99	.needed = vregs_needed,
b2ac0ff5 EF	100	.fields = (VMStateField[]) {
	101	/* vregs[0][0] -> vregs[15][0] and fregs are overlays */
	102	VMSTATE_UINT64(env.vregs[16][0].ll, S390CPU),
	103	VMSTATE_UINT64(env.vregs[17][0].ll, S390CPU),
	104	VMSTATE_UINT64(env.vregs[18][0].ll, S390CPU),
	105	VMSTATE_UINT64(env.vregs[19][0].ll, S390CPU),
	106	VMSTATE_UINT64(env.vregs[20][0].ll, S390CPU),
	107	VMSTATE_UINT64(env.vregs[21][0].ll, S390CPU),
	108	VMSTATE_UINT64(env.vregs[22][0].ll, S390CPU),
	109	VMSTATE_UINT64(env.vregs[23][0].ll, S390CPU),
	110	VMSTATE_UINT64(env.vregs[24][0].ll, S390CPU),
	111	VMSTATE_UINT64(env.vregs[25][0].ll, S390CPU),
	112	VMSTATE_UINT64(env.vregs[26][0].ll, S390CPU),
	113	VMSTATE_UINT64(env.vregs[27][0].ll, S390CPU),
	114	VMSTATE_UINT64(env.vregs[28][0].ll, S390CPU),
	115	VMSTATE_UINT64(env.vregs[29][0].ll, S390CPU),
	116	VMSTATE_UINT64(env.vregs[30][0].ll, S390CPU),
	117	VMSTATE_UINT64(env.vregs[31][0].ll, S390CPU),
	118	VMSTATE_UINT64(env.vregs[0][1].ll, S390CPU),
	119	VMSTATE_UINT64(env.vregs[1][1].ll, S390CPU),
	120	VMSTATE_UINT64(env.vregs[2][1].ll, S390CPU),
	121	VMSTATE_UINT64(env.vregs[3][1].ll, S390CPU),
	122	VMSTATE_UINT64(env.vregs[4][1].ll, S390CPU),
	123	VMSTATE_UINT64(env.vregs[5][1].ll, S390CPU),
	124	VMSTATE_UINT64(env.vregs[6][1].ll, S390CPU),
	125	VMSTATE_UINT64(env.vregs[7][1].ll, S390CPU),
	126	VMSTATE_UINT64(env.vregs[8][1].ll, S390CPU),
	127	VMSTATE_UINT64(env.vregs[9][1].ll, S390CPU),
	128	VMSTATE_UINT64(env.vregs[10][1].ll, S390CPU),
	129	VMSTATE_UINT64(env.vregs[11][1].ll, S390CPU),
	130	VMSTATE_UINT64(env.vregs[12][1].ll, S390CPU),
	131	VMSTATE_UINT64(env.vregs[13][1].ll, S390CPU),
	132	VMSTATE_UINT64(env.vregs[14][1].ll, S390CPU),
	133	VMSTATE_UINT64(env.vregs[15][1].ll, S390CPU),
	134	VMSTATE_UINT64(env.vregs[16][1].ll, S390CPU),
	135	VMSTATE_UINT64(env.vregs[17][1].ll, S390CPU),
	136	VMSTATE_UINT64(env.vregs[18][1].ll, S390CPU),
	137	VMSTATE_UINT64(env.vregs[19][1].ll, S390CPU),
	138	VMSTATE_UINT64(env.vregs[20][1].ll, S390CPU),
	139	VMSTATE_UINT64(env.vregs[21][1].ll, S390CPU),
	140	VMSTATE_UINT64(env.vregs[22][1].ll, S390CPU),
	141	VMSTATE_UINT64(env.vregs[23][1].ll, S390CPU),
	142	VMSTATE_UINT64(env.vregs[24][1].ll, S390CPU),
	143	VMSTATE_UINT64(env.vregs[25][1].ll, S390CPU),
	144	VMSTATE_UINT64(env.vregs[26][1].ll, S390CPU),
	145	VMSTATE_UINT64(env.vregs[27][1].ll, S390CPU),
	146	VMSTATE_UINT64(env.vregs[28][1].ll, S390CPU),
	147	VMSTATE_UINT64(env.vregs[29][1].ll, S390CPU),
	148	VMSTATE_UINT64(env.vregs[30][1].ll, S390CPU),
	149	VMSTATE_UINT64(env.vregs[31][1].ll, S390CPU),
	150	VMSTATE_END_OF_LIST()
	151	}
	152	};
	153
b01501db PB	154	static bool riccb_needed(void *opaque)
b01501db PB	155	{
7c72ac49	156	return s390_has_feat(S390_FEAT_RUNTIME_INSTRUMENTATION);
b01501db PB	157	}
b01501db PB	158
9700230b FZ	159	const VMStateDescription vmstate_riccb = {
	160	.name = "cpu/riccb",
	161	.version_id = 1,
	162	.minimum_version_id = 1,
	163	.needed = riccb_needed,
	164	.fields = (VMStateField[]) {
	165	VMSTATE_UINT8_ARRAY(env.riccb, S390CPU, 64),
	166	VMSTATE_END_OF_LIST()
	167	}
	168	};
	169
303c681a RH	170	static bool exval_needed(void *opaque)
	171	{
	172	S390CPU *cpu = opaque;
	173	return cpu->env.ex_value != 0;
	174	}
	175
	176	const VMStateDescription vmstate_exval = {
	177	.name = "cpu/exval",
	178	.version_id = 1,
	179	.minimum_version_id = 1,
	180	.needed = exval_needed,
	181	.fields = (VMStateField[]) {
	182	VMSTATE_UINT64(env.ex_value, S390CPU),
	183	VMSTATE_END_OF_LIST()
	184	}
	185	};
	186
62deb62d FZ	187	static bool gscb_needed(void *opaque)
62deb62d FZ	188	{
0280b3eb	189	return s390_has_feat(S390_FEAT_GUARDED_STORAGE);
62deb62d FZ	190	}
	191
	192	const VMStateDescription vmstate_gscb = {
	193	.name = "cpu/gscb",
	194	.version_id = 1,
	195	.minimum_version_id = 1,
	196	.needed = gscb_needed,
	197	.fields = (VMStateField[]) {
	198	VMSTATE_UINT64_ARRAY(env.gscb, S390CPU, 4),
	199	VMSTATE_END_OF_LIST()
	200	}
	201	};
	202
b073c875 CB	203	static bool bpbc_needed(void *opaque)
	204	{
	205	return s390_has_feat(S390_FEAT_BPB);
	206	}
	207
	208	const VMStateDescription vmstate_bpbc = {
	209	.name = "cpu/bpbc",
	210	.version_id = 1,
	211	.minimum_version_id = 1,
	212	.needed = bpbc_needed,
	213	.fields = (VMStateField[]) {
	214	VMSTATE_BOOL(env.bpbc, S390CPU),
	215	VMSTATE_END_OF_LIST()
	216	}
	217	};
	218
27e84d4e CB	219	static bool etoken_needed(void *opaque)
	220	{
	221	return s390_has_feat(S390_FEAT_ETOKEN);
	222	}
	223
	224	const VMStateDescription vmstate_etoken = {
	225	.name = "cpu/etoken",
	226	.version_id = 1,
	227	.minimum_version_id = 1,
	228	.needed = etoken_needed,
	229	.fields = (VMStateField[]) {
	230	VMSTATE_UINT64(env.etoken, S390CPU),
	231	VMSTATE_UINT64(env.etoken_extension, S390CPU),
	232	VMSTATE_END_OF_LIST()
	233	}
	234	};
	235
46c804de DH	236	const VMStateDescription vmstate_s390_cpu = {
	237	.name = "cpu",
	238	.post_load = cpu_post_load,
3cda44f7 JF	239	.pre_save = cpu_pre_save,
3cda44f7 JF	240	.version_id = 4,
46c804de DH	241	.minimum_version_id = 3,
46c804de DH	242	.fields = (VMStateField[]) {
ef1df130 TH	243	VMSTATE_UINT64_ARRAY(env.regs, S390CPU, 16),
	244	VMSTATE_UINT64(env.psw.mask, S390CPU),
	245	VMSTATE_UINT64(env.psw.addr, S390CPU),
	246	VMSTATE_UINT64(env.psa, S390CPU),
ef1df130 TH	247	VMSTATE_UINT32(env.todpr, S390CPU),
	248	VMSTATE_UINT64(env.pfault_token, S390CPU),
	249	VMSTATE_UINT64(env.pfault_compare, S390CPU),
	250	VMSTATE_UINT64(env.pfault_select, S390CPU),
	251	VMSTATE_UINT64(env.cputm, S390CPU),
	252	VMSTATE_UINT64(env.ckc, S390CPU),
	253	VMSTATE_UINT64(env.gbea, S390CPU),
	254	VMSTATE_UINT64(env.pp, S390CPU),
	255	VMSTATE_UINT32_ARRAY(env.aregs, S390CPU, 16),
	256	VMSTATE_UINT64_ARRAY(env.cregs, S390CPU, 16),
	257	VMSTATE_UINT8(env.cpu_state, S390CPU),
18ff9494	258	VMSTATE_UINT8(env.sigp_order, S390CPU),
3cda44f7	259	VMSTATE_UINT32_V(irqstate_saved_size, S390CPU, 4),
59046ec2	260	VMSTATE_VBUFFER_UINT32(irqstate, S390CPU, 4, NULL,
3cda44f7	261	irqstate_saved_size),
ef1df130	262	VMSTATE_END_OF_LIST()
5cd8cada JQ	263	},
	264	.subsections = (const VMStateDescription*[]) {
	265	&vmstate_fpu,
	266	&vmstate_vregs,
9700230b	267	&vmstate_riccb,
303c681a	268	&vmstate_exval,
62deb62d	269	&vmstate_gscb,
b073c875	270	&vmstate_bpbc,
27e84d4e	271	&vmstate_etoken,
5cd8cada	272	NULL
46c804de	273	},
ef1df130	274	};