[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/19] target/s390x/cpu_models: Drop local @err in get_max_cpu_mod
|
From: |
Thomas Huth |
|
Subject: |
[PULL 04/19] target/s390x/cpu_models: Drop local @err in get_max_cpu_model() |
|
Date: |
Tue, 30 Apr 2024 09:13:25 +0200 |
From: Zhao Liu <zhao1.liu@intel.com>
Use @errp to fetch error information directly and drop the local
variable @err.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240425031232.1586401-6-zhao1.liu@intel.com>
Signed-off-by: Thomas Huth <thuth@redhat.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 a0e4acb707..aae452cfd3 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.44.0
- [PULL 00/19] Misc patches (s390x clean-ups, fixes for crashes, ...), Thomas Huth, 2024/04/30
- [PULL 01/19] target/s390x/cpu_model: Make check_compatibility() return boolean, Thomas Huth, 2024/04/30
- [PULL 04/19] target/s390x/cpu_models: Drop local @err in get_max_cpu_model(),
Thomas Huth <=
- [PULL 05/19] target/s390x/cpu_models: Make kvm_s390_apply_cpu_model() return boolean, Thomas Huth, 2024/04/30
- [PULL 06/19] target/s390x/cpu_models_sysemu: Drop local @err in apply_cpu_model(), Thomas Huth, 2024/04/30
- [PULL 07/19] hw: misc: edu: fix 2 off-by-one errors, Thomas Huth, 2024/04/30
- [PULL 02/19] target/s390x/cpu_model: Drop local @err in s390_realize_cpu_model(), Thomas Huth, 2024/04/30
- [PULL 03/19] target/s390x/cpu_models: Make kvm_s390_get_host_cpu_model() return boolean, Thomas Huth, 2024/04/30
- [PULL 09/19] hw: misc: edu: use qemu_log_mask instead of hw_error, Thomas Huth, 2024/04/30
- [PULL 08/19] hw: misc: edu: rename local vars in edu_check_range, Thomas Huth, 2024/04/30
- [PULL 13/19] build-environment: make some packages optional, Thomas Huth, 2024/04/30
- [PULL 14/19] gitlab: migrate the s390x custom machine to 22.04, Thomas Huth, 2024/04/30
- [PULL 12/19] hw/char/stm32l4x5_usart: Fix memory corruption by adding correct class_size, Thomas Huth, 2024/04/30