motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 22:11:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/s390x: Remove the "adapter_routes_max_batch" property from the flic

Browse source 
Now that the s390-ccw-virtio-2.8 machine has been removed, we don't
need the "adapter_routes_max_batch" property anymore and can remove it.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Message-ID: <20250103144232.520383-11-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2025-01-03 15:42:32 +01:00
parent 66924fe369
commit 921dee4645
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hw/intc/s390_flic.c
View file

@ -471,8 +471,6 @@ static void qemu_s390_flic_class_init(ObjectClass *oc, void *data)
} }
static const Property s390_flic_common_properties[] = { static const Property s390_flic_common_properties[] = {
DEFINE_PROP_UINT32("adapter_routes_max_batch", S390FLICState,
adapter_routes_max_batch, ADAPTER_ROUTES_MAX_GSI),
DEFINE_PROP_BOOL("migration-enabled", S390FLICState, DEFINE_PROP_BOOL("migration-enabled", S390FLICState,
migration_enabled, true), migration_enabled, true),
}; };
@ -480,13 +478,6 @@ static const Property s390_flic_common_properties[] = {
static void s390_flic_common_realize(DeviceState *dev, Error **errp) static void s390_flic_common_realize(DeviceState *dev, Error **errp)
{ {
S390FLICState *fs = S390_FLIC_COMMON(dev); S390FLICState *fs = S390_FLIC_COMMON(dev);
uint32_t max_batch = fs->adapter_routes_max_batch;
if (max_batch > ADAPTER_ROUTES_MAX_GSI) {
error_setg(errp, "flic property adapter_routes_max_batch too big"
" (%d > %d)", max_batch, ADAPTER_ROUTES_MAX_GSI);
return;
}
fs->ais_supported = s390_has_feat(S390_FEAT_ADAPTER_INT_SUPPRESSION); fs->ais_supported = s390_has_feat(S390_FEAT_ADAPTER_INT_SUPPRESSION);
} }

5
hw/s390x/virtio-ccw.c
View file

@ -1157,7 +1157,6 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
CcwDevice *ccw_dev = CCW_DEVICE(d); CcwDevice *ccw_dev = CCW_DEVICE(d);
SubchDev *sch = ccw_dev->sch; SubchDev *sch = ccw_dev->sch;
int n = virtio_get_num_queues(vdev); int n = virtio_get_num_queues(vdev);
S390FLICState *flic = s390_get_flic();
if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) {
dev->max_rev = 0; dev->max_rev = 0;
@ -1184,10 +1183,10 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
VIRTIO_QUEUE_MAX); VIRTIO_QUEUE_MAX);
return; return;
} }
if (virtio_get_num_queues(vdev) > flic->adapter_routes_max_batch) { if (virtio_get_num_queues(vdev) > ADAPTER_ROUTES_MAX_GSI) {
error_setg(errp, "The number of virtqueues %d " error_setg(errp, "The number of virtqueues %d "
"exceeds flic adapter route limit %d", n, "exceeds flic adapter route limit %d", n,
flic->adapter_routes_max_batch); ADAPTER_ROUTES_MAX_GSI);
return; return;
} }

2
include/hw/s390x/s390_flic.h
View file

@ -41,8 +41,6 @@ OBJECT_DECLARE_TYPE(S390FLICState, S390FLICStateClass,
struct S390FLICState { struct S390FLICState {
SysBusDevice parent_obj; SysBusDevice parent_obj;
/* to limit AdapterRoutes.num_routes for compat */
uint32_t adapter_routes_max_batch;
bool ais_supported; bool ais_supported;
bool migration_enabled; bool migration_enabled;
}; };