[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] target/s390x/cpu_model: Drop local @err in s390_realize_cpu_
From: |
Zhao Liu |
Subject: |
[PATCH 2/6] target/s390x/cpu_model: Drop local @err in s390_realize_cpu_model() |
Date: |
Fri, 19 Apr 2024 14:57:08 +0800 |
From: Zhao Liu <zhao1.liu@intel.com>
Use @errp to fetech error information directly and drop the local
virable @err.
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
target/s390x/cpu_models.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 8cb47d905fb4..052540a866ac 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -577,7 +577,6 @@ S390CPUModel *get_max_cpu_model(Error **errp)
void s390_realize_cpu_model(CPUState *cs, Error **errp)
{
ERRP_GUARD();
- Error *err = NULL;
S390CPUClass *xcc = S390_CPU_GET_CLASS(cs);
S390CPU *cpu = S390_CPU(cs);
const S390CPUModel *max_model;
@@ -606,8 +605,7 @@ void s390_realize_cpu_model(CPUState *cs, Error **errp)
cpu->model->cpu_ver = max_model->cpu_ver;
check_consistency(cpu->model);
- if (!check_compatibility(max_model, cpu->model, &err)) {
- error_propagate(errp, err);
+ if (!check_compatibility(max_model, cpu->model, errp)) {
return;
}
--
2.34.1
[PATCH 4/6] target/s390x/cpu_models: Drop local @err in get_max_cpu_model(), Zhao Liu, 2024/04/19