From: Zhao Liu <zhao1.liu@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>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH v2 3/7] target/s390x: Remove KVM stubs in cpu_models.h
Date: Thu, 25 Apr 2024 11:12:28 +0800 [thread overview]
Message-ID: <20240425031232.1586401-4-zhao1.liu@intel.com> (raw)
In-Reply-To: <20240425031232.1586401-1-zhao1.liu@intel.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Since the calls are elided when KVM is not available,
we can remove the stubs (which are never compiled).
Inspired-by: Thomas Huth <thuth@redhat.com>>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
target/s390x/cpu_models.h | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h
index d7b89129891a..a89c2a15ab54 100644
--- a/target/s390x/cpu_models.h
+++ b/target/s390x/cpu_models.h
@@ -114,23 +114,8 @@ static inline uint64_t s390_cpuid_from_cpu_model(const S390CPUModel *model)
S390CPUDef const *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga,
S390FeatBitmap features);
-#ifdef CONFIG_KVM
bool kvm_s390_cpu_models_supported(void);
void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp);
void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp);
-#else
-static inline void kvm_s390_get_host_cpu_model(S390CPUModel *model,
- Error **errp)
-{
-}
-static inline void kvm_s390_apply_cpu_model(const S390CPUModel *model,
- Error **errp)
-{
-}
-static inline bool kvm_s390_cpu_models_supported(void)
-{
- return false;
-}
-#endif
#endif /* TARGET_S390X_CPU_MODELS_H */
--
2.34.1
next prev parent reply other threads:[~2024-04-25 2:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 3:12 [PATCH v2 0/7] s390x/cpu_models: Misc cleanup on returned error code and local @err variables Zhao Liu
2024-04-25 3:12 ` [PATCH v2 1/7] target/s390x/cpu_model: Make check_compatibility() return boolean Zhao Liu
2024-04-25 3:12 ` [PATCH v2 2/7] target/s390x/cpu_model: Drop local @err in s390_realize_cpu_model() Zhao Liu
2024-04-25 3:12 ` Zhao Liu [this message]
2024-04-25 3:12 ` [PATCH v2 4/7] target/s390x/cpu_models: Make kvm_s390_get_host_cpu_model() return boolean Zhao Liu
2024-04-25 15:22 ` Thomas Huth
2024-04-25 3:12 ` [PATCH v2 5/7] target/s390x/cpu_models: Drop local @err in get_max_cpu_model() Zhao Liu
2024-04-25 3:12 ` [PATCH v2 6/7] target/s390x/cpu_models: Make kvm_s390_apply_cpu_model() return boolean Zhao Liu
2024-04-25 3:12 ` [PATCH v2 7/7] target/s390x/cpu_models_sysemu: Drop local @err in apply_cpu_model() Zhao Liu
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=20240425031232.1586401-4-zhao1.liu@intel.com \
--to=zhao1.liu@intel.com \
--cc=borntraeger@linux.ibm.com \
--cc=david@redhat.com \
--cc=iii@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.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).