SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/s390x: Remove the "ri_allowed" switch

Browse Source 
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.

Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Message-ID: <20250103144232.520383-5-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2025-01-03 15:42:26 +01:00
parent 29ac4a4a4c
commit db65ac5e25
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/s390x/s390-virtio-ccw.c
View File

@ -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;

3
include/hw/s390x/s390-virtio-ccw.h
View File

@ -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 */

2
target/s390x/kvm/kvm.c
View File

@ -374,11 +374,9 @@ 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 (cpu_model_allowed()) {
kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0);
}