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 10/10] hw/s390x: Remove the "adapter_routes_max_batch" property from the flic
Date: Fri, 3 Jan 2025 15:42:32 +0100 [thread overview]
Message-ID: <20250103144232.520383-11-thuth@redhat.com> (raw)
In-Reply-To: <20250103144232.520383-1-thuth@redhat.com>
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.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/hw/s390x/s390_flic.h | 2 --
hw/intc/s390_flic.c | 9 ---------
hw/s390x/virtio-ccw.c | 5 ++---
3 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h
index 4d66c5e42e..85016d5ccc 100644
--- a/include/hw/s390x/s390_flic.h
+++ b/include/hw/s390x/s390_flic.h
@@ -41,8 +41,6 @@ OBJECT_DECLARE_TYPE(S390FLICState, S390FLICStateClass,
struct S390FLICState {
SysBusDevice parent_obj;
- /* to limit AdapterRoutes.num_routes for compat */
- uint32_t adapter_routes_max_batch;
bool ais_supported;
bool migration_enabled;
};
diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index 3f3fa939d3..c20f4c1075 100644
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -471,8 +471,6 @@ static void qemu_s390_flic_class_init(ObjectClass *oc, void *data)
}
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,
migration_enabled, true),
};
@@ -480,13 +478,6 @@ static const Property s390_flic_common_properties[] = {
static void s390_flic_common_realize(DeviceState *dev, Error **errp)
{
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);
}
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 7cbce4766a..43f3b162c8 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -1157,7 +1157,6 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
CcwDevice *ccw_dev = CCW_DEVICE(d);
SubchDev *sch = ccw_dev->sch;
int n = virtio_get_num_queues(vdev);
- S390FLICState *flic = s390_get_flic();
if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) {
dev->max_rev = 0;
@@ -1184,10 +1183,10 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
VIRTIO_QUEUE_MAX);
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 "
"exceeds flic adapter route limit %d", n,
- flic->adapter_routes_max_batch);
+ ADAPTER_ROUTES_MAX_GSI);
return;
}
--
2.47.1
next prev parent reply other threads:[~2025-01-03 14:44 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 ` [PATCH 04/10] hw/s390x: Remove the "ri_allowed" switch Thomas Huth
2025-01-07 13:03 ` 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 ` Thomas Huth [this message]
2025-01-07 11:06 ` [PATCH 10/10] hw/s390x: Remove the "adapter_routes_max_batch" property from the flic 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-11-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).