qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Zhao Liu <zhao1.liu@linux.intel.com>
To: Thomas Huth <thuth@redhat.com>,
	David Hildenbrand <david@redhat.com>,
	Richard Henderson <richard.henderson@linaro.org>,
	Ilya Leoshkevich <iii@linux.ibm.com>,
	Halil Pasic <pasic@linux.ibm.com>,
	Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
	Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH 6/6] target/s390x/cpu_models_sysemu: Drop local @err in apply_cpu_model()
Date: Fri, 19 Apr 2024 14:57:12 +0800	[thread overview]
Message-ID: <20240419065712.1225038-7-zhao1.liu@linux.intel.com> (raw)
In-Reply-To: <20240419065712.1225038-1-zhao1.liu@linux.intel.com>

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_sysemu.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/target/s390x/cpu_models_sysemu.c b/target/s390x/cpu_models_sysemu.c
index bf855c659d5e..15be729c3d48 100644
--- a/target/s390x/cpu_models_sysemu.c
+++ b/target/s390x/cpu_models_sysemu.c
@@ -389,7 +389,6 @@ CpuModelBaselineInfo *qmp_query_cpu_model_baseline(CpuModelInfo *infoa,
 
 void apply_cpu_model(const S390CPUModel *model, Error **errp)
 {
-    Error *err = NULL;
     static S390CPUModel applied_model;
     static bool applied;
 
@@ -405,8 +404,7 @@ void apply_cpu_model(const S390CPUModel *model, Error **errp)
     }
 
     if (kvm_enabled()) {
-        if (!kvm_s390_apply_cpu_model(model, &err)) {
-            error_propagate(errp, err);
+        if (!kvm_s390_apply_cpu_model(model, errp)) {
             return;
         }
     }
-- 
2.34.1



  parent reply	other threads:[~2024-04-19  6:44 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-19  6:57 [PATCH 0/6] s390x/cpu_models: Misc cleanup on returned error code and local @err variables Zhao Liu
2024-04-19  6:56 ` Philippe Mathieu-Daudé
2024-04-19  6:57 ` [PATCH 1/6] target/s390x/cpu_model: Make check_compatibility() return boolean Zhao Liu
2024-04-19  7:30   ` Thomas Huth
2024-04-19  6:57 ` [PATCH 2/6] target/s390x/cpu_model: Drop local @err in s390_realize_cpu_model() Zhao Liu
2024-04-19  7:39   ` Thomas Huth
2024-04-19  8:48     ` Zhao Liu
2024-04-19  6:57 ` [PATCH 3/6] target/s390x/cpu_models: Make kvm_s390_get_host_cpu_model() return boolean Zhao Liu
2024-04-19  6:55   ` Philippe Mathieu-Daudé
2024-04-19  7:18     ` Zhao Liu
2024-04-19  7:50   ` Thomas Huth
2024-04-19  8:44     ` Zhao Liu
2024-04-19  9:08       ` Philippe Mathieu-Daudé
2024-04-22  9:03         ` Zhao Liu
2024-04-19  6:57 ` [PATCH 4/6] target/s390x/cpu_models: Drop local @err in get_max_cpu_model() Zhao Liu
2024-04-19  7:52   ` Thomas Huth
2024-04-19  6:57 ` [PATCH 5/6] target/s390x/cpu_models: Make kvm_s390_apply_cpu_model() return boolean Zhao Liu
2024-04-19  7:59   ` Thomas Huth
2024-04-19  6:57 ` Zhao Liu [this message]
2024-04-19  8:00   ` [PATCH 6/6] target/s390x/cpu_models_sysemu: Drop local @err in apply_cpu_model() Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240419065712.1225038-7-zhao1.liu@linux.intel.com \
    --to=zhao1.liu@linux.intel.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=david@redhat.com \
    --cc=iii@linux.ibm.com \
    --cc=pasic@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    --cc=zhao1.liu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).