[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/6] target/s390x/cpu_models: Drop local @err in get_max_cpu_mode
From: |
Zhao Liu |
Subject: |
[PATCH 4/6] target/s390x/cpu_models: Drop local @err in get_max_cpu_model() |
Date: |
Fri, 19 Apr 2024 14:57:10 +0800 |
From: Zhao Liu <zhao1.liu@intel.com>
Use @errp to fetech error information directly and drop the local
virable @err.
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 a0e4acb707d7..aae452cfd3fc 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -551,7 +551,6 @@ static bool check_compatibility(const S390CPUModel
*max_model,
S390CPUModel *get_max_cpu_model(Error **errp)
{
- Error *err = NULL;
static S390CPUModel max_model;
static bool cached;
@@ -560,8 +559,7 @@ S390CPUModel *get_max_cpu_model(Error **errp)
}
if (kvm_enabled()) {
- if (!kvm_s390_get_host_cpu_model(&max_model, &err)) {
- error_propagate(errp, err);
+ if (!kvm_s390_get_host_cpu_model(&max_model, errp)) {
return NULL;
}
} else {
--
2.34.1
- [PATCH 2/6] target/s390x/cpu_model: Drop local @err in s390_realize_cpu_model(), (continued)
[PATCH 4/6] target/s390x/cpu_models: Drop local @err in get_max_cpu_model(),
Zhao Liu <=
[PATCH 6/6] target/s390x/cpu_models_sysemu: Drop local @err in apply_cpu_model(), Zhao Liu, 2024/04/19
[PATCH 5/6] target/s390x/cpu_models: Make kvm_s390_apply_cpu_model() return boolean, Zhao Liu, 2024/04/19
Re: [PATCH 0/6] s390x/cpu_models: Misc cleanup on returned error code and local @err variables, Philippe Mathieu-Daudé, 2024/04/19