Commit 5a6163e4 authored May 08, 2020 by @zhanghailiang Committed by zhuyanting Jul 07, 2020

vtimer: compat cross version migration from v4.0.1



vtimer feature was added to qemu v4.0.1 to record timer tick when vcpu
is stopped. However this feature is discared and the new virtual time
adjustment is introduced.

This patch add the missing vtimer parameter to ARMCPUState in order
to compat cross version migration fromm v4.0.1 openEuler 2003 lts release.

Singed-off-by: Ying Fang <fangying1@huawei.com>

parent 95d7b5e1

target/arm/cpu.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -261,6 +261,8 @@ typedef struct CPUARMState {
		uint64_t elr_el[4]; /* AArch64 exception link regs */
		uint64_t sp_el[4]; /* AArch64 banked stack pointers */

		uint64_t vtimer; /* Timer tick when vcpu is stopped */

		/* System control coprocessor (cp15) */
		struct {
		uint32_t c0_cpuid;

target/arm/machine.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -814,6 +814,7 @@ const VMStateDescription vmstate_arm_cpu = {
		VMSTATE_UINT32(env.exception.syndrome, ARMCPU),
		VMSTATE_UINT32(env.exception.fsr, ARMCPU),
		VMSTATE_UINT64(env.exception.vaddress, ARMCPU),
		VMSTATE_UINT64(env.vtimer, ARMCPU),
		VMSTATE_TIMER_PTR(gt_timer[GTIMER_PHYS], ARMCPU),
		VMSTATE_TIMER_PTR(gt_timer[GTIMER_VIRT], ARMCPU),
		{