packages/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "target/arm: add ths missing GENERIC_TIMER"

Browse Source 
This reverts commit 665d6b61fd86629272885e281410f512f8e7f32e.
This commit is contained in:
Ying Fang 2020-05-29 10:56:20 +08:00
parent ad7a2e0d04
commit 24dd460ad6
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qemu.spec
View File

@ -173,7 +173,6 @@ Patch0160: ARM64-record-vtimer-tick-when-cpu-is-stopped.patch
Patch0161: hw-arm-virt-add-missing-compat-for-kvm-no-adjvtime.patch Patch0161: hw-arm-virt-add-missing-compat-for-kvm-no-adjvtime.patch
Patch0162: migration-Compat-virtual-timer-adjust-for-v4.0.1-and.patch Patch0162: migration-Compat-virtual-timer-adjust-for-v4.0.1-and.patch
Patch0163: vtimer-Drop-vtimer-virtual-timer-adjust.patch Patch0163: vtimer-Drop-vtimer-virtual-timer-adjust.patch
Patch0164: target-arm-cpu64-cpu64-cpus-have-timer-reigster.patch
BuildRequires: flex BuildRequires: flex
BuildRequires: bison BuildRequires: bison
@ -519,9 +518,6 @@ getent passwd qemu >/dev/null || \
%endif %endif
%changelog %changelog
* Thu May 28 2020Huawei Technologies Co., Ltd. <zhang.zhanghailiang@huawei.com>
- target/arm/cpu64: cpu64 cpus have timer reigster
* Wed May 27 2020 Huawei Technologies Co., Ltd. <fangying1@huawei.com> * Wed May 27 2020 Huawei Technologies Co., Ltd. <fangying1@huawei.com>
- Revert: "vtimer: compat cross version migration from v4.0.1" - Revert: "vtimer: compat cross version migration from v4.0.1"
- ARM64: record vtimer tick when cpu is stopped - ARM64: record vtimer tick when cpu is stopped

27
target-arm-cpu64-cpu64-cpus-have-timer-reigster.patch
View File

@ -1,27 +0,0 @@
From 5d5b61652225c84ac2f34d65ae01aeb2f8c683e6 Mon Sep 17 00:00:00 2001
From: zhanghailiang <zhang.zhanghailiang@huawei.com>
Date: Thu, 28 May 2020 20:10:19 +0800
Subject: [PATCH] target/arm/cpu64: cpu64 cpus have timer reigster
Add the missing GENERIC_TIMER feature to cpu64 cpu.
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
---
target/arm/cpu64.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index b30ca7c9..162713d7 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -221,6 +221,7 @@ static void aarch64_a72_initfn(Object *obj)
set_feature(&cpu->env, ARM_FEATURE_EL2);
set_feature(&cpu->env, ARM_FEATURE_EL3);
set_feature(&cpu->env, ARM_FEATURE_PMU);
+ set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER);
cpu->midr = 0x410fd083;
cpu->revidr = 0x00000000;
cpu->reset_fpsid = 0x41034080;
--
2.23.0