From 409590df6a85f55076bf126db8d8e634e5252f68 Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Wed, 27 May 2020 11:35:14 +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 --- ...mpat-cross-version-migration-from-v4.patch | 37 +++++++++++++++++++ qemu.spec | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 Revert-vtimer-compat-cross-version-migration-from-v4.patch diff --git a/Revert-vtimer-compat-cross-version-migration-from-v4.patch b/Revert-vtimer-compat-cross-version-migration-from-v4.patch new file mode 100644 index 0000000..082f176 --- /dev/null +++ b/Revert-vtimer-compat-cross-version-migration-from-v4.patch @@ -0,0 +1,37 @@ +From ced290d644a00e18e70046194d042bcaa2703b65 Mon Sep 17 00:00:00 2001 +From: Ying Fang +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 + +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 + diff --git a/qemu.spec b/qemu.spec index 1a9cb33..ebaf85b 100644 --- a/qemu.spec +++ b/qemu.spec @@ -168,6 +168,7 @@ Patch0155: slirp-tftp-restrict-relative-path-access.patch Patch0156: ip_reass-Fix-use-after-free.patch Patch0157: bt-use-size_t-type-for-length-parameters-instead-of-.patch Patch0158: log-Add-some-logs-on-VM-runtime-path.patch +Patch0159: Revert-vtimer-compat-cross-version-migration-from-v4.patch BuildRequires: flex BuildRequires: bison @@ -513,6 +514,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Wed May 27 2020 Huawei Technologies Co., Ltd. +- Revert: "vtimer: compat cross version migration from v4.0.1" + * Fri May 22 2020 Huawei Technologies Co., Ltd. - ip_reass: Fix use after free - bt: use size_t type for length parameters instead of int