From: Thomas Huth <thuth@redhat.com>
To: qemu-s390x@nongnu.org,
Christian Borntraeger <borntraeger@linux.ibm.com>,
David Hildenbrand <david@redhat.com>
Cc: qemu-devel@nongnu.org, Eric Farman <farman@linux.ibm.com>,
Cornelia Huck <cohuck@redhat.com>,
Halil Pasic <pasic@linux.ibm.com>
Subject: [PATCH 04/10] hw/s390x: Remove the "ri_allowed" switch
Date: Fri, 3 Jan 2025 15:42:26 +0100 [thread overview]
Message-ID: <20250103144232.520383-5-thuth@redhat.com> (raw)
In-Reply-To: <20250103144232.520383-1-thuth@redhat.com>
Only s390-ccw-virtio-2.6 and older used to set this switch to "off",
for newer machine types it is always enabled. Since we removed the
old machine types now, we can also remove the switch in the code and
assume that it is always enabled now.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/hw/s390x/s390-virtio-ccw.h | 3 ---
hw/s390x/s390-virtio-ccw.c | 14 ++++----------
target/s390x/kvm/kvm.c | 6 ++----
3 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h
index 599740a998..4559dbf1bd 100644
--- a/include/hw/s390x/s390-virtio-ccw.h
+++ b/include/hw/s390x/s390-virtio-ccw.h
@@ -53,14 +53,11 @@ struct S390CcwMachineClass {
MachineClass parent_class;
/*< public >*/
- bool ri_allowed;
bool cpu_model_allowed;
bool hpage_1m_allowed;
int max_threads;
};
-/* runtime-instrumentation allowed by the machine */
-bool ri_allowed(void);
/* cpu model allowed by the machine */
bool cpu_model_allowed(void);
/* 1M huge page mappings allowed by the machine */
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 341430a101..ffeee2da48 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -725,10 +725,10 @@ static S390CcwMachineClass *current_mc;
* various "*_allowed" variables are enabled, so that the *_allowed() wrappers
* below return the correct default value for the "none" machine.
*
- * Attention! Do *not* add additional new wrappers for CPU features (e.g. like
- * the ri_allowed() wrapper) via this mechanism anymore. CPU features should
- * be handled via the CPU models, i.e. checking with cpu_model_allowed() during
- * CPU initialization and s390_has_feat() later should be sufficient.
+ * Attention! Do *not* add additional new wrappers for CPU features via this
+ * mechanism anymore. CPU features should be handled via the CPU models,
+ * i.e. checking with cpu_model_allowed() during CPU initialization and
+ * s390_has_feat() later should be sufficient.
*/
static S390CcwMachineClass *get_machine_class(void)
{
@@ -744,11 +744,6 @@ static S390CcwMachineClass *get_machine_class(void)
return current_mc;
}
-bool ri_allowed(void)
-{
- return get_machine_class()->ri_allowed;
-}
-
bool cpu_model_allowed(void)
{
return get_machine_class()->cpu_model_allowed;
@@ -791,7 +786,6 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
- s390mc->ri_allowed = true;
s390mc->cpu_model_allowed = true;
s390mc->hpage_1m_allowed = true;
s390mc->max_threads = 1;
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index db645a4813..540b474398 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -374,10 +374,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
kvm_vm_enable_cap(s, KVM_CAP_S390_VECTOR_REGISTERS, 0);
kvm_vm_enable_cap(s, KVM_CAP_S390_USER_STSI, 0);
kvm_vm_enable_cap(s, KVM_CAP_S390_CPU_TOPOLOGY, 0);
- if (ri_allowed()) {
- if (kvm_vm_enable_cap(s, KVM_CAP_S390_RI, 0) == 0) {
- cap_ri = 1;
- }
+ if (kvm_vm_enable_cap(s, KVM_CAP_S390_RI, 0) == 0) {
+ cap_ri = 1;
}
if (cpu_model_allowed()) {
kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0);
--
2.47.1
next prev parent reply other threads:[~2025-01-03 14:43 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-03 14:42 [PATCH 00/10] hw/s390x: Remove deprecated machine types 2.4 up to 2.8 Thomas Huth
2025-01-03 14:42 ` [PATCH 01/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.4 and 2.5 machine types Thomas Huth
2025-01-07 11:03 ` Philippe Mathieu-Daudé
2025-01-07 11:06 ` Philippe Mathieu-Daudé
2025-01-07 12:59 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 02/10] hw/s390x/s390-skeys: Remove the "migration-enabled" property Thomas Huth
2025-01-07 13:00 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 03/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.6 machine type Thomas Huth
2025-01-07 13:01 ` Cornelia Huck
2025-01-03 14:42 ` Thomas Huth [this message]
2025-01-07 13:03 ` [PATCH 04/10] hw/s390x: Remove the "ri_allowed" switch Cornelia Huck
2025-01-03 14:42 ` [PATCH 05/10] hw/s390x/ipl: Remove the "iplbext_migration" property Thomas Huth
2025-01-07 11:04 ` Philippe Mathieu-Daudé
2025-01-07 13:04 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 06/10] hw/s390x/css-bridge: Remove the "css_dev_path" property Thomas Huth
2025-01-07 11:05 ` Philippe Mathieu-Daudé
2025-01-07 13:06 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 07/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.7 machine type Thomas Huth
2025-01-07 13:07 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 08/10] hw/s390x: Remove the cpu_model_allowed flag and related code Thomas Huth
2025-01-07 13:09 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 09/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.8 machine type Thomas Huth
2025-01-07 13:10 ` Cornelia Huck
2025-01-03 14:42 ` [PATCH 10/10] hw/s390x: Remove the "adapter_routes_max_batch" property from the flic Thomas Huth
2025-01-07 11:06 ` Philippe Mathieu-Daudé
2025-01-07 13:11 ` Cornelia Huck
2025-01-07 10:22 ` [PATCH 00/10] hw/s390x: Remove deprecated machine types 2.4 up to 2.8 Christian Borntraeger
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=20250103144232.520383-5-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=farman@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.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 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).