From a1cb9ab973c67ef1ae5ba4e71ce0ef5469c0fd8b Mon Sep 17 00:00:00 2001 From: Benoit Dumas Date: Wed, 12 Oct 2022 06:28:42 +0200 Subject: [PATCH] reduce the diff with QEMU --- hw/core/qdev-properties.c | 5 ----- hw/core/remote-port-ats.c | 2 +- hw/core/remote-port-gpio.c | 2 +- hw/core/remote-port-memory-master.c | 2 +- hw/core/remote-port-memory-slave.c | 2 +- hw/core/remote-port-net.c | 2 +- hw/core/remote-port-pci-device.c | 2 +- hw/core/remote-port-pcie-root-port.c | 2 +- hw/core/remote-port-stream.c | 2 +- hw/core/remote-port.c | 2 +- hw/net/cadence_gem.c | 2 +- include/hw/qdev-properties.h | 2 -- 12 files changed, 10 insertions(+), 17 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 5cb8f79fb05..50f40949f52 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -50,11 +50,6 @@ void qdev_prop_allow_set_link_before_realize(const Object *obj, } } -void qdev_prop_allow_set_link(const Object *obj, const char *name, - Object *val, Error **errp) -{ -} - void *object_field_prop_ptr(Object *obj, Property *prop) { void *ptr = obj; diff --git a/hw/core/remote-port-ats.c b/hw/core/remote-port-ats.c index 0e0ceb4d3b4..455b6c453c5 100644 --- a/hw/core/remote-port-ats.c +++ b/hw/core/remote-port-ats.c @@ -328,7 +328,7 @@ static void rp_ats_init(Object *obj) object_property_add_link(obj, "rp-adaptor0", "remote-port", (Object **)&s->rp, - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); object_property_add_link(obj, "mr", TYPE_MEMORY_REGION, (Object **)&s->mr, diff --git a/hw/core/remote-port-gpio.c b/hw/core/remote-port-gpio.c index 050a088af8d..151c8350c8c 100644 --- a/hw/core/remote-port-gpio.c +++ b/hw/core/remote-port-gpio.c @@ -136,7 +136,7 @@ static void rp_gpio_init(Object *obj) object_property_add_link(obj, "rp-adaptor0", "remote-port", (Object **)&rpms->rp, - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); } diff --git a/hw/core/remote-port-memory-master.c b/hw/core/remote-port-memory-master.c index 0b6e9a1c2dc..b2f5d4d3091 100644 --- a/hw/core/remote-port-memory-master.c +++ b/hw/core/remote-port-memory-master.c @@ -229,7 +229,7 @@ static void rp_memory_master_init(Object *obj) RemotePortMemoryMaster *rpms = REMOTE_PORT_MEMORY_MASTER(obj); object_property_add_link(obj, "rp-adaptor0", "remote-port", (Object **)&rpms->rp, - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); } diff --git a/hw/core/remote-port-memory-slave.c b/hw/core/remote-port-memory-slave.c index f9255fddd7c..b8f915a5bb2 100644 --- a/hw/core/remote-port-memory-slave.c +++ b/hw/core/remote-port-memory-slave.c @@ -206,7 +206,7 @@ static void rp_memory_slave_init(Object *obj) object_property_add_link(obj, "rp-adaptor0", "remote-port", (Object **)&rpms->rp, - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); object_property_add_link(obj, "mr", TYPE_MEMORY_REGION, (Object **)&rpms->mr, diff --git a/hw/core/remote-port-net.c b/hw/core/remote-port-net.c index 92680bde9c3..77423cac3e8 100644 --- a/hw/core/remote-port-net.c +++ b/hw/core/remote-port-net.c @@ -178,7 +178,7 @@ static void rp_net_init(Object *obj) object_property_add_link(obj, "rp-adaptor0", "remote-port", (Object **)&s->rx.rp, - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); object_property_add_link(obj, "rp-adaptor1", "remote-port", (Object **)&s->tx.rp, diff --git a/hw/core/remote-port-pci-device.c b/hw/core/remote-port-pci-device.c index 7e76d731f3b..aba714daf90 100644 --- a/hw/core/remote-port-pci-device.c +++ b/hw/core/remote-port-pci-device.c @@ -276,7 +276,7 @@ static void rp_pci_init(Object *obj) object_property_add_link(obj, "rp-adaptor0", "remote-port", (Object **)&s->rp, - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); diff --git a/hw/core/remote-port-pcie-root-port.c b/hw/core/remote-port-pcie-root-port.c index 261e88d282a..d2d93dae212 100644 --- a/hw/core/remote-port-pcie-root-port.c +++ b/hw/core/remote-port-pcie-root-port.c @@ -533,7 +533,7 @@ static void rp_root_port_init(Object *obj) /* Remote port setup */ object_property_add_link(obj, "rp-adaptor0", "remote-port", (Object **)&s->rp, - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); /* IO configuration setup */ diff --git a/hw/core/remote-port-stream.c b/hw/core/remote-port-stream.c index c0d1e06bacf..74b8c121491 100644 --- a/hw/core/remote-port-stream.c +++ b/hw/core/remote-port-stream.c @@ -191,7 +191,7 @@ static void rp_stream_init(Object *obj) OBJ_PROP_LINK_STRONG); object_property_add_link(obj, "rp-adaptor0", "remote-port", (Object **)&s->rp, - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); } diff --git a/hw/core/remote-port.c b/hw/core/remote-port.c index dc4f916a5ac..df503f0a280 100644 --- a/hw/core/remote-port.c +++ b/hw/core/remote-port.c @@ -895,7 +895,7 @@ static void rp_init(Object *obj) char *name = g_strdup_printf("remote-port-dev%d", i); object_property_add_link(obj, name, TYPE_REMOTE_PORT_DEVICE, (Object **)&s->devs[i], - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); g_free(name); diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 43f0e0630ad..854b75232f9 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1717,7 +1717,7 @@ static void gem_init(Object *obj) qdev_prop_allow_set_link_before_realize, OBJ_PROP_LINK_STRONG); object_property_add_link(obj, "mdio", TYPE_MDIO, (Object **)&s->mdio, - qdev_prop_allow_set_link, + object_property_allow_set_link, OBJ_PROP_LINK_STRONG); } diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index d94f091935d..2e720ee63a6 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -244,8 +244,6 @@ void qdev_alias_all_properties(DeviceState *target, Object *source); void qdev_prop_set_after_realize(DeviceState *dev, const char *name, Error **errp); -void qdev_prop_allow_set_link(const Object *obj, const char *name, - Object *val, Error **errp); /** * qdev_prop_allow_set_link_before_realize: *