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 06/10] hw/s390x/css-bridge: Remove the "css_dev_path" property
Date: Fri, 3 Jan 2025 15:42:28 +0100 [thread overview]
Message-ID: <20250103144232.520383-7-thuth@redhat.com> (raw)
In-Reply-To: <20250103144232.520383-1-thuth@redhat.com>
Now that the s390-ccw-virtio-2.6 and older machine types have been
removed, the "css_dev_path" property of the css-bridge is also not
used anymore and thus can be removed.
This way we finally get rid of the problem that has been described
in: https://gitlab.com/qemu-project/qemu/-/issues/2213
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/hw/s390x/css-bridge.h | 1 -
hw/s390x/css-bridge.c | 16 +---------------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/include/hw/s390x/css-bridge.h b/include/hw/s390x/css-bridge.h
index deb606d71f..4f874ed781 100644
--- a/include/hw/s390x/css-bridge.h
+++ b/include/hw/s390x/css-bridge.h
@@ -19,7 +19,6 @@
/* virtual css bridge */
struct VirtualCssBridge {
SysBusDevice sysbus_dev;
- bool css_dev_path;
};
#define TYPE_VIRTUAL_CSS_BRIDGE "virtual-css-bridge"
diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
index 04ab1f6402..c48d5571b5 100644
--- a/hw/s390x/css-bridge.c
+++ b/hw/s390x/css-bridge.c
@@ -66,16 +66,8 @@ static char *virtual_css_bus_get_dev_path(DeviceState *dev)
{
CcwDevice *ccw_dev = CCW_DEVICE(dev);
SubchDev *sch = ccw_dev->sch;
- VirtualCssBridge *bridge =
- VIRTUAL_CSS_BRIDGE(qdev_get_parent_bus(dev)->parent);
- /*
- * We can't provide a dev path for backward compatibility on
- * older machines, as it is visible in the migration stream.
- */
- return bridge->css_dev_path ?
- g_strdup_printf("/%02x.%1x.%04x", sch->cssid, sch->ssid, sch->devno) :
- NULL;
+ return g_strdup_printf("/%02x.%1x.%04x", sch->cssid, sch->ssid, sch->devno);
}
static void virtual_css_bus_class_init(ObjectClass *klass, void *data)
@@ -120,11 +112,6 @@ VirtualCssBus *virtual_css_bus_init(void)
/***************** Virtual-css Bus Bridge Device ********************/
-static const Property virtual_css_bridge_properties[] = {
- DEFINE_PROP_BOOL("css_dev_path", VirtualCssBridge, css_dev_path,
- true),
-};
-
static bool prop_get_true(Object *obj, Error **errp)
{
return true;
@@ -137,7 +124,6 @@ static void virtual_css_bridge_class_init(ObjectClass *klass, void *data)
hc->unplug = ccw_device_unplug;
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
- device_class_set_props(dc, virtual_css_bridge_properties);
object_class_property_add_bool(klass, "cssid-unrestricted",
prop_get_true, NULL);
object_class_property_set_description(klass, "cssid-unrestricted",
--
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 ` Thomas Huth [this message]
2025-01-07 11:05 ` [PATCH 06/10] hw/s390x/css-bridge: Remove the "css_dev_path" property 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-7-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).