Skip to contentSkip to conversation

target/s390x: Remove KVM stubs in cpu_models.h

RFC PATCH In review Philippe Mathieu-Daudé 1 participant 2 messages Apr 19, 2024

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 target/s390x: Remove KVM stubs in cpu_models.h

Since the calls are elided when KVM is not available, we can remove the stubs (which are never compiled).

---
RFC: untested =) Inspired by
https://lore.kernel.org/qemu-devel/[email protected]/

---
 target/s390x/cpu_models.h | 15 ---------------
 1 file changed, 15 deletions(-)
target/s390x/cpu_models.h +0 -15
index d7b8912989..a89c2a15ab 100644
@@ -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 */
Signature · 1 line
2.41.0
#1 lore raw
Quoted 7 lines · Philippe Mathieu-Daudé

Since the calls are elided when KVM is not available, we can remove the stubs (which are never compiled).

---
RFC: untested =)

Now tested!

Inspired by

Quoted 4 lines

https://lore.kernel.org/qemu-devel/[email protected]/

---
  target/s390x/cpu_models.h | 15 ---------------
  1 file changed, 15 deletions(-)