reduce the diff with QEMU

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;

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,

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);
 }
 

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);
 }
 

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,

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,

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);
 
 

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 */

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);
 }
 

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);
 

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);
 }
 

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:
  *