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

!52 Add kvm_adjvtimer vcpu property for Cortex-A72

Browse Source 
Merge pull request !52 from FangYing/openEuler-20.03-LTS
This commit is contained in:
openeuler-ci-bot 2020-05-29 14:08:03 +08:00 committed by Gitee
commit 65a86d3003
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qemu.spec
View File

@ -1,6 +1,6 @@
Name: qemu Name: qemu
Version: 4.1.0 Version: 4.1.0
Release: 12 Release: 13
Epoch: 2 Epoch: 2
Summary: QEMU is a generic and open source machine emulator and virtualizer Summary: QEMU is a generic and open source machine emulator and virtualizer
License: GPLv2 and BSD and MIT and CC-BY License: GPLv2 and BSD and MIT and CC-BY
@ -173,7 +173,7 @@ 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 Patch0164: target-arm-Add-the-kvm_adjvtime-vcpu-property-for-Co.patch
BuildRequires: flex BuildRequires: flex
BuildRequires: bison BuildRequires: bison
@ -519,8 +519,8 @@ getent passwd qemu >/dev/null || \
%endif %endif
%changelog %changelog
* Thu May 28 2020Huawei Technologies Co., Ltd. <zhang.zhanghailiang@huawei.com> * Fri May 29 Huawei Technologies Co., Ltd <fangying1@huawei.com>
- target/arm/cpu64: cpu64 cpus have timer reigster - target/arm: Add the kvm_adjvtime vcpu property for Cortex-A72
* 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"
@ -530,7 +530,7 @@ getent passwd qemu >/dev/null || \
- vtimer: Drop vtimer virtual timer adjust - vtimer: Drop vtimer virtual timer adjust
* Fri May 22 2020 Huawei Technologies Co., Ltd. <fangying1@huawei.com> * Fri May 22 2020 Huawei Technologies Co., Ltd. <fangying1@huawei.com>
- ip_reass: Fix use after free - ip_reass: Fix use after free
- bt: use size_t type for length parameters instead of int - bt: use size_t type for length parameters instead of int
- log: Add some logs on VM runtime path - log: Add some logs on VM runtime path

27
target-arm-Add-the-kvm_adjvtime-vcpu-property-for-Co.patch Normal file
View File

@ -0,0 +1,27 @@
From 427975fbc87c3d999ee4d13b65a95ba496c148d6 Mon Sep 17 00:00:00 2001
From: Ying Fang <fangying1@huawei.com>
Date: Fri, 29 May 2020 11:02:44 +0800
Subject: [PATCH] target/arm: Add the kvm_adjvtime vcpu property for Cortex-A72
Add the kvm_adjvtime vcpu property for ARM Cortex-A72 cpu model,
so that virtual time adjust will be enabled for it.
Signed-off-by: Ying Fang <fangying1@huawei.com>
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index b30ca7c9..15f4ee92 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -257,6 +257,9 @@ static void aarch64_a72_initfn(Object *obj)
cpu->gic_vpribits = 5;
cpu->gic_vprebits = 5;
define_arm_cp_regs(cpu, cortex_a72_a57_a53_cp_reginfo);
+ if(kvm_enabled()) {
+ kvm_arm_add_vcpu_properties(obj);
+ }
}
static void aarch64_kunpeng_920_initfn(Object *obj)
--
2.23.0

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