diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-05-17 12:51:30 +0200 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-05-26 15:33:59 -0700 |
| commit | c2cf139d9c2f8f8b86686fe0e94a9daba27195a6 (patch) | |
| tree | b686f121b39352e183751ff94faeacca8531ef65 /target/avr | |
| parent | 744c72a837a0428f2d5373793e42aba963bf47c6 (diff) | |
| download | qemu-c2cf139d9c2f8f8b86686fe0e94a9daba27195a6.zip qemu-c2cf139d9c2f8f8b86686fe0e94a9daba27195a6.tar.gz qemu-c2cf139d9c2f8f8b86686fe0e94a9daba27195a6.tar.bz2 | |
cpu: Move AVR target vmsd field from CPUClass to DeviceClass
See rationale in previous commit. Targets should use the vmsd field
of DeviceClass, not CPUClass. As migration is not important on the
AVR target, break the migration compatibility and set the DeviceClass
vmsd field. To feel safer, increment the vmstate version.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210517105140.1062037-14-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/avr')
| -rw-r--r-- | target/avr/cpu.c | 2 | ||||
| -rw-r--r-- | target/avr/machine.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 37a8ebc..3353bcb 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -213,7 +213,7 @@ static void avr_cpu_class_init(ObjectClass *oc, void *data) cc->set_pc = avr_cpu_set_pc; cc->memory_rw_debug = avr_cpu_memory_rw_debug; cc->get_phys_page_debug = avr_cpu_get_phys_page_debug; - cc->legacy_vmsd = &vms_avr_cpu; + dc->vmsd = &vms_avr_cpu; cc->disas_set_info = avr_cpu_disas_set_info; cc->gdb_read_register = avr_cpu_gdb_read_register; cc->gdb_write_register = avr_cpu_gdb_write_register; diff --git a/target/avr/machine.c b/target/avr/machine.c index de264f5..16f7a3e 100644 --- a/target/avr/machine.c +++ b/target/avr/machine.c @@ -98,8 +98,8 @@ static const VMStateInfo vms_eind = { const VMStateDescription vms_avr_cpu = { .name = "cpu", - .version_id = 0, - .minimum_version_id = 0, + .version_id = 1, + .minimum_version_id = 1, .fields = (VMStateField[]) { VMSTATE_UINT32(env.pc_w, AVRCPU), VMSTATE_UINT32(env.sp, AVRCPU), |