All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 17/17] target/s390x: Remove KVM stubs in cpu_models.h
Date: Wed, 24 Apr 2024 09:57:35 +0200	[thread overview]
Message-ID: <20240424075735.248041-18-thuth@redhat.com> (raw)
In-Reply-To: <20240424075735.248041-1-thuth@redhat.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).

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240419090631.48055-1-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.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 d7b8912989..a89c2a15ab 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.44.0



  parent reply	other threads:[~2024-04-24  7:59 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-24  7:57 [PULL 00/17] CI job updates, header cleanups and other misc patches Thomas Huth
2024-04-24  7:57 ` [PULL 01/17] MAINTAINERS: update email of Peter Lieven Thomas Huth
2024-04-24  7:57 ` [PULL 02/17] tests/qtest : Use `g_assert_cmphex` instead of `g_assert_cmpuint` Thomas Huth
2024-04-24  7:57 ` [PULL 03/17] docs: i386: pc: Update maximum CPU numbers for PC Q35 Thomas Huth
2024-04-24  7:57 ` [PULL 04/17] tests/vm: update openbsd image to 7.5 Thomas Huth
2024-04-24  7:57 ` [PULL 05/17] Revert ".travis.yml: Cache Avocado cache" Thomas Huth
2024-04-24  7:57 ` [PULL 06/17] .travis.yml: Remove the unused UNRELIABLE environment variable Thomas Huth
2024-04-24  7:57 ` [PULL 07/17] .travis.yml: Update the jobs to Ubuntu 22.04 Thomas Huth
2024-04-24  7:57 ` [PULL 08/17] .travis.yml: Do some more testing with Clang Thomas Huth
2024-04-24  7:57 ` [PULL 09/17] tests: Remove Ubuntu 20.04 container Thomas Huth
2024-04-24  7:57 ` [PULL 10/17] tests/lcitool/libvirt-ci: Update to the latest master branch Thomas Huth
2024-04-24  7:57 ` [PULL 11/17] tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update Thomas Huth
2024-04-24  7:57 ` [PULL 12/17] tests: Update our CI to use CentOS Stream 9 instead of 8 Thomas Huth
2024-04-24 16:19   ` Richard Henderson
2024-04-25  5:02     ` Thomas Huth
2024-04-24  7:57 ` [PULL 13/17] ci: move external build environment setups to CentOS Stream 9 Thomas Huth
2024-04-24  7:57 ` [PULL 14/17] hw/s390x: Include missing 'cpu.h' header Thomas Huth
2024-04-24  7:57 ` [PULL 15/17] docs/devel: fix minor typo in submitting-a-patch.rst Thomas Huth
2024-04-24  7:57 ` [PULL 16/17] tests/unit: Remove debug statements in test-nested-aio-poll.c Thomas Huth
2024-04-24  7:57 ` Thomas Huth [this message]
2024-04-24 16:21 ` [PULL 00/17] CI job updates, header cleanups and other misc patches Richard Henderson
2024-04-25  5:11   ` Thomas Huth
2024-04-25  7:55     ` Daniel P. Berrangé
2024-04-25 12:56       ` Fabiano Rosas
2024-04-25 15:04     ` Richard Henderson
2024-04-25 15:14       ` 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=20240424075735.248041-18-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.