From cdc4c75a8b53981f3f8f272ea568d792c7dff963 Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Fri, 29 May 2020 10:56:20 +0800 Subject: [PATCH 1/3] Revert "target/arm: add ths missing GENERIC_TIMER" This reverts commit 665d6b61fd86629272885e281410f512f8e7f32e. --- qemu.spec | 4 --- ...cpu64-cpu64-cpus-have-timer-reigster.patch | 27 ------------------- 2 files changed, 31 deletions(-) delete mode 100644 target-arm-cpu64-cpu64-cpus-have-timer-reigster.patch diff --git a/qemu.spec b/qemu.spec index 5f54a45d..20d53de5 100644 --- a/qemu.spec +++ b/qemu.spec @@ -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 Patch0162: migration-Compat-virtual-timer-adjust-for-v4.0.1-and.patch Patch0163: vtimer-Drop-vtimer-virtual-timer-adjust.patch -Patch0164: target-arm-cpu64-cpu64-cpus-have-timer-reigster.patch BuildRequires: flex BuildRequires: bison @@ -519,9 +518,6 @@ getent passwd qemu >/dev/null || \ %endif %changelog -* Thu May 28 2020Huawei Technologies Co., Ltd. -- target/arm/cpu64: cpu64 cpus have timer reigster - * 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 diff --git a/target-arm-cpu64-cpu64-cpus-have-timer-reigster.patch b/target-arm-cpu64-cpu64-cpus-have-timer-reigster.patch deleted file mode 100644 index 0084f428..00000000 --- a/target-arm-cpu64-cpu64-cpus-have-timer-reigster.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5d5b61652225c84ac2f34d65ae01aeb2f8c683e6 Mon Sep 17 00:00:00 2001 -From: zhanghailiang -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 ---- - 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 - -- Gitee From 12087330c19f99e0d834b1ab900109fa681732cb Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Fri, 29 May 2020 11:15:45 +0800 Subject: [PATCH 2/3] 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 --- qemu.spec | 6 ++++- ...he-kvm_adjvtime-vcpu-property-for-Co.patch | 27 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 target-arm-Add-the-kvm_adjvtime-vcpu-property-for-Co.patch diff --git a/qemu.spec b/qemu.spec index 20d53de5..09d28c8a 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 00000000..49c7dc63 --- /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 + -- Gitee From dcba4d91a40f0ac3082c67f98f2e8e8e07c25243 Mon Sep 17 00:00:00 2001 From: Ying Fang Date: Fri, 29 May 2020 11:16:19 +0800 Subject: [PATCH 3/3] spec: Update release version increase release version by one Signed-off-by: Ying Fang --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 09d28c8a..579f5c2b 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 12 +Release: 13 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY -- Gitee