hw: Consistently name Error * objects err, and not errp
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
958db90cd5
commit
2f719f195c
|
@ -338,13 +338,13 @@ PropertyInfo qdev_prop_vlan = {
|
||||||
int qdev_prop_set_drive(DeviceState *dev, const char *name,
|
int qdev_prop_set_drive(DeviceState *dev, const char *name,
|
||||||
BlockDriverState *value)
|
BlockDriverState *value)
|
||||||
{
|
{
|
||||||
Error *errp = NULL;
|
Error *err = NULL;
|
||||||
const char *bdrv_name = value ? bdrv_get_device_name(value) : "";
|
const char *bdrv_name = value ? bdrv_get_device_name(value) : "";
|
||||||
object_property_set_str(OBJECT(dev), bdrv_name,
|
object_property_set_str(OBJECT(dev), bdrv_name,
|
||||||
name, &errp);
|
name, &err);
|
||||||
if (errp) {
|
if (err) {
|
||||||
qerror_report_err(errp);
|
qerror_report_err(err);
|
||||||
error_free(errp);
|
error_free(err);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -534,24 +534,24 @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp)
|
||||||
XilinxAXIDMAStreamSlave *ds = XILINX_AXI_DMA_DATA_STREAM(&s->rx_data_dev);
|
XilinxAXIDMAStreamSlave *ds = XILINX_AXI_DMA_DATA_STREAM(&s->rx_data_dev);
|
||||||
XilinxAXIDMAStreamSlave *cs = XILINX_AXI_DMA_CONTROL_STREAM(
|
XilinxAXIDMAStreamSlave *cs = XILINX_AXI_DMA_CONTROL_STREAM(
|
||||||
&s->rx_control_dev);
|
&s->rx_control_dev);
|
||||||
Error *local_errp = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
||||||
object_property_add_link(OBJECT(ds), "dma", TYPE_XILINX_AXI_DMA,
|
object_property_add_link(OBJECT(ds), "dma", TYPE_XILINX_AXI_DMA,
|
||||||
(Object **)&ds->dma,
|
(Object **)&ds->dma,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
||||||
&local_errp);
|
&local_err);
|
||||||
object_property_add_link(OBJECT(cs), "dma", TYPE_XILINX_AXI_DMA,
|
object_property_add_link(OBJECT(cs), "dma", TYPE_XILINX_AXI_DMA,
|
||||||
(Object **)&cs->dma,
|
(Object **)&cs->dma,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
||||||
&local_errp);
|
&local_err);
|
||||||
if (local_errp) {
|
if (local_err) {
|
||||||
goto xilinx_axidma_realize_fail;
|
goto xilinx_axidma_realize_fail;
|
||||||
}
|
}
|
||||||
object_property_set_link(OBJECT(ds), OBJECT(s), "dma", &local_errp);
|
object_property_set_link(OBJECT(ds), OBJECT(s), "dma", &local_err);
|
||||||
object_property_set_link(OBJECT(cs), OBJECT(s), "dma", &local_errp);
|
object_property_set_link(OBJECT(cs), OBJECT(s), "dma", &local_err);
|
||||||
if (local_errp) {
|
if (local_err) {
|
||||||
goto xilinx_axidma_realize_fail;
|
goto xilinx_axidma_realize_fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -567,7 +567,7 @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp)
|
||||||
|
|
||||||
xilinx_axidma_realize_fail:
|
xilinx_axidma_realize_fail:
|
||||||
if (!*errp) {
|
if (!*errp) {
|
||||||
*errp = local_errp;
|
*errp = local_err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -945,24 +945,24 @@ static void xilinx_enet_realize(DeviceState *dev, Error **errp)
|
||||||
XilinxAXIEnetStreamSlave *ds = XILINX_AXI_ENET_DATA_STREAM(&s->rx_data_dev);
|
XilinxAXIEnetStreamSlave *ds = XILINX_AXI_ENET_DATA_STREAM(&s->rx_data_dev);
|
||||||
XilinxAXIEnetStreamSlave *cs = XILINX_AXI_ENET_CONTROL_STREAM(
|
XilinxAXIEnetStreamSlave *cs = XILINX_AXI_ENET_CONTROL_STREAM(
|
||||||
&s->rx_control_dev);
|
&s->rx_control_dev);
|
||||||
Error *local_errp = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
||||||
object_property_add_link(OBJECT(ds), "enet", "xlnx.axi-ethernet",
|
object_property_add_link(OBJECT(ds), "enet", "xlnx.axi-ethernet",
|
||||||
(Object **) &ds->enet,
|
(Object **) &ds->enet,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
||||||
&local_errp);
|
&local_err);
|
||||||
object_property_add_link(OBJECT(cs), "enet", "xlnx.axi-ethernet",
|
object_property_add_link(OBJECT(cs), "enet", "xlnx.axi-ethernet",
|
||||||
(Object **) &cs->enet,
|
(Object **) &cs->enet,
|
||||||
object_property_allow_set_link,
|
object_property_allow_set_link,
|
||||||
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
OBJ_PROP_LINK_UNREF_ON_RELEASE,
|
||||||
&local_errp);
|
&local_err);
|
||||||
if (local_errp) {
|
if (local_err) {
|
||||||
goto xilinx_enet_realize_fail;
|
goto xilinx_enet_realize_fail;
|
||||||
}
|
}
|
||||||
object_property_set_link(OBJECT(ds), OBJECT(s), "enet", &local_errp);
|
object_property_set_link(OBJECT(ds), OBJECT(s), "enet", &local_err);
|
||||||
object_property_set_link(OBJECT(cs), OBJECT(s), "enet", &local_errp);
|
object_property_set_link(OBJECT(cs), OBJECT(s), "enet", &local_err);
|
||||||
if (local_errp) {
|
if (local_err) {
|
||||||
goto xilinx_enet_realize_fail;
|
goto xilinx_enet_realize_fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -981,7 +981,7 @@ static void xilinx_enet_realize(DeviceState *dev, Error **errp)
|
||||||
|
|
||||||
xilinx_enet_realize_fail:
|
xilinx_enet_realize_fail:
|
||||||
if (!*errp) {
|
if (!*errp) {
|
||||||
*errp = local_errp;
|
*errp = local_err;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue