diff --git a/qemu.spec b/qemu.spec index 20d53de..09d28c8 100644 --- a/qemu.spec +++ b/qemu.spec @@ -173,6 +173,7 @@ Patch0160: ARM64-record-vtimer-tick-when-cpu-is-stopped.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 Patch0163: vtimer-Drop-vtimer-virtual-timer-adjust.patch +Patch0164: target-arm-Add-the-kvm_adjvtime-vcpu-property-for-Co.patch BuildRequires: flex BuildRequires: bison @@ -518,6 +519,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Fri May 29 Huawei Technologies Co., Ltd +- target/arm: Add the kvm_adjvtime vcpu property for Cortex-A72 + * Wed May 27 2020 Huawei Technologies Co., Ltd. - Revert: "vtimer: compat cross version migration from v4.0.1" - ARM64: record vtimer tick when cpu is stopped @@ -526,7 +530,7 @@ getent passwd qemu >/dev/null || \ - vtimer: Drop vtimer virtual timer adjust * Fri May 22 2020 Huawei Technologies Co., Ltd. -- ip_reass: Fix use after free +- ip_reass: Fix use after free - bt: use size_t type for length parameters instead of int - log: Add some logs on VM runtime path diff --git a/target-arm-Add-the-kvm_adjvtime-vcpu-property-for-Co.patch b/target-arm-Add-the-kvm_adjvtime-vcpu-property-for-Co.patch new file mode 100644 index 0000000..49c7dc6 --- /dev/null +++ b/target-arm-Add-the-kvm_adjvtime-vcpu-property-for-Co.patch @@ -0,0 +1,27 @@ +From 427975fbc87c3d999ee4d13b65a95ba496c148d6 Mon Sep 17 00:00:00 2001 +From: Ying Fang +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 + +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 +