target/microblaze: Fill in VMStateDescription for cpu

Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2020-09-02 21:41:00 -07:00
parent de73ee1abe
commit 77f63e1dad
4 changed files with 115 additions and 8 deletions

View File

@ -26,7 +26,6 @@
#include "cpu.h" #include "cpu.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "migration/vmstate.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "fpu/softfloat-helpers.h" #include "fpu/softfloat-helpers.h"
@ -251,11 +250,6 @@ static void mb_cpu_initfn(Object *obj)
#endif #endif
} }
static const VMStateDescription vmstate_mb_cpu = {
.name = "cpu",
.unmigratable = 1,
};
static Property mb_properties[] = { static Property mb_properties[] = {
DEFINE_PROP_UINT32("base-vectors", MicroBlazeCPU, cfg.base_vectors, 0), DEFINE_PROP_UINT32("base-vectors", MicroBlazeCPU, cfg.base_vectors, 0),
DEFINE_PROP_BOOL("use-stack-protection", MicroBlazeCPU, cfg.stackprot, DEFINE_PROP_BOOL("use-stack-protection", MicroBlazeCPU, cfg.stackprot,
@ -335,8 +329,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
cc->do_transaction_failed = mb_cpu_transaction_failed; cc->do_transaction_failed = mb_cpu_transaction_failed;
cc->get_phys_page_debug = mb_cpu_get_phys_page_debug; cc->get_phys_page_debug = mb_cpu_get_phys_page_debug;
#endif
dc->vmsd = &vmstate_mb_cpu; dc->vmsd = &vmstate_mb_cpu;
#endif
device_class_set_props(dc, mb_properties); device_class_set_props(dc, mb_properties);
cc->gdb_num_core_regs = 32 + 27; cc->gdb_num_core_regs = 32 + 27;

View File

@ -429,4 +429,8 @@ static inline int cpu_mmu_index(CPUMBState *env, bool ifetch)
return MMU_KERNEL_IDX; return MMU_KERNEL_IDX;
} }
#ifndef CONFIG_USER_ONLY
extern const VMStateDescription vmstate_mb_cpu;
#endif
#endif #endif

106
target/microblaze/machine.c Normal file
View File

@ -0,0 +1,106 @@
/*
* Microblaze VMState for qemu.
*
* Copyright (c) 2020 Linaro, Ltd.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
#include "cpu.h"
#include "migration/cpu.h"
static VMStateField vmstate_mmu_fields[] = {
VMSTATE_UINT64_2DARRAY(rams, MicroBlazeMMU, 2, TLB_ENTRIES),
VMSTATE_UINT8_ARRAY(tids, MicroBlazeMMU, TLB_ENTRIES),
VMSTATE_UINT32_ARRAY(regs, MicroBlazeMMU, 3),
VMSTATE_END_OF_LIST()
};
static const VMStateDescription vmstate_mmu = {
.name = "mmu",
.version_id = 0,
.minimum_version_id = 0,
.fields = vmstate_mmu_fields,
};
static int get_msr(QEMUFile *f, void *opaque, size_t size,
const VMStateField *field)
{
CPUMBState *env = container_of(opaque, CPUMBState, msr);
mb_cpu_write_msr(env, qemu_get_be32(f));
return 0;
}
static int put_msr(QEMUFile *f, void *opaque, size_t size,
const VMStateField *field, QJSON *vmdesc)
{
CPUMBState *env = container_of(opaque, CPUMBState, msr);
qemu_put_be32(f, mb_cpu_read_msr(env));
return 0;
}
static const VMStateInfo vmstate_msr = {
.name = "msr",
.get = get_msr,
.put = put_msr,
};
static VMStateField vmstate_env_fields[] = {
VMSTATE_UINT32_ARRAY(regs, CPUMBState, 32),
VMSTATE_UINT32(pc, CPUMBState),
VMSTATE_SINGLE(msr, CPUMBState, 0, vmstate_msr, uint32_t),
VMSTATE_UINT32(esr, CPUMBState),
VMSTATE_UINT32(fsr, CPUMBState),
VMSTATE_UINT32(btr, CPUMBState),
VMSTATE_UINT32(edr, CPUMBState),
VMSTATE_UINT32(slr, CPUMBState),
VMSTATE_UINT32(shr, CPUMBState),
VMSTATE_UINT64(ear, CPUMBState),
VMSTATE_UINT32(btarget, CPUMBState),
VMSTATE_UINT32(imm, CPUMBState),
VMSTATE_UINT32(iflags, CPUMBState),
VMSTATE_UINT32(res_val, CPUMBState),
VMSTATE_UINTTL(res_addr, CPUMBState),
VMSTATE_STRUCT(mmu, CPUMBState, 0, vmstate_mmu, MicroBlazeMMU),
VMSTATE_END_OF_LIST()
};
static const VMStateDescription vmstate_env = {
.name = "env",
.version_id = 0,
.minimum_version_id = 0,
.fields = vmstate_env_fields,
};
static VMStateField vmstate_cpu_fields[] = {
VMSTATE_CPU(),
VMSTATE_STRUCT(env, MicroBlazeCPU, 1, vmstate_env, CPUMBState),
VMSTATE_END_OF_LIST()
};
const VMStateDescription vmstate_mb_cpu = {
.name = "cpu",
.version_id = 0,
.minimum_version_id = 0,
.fields = vmstate_cpu_fields,
};

View File

@ -11,7 +11,10 @@ microblaze_ss.add(files(
)) ))
microblaze_softmmu_ss = ss.source_set() microblaze_softmmu_ss = ss.source_set()
microblaze_softmmu_ss.add(files('mmu.c')) microblaze_softmmu_ss.add(files(
'mmu.c',
'machine.c',
))
target_arch += {'microblaze': microblaze_ss} target_arch += {'microblaze': microblaze_ss}
target_softmmu_arch += {'microblaze': microblaze_softmmu_ss} target_softmmu_arch += {'microblaze': microblaze_softmmu_ss}