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

hw/s390x/css-bridge: Remove the "css_dev_path" property

Browse source 
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

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-7-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2025-01-03 15:42:28 +01:00
parent 25a65a274d
commit 1a27618540
2 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hw/s390x/css-bridge.c
View file

@ -66,16 +66,8 @@ static char *virtual_css_bus_get_dev_path(DeviceState *dev)
{ {
CcwDevice *ccw_dev = CCW_DEVICE(dev); CcwDevice *ccw_dev = CCW_DEVICE(dev);
SubchDev *sch = ccw_dev->sch; SubchDev *sch = ccw_dev->sch;
VirtualCssBridge *bridge =
VIRTUAL_CSS_BRIDGE(qdev_get_parent_bus(dev)->parent);
/* return g_strdup_printf("/%02x.%1x.%04x", sch->cssid, sch->ssid, sch->devno);
* 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;
} }
static void virtual_css_bus_class_init(ObjectClass *klass, void *data) 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 ********************/ /***************** 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) static bool prop_get_true(Object *obj, Error **errp)
{ {
return true; return true;
@ -137,7 +124,6 @@ static void virtual_css_bridge_class_init(ObjectClass *klass, void *data)
hc->unplug = ccw_device_unplug; hc->unplug = ccw_device_unplug;
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
device_class_set_props(dc, virtual_css_bridge_properties);
object_class_property_add_bool(klass, "cssid-unrestricted", object_class_property_add_bool(klass, "cssid-unrestricted",
prop_get_true, NULL); prop_get_true, NULL);
object_class_property_set_description(klass, "cssid-unrestricted", object_class_property_set_description(klass, "cssid-unrestricted",

1
include/hw/s390x/css-bridge.h
View file

@ -19,7 +19,6 @@
/* virtual css bridge */ /* virtual css bridge */
struct VirtualCssBridge { struct VirtualCssBridge {
SysBusDevice sysbus_dev; SysBusDevice sysbus_dev;
bool css_dev_path;
}; };
#define TYPE_VIRTUAL_CSS_BRIDGE "virtual-css-bridge" #define TYPE_VIRTUAL_CSS_BRIDGE "virtual-css-bridge"