38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
|
From ced290d644a00e18e70046194d042bcaa2703b65 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ying Fang <fangying1@huawei.com>
|
||
|
|
Date: Wed, 27 May 2020 11:16:53 +0800
|
||
|
|
Subject: [PATCH] Revert: "vtimer: compat cross version migration from v4.0.1"
|
||
|
|
|
||
|
|
This reverts commit patch:
|
||
|
|
vtimer-compat-cross-version-migration-from-v4.0.1.patch
|
||
|
|
|
||
|
|
Signed-off-by: Ying Fang <fangying1@huawei.com>
|
||
|
|
|
||
|
|
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
|
||
|
|
index 2609113d..86eb79cd 100644
|
||
|
|
--- a/target/arm/cpu.h
|
||
|
|
+++ b/target/arm/cpu.h
|
||
|
|
@@ -261,7 +261,6 @@ 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 {
|
||
|
|
diff --git a/target/arm/machine.c b/target/arm/machine.c
|
||
|
|
index ec28b839..ee3c59a6 100644
|
||
|
|
--- a/target/arm/machine.c
|
||
|
|
+++ b/target/arm/machine.c
|
||
|
|
@@ -814,7 +814,6 @@ 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),
|
||
|
|
{
|
||
|
|
--
|
||
|
|
2.23.0
|
||
|
|
|