diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-04-25 12:44:20 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-05-05 19:08:49 +0200 |
| commit | 2f719f195cfdacb0cbc42ec03e5172eeefff1726 (patch) | |
| tree | fa1ebd895d8830aafe08d642db99611f615a3bb8 /hw/dma | |
| parent | 958db90cd54823c33345000c995453a8c9b7a005 (diff) | |
| download | qemu-2f719f195cfdacb0cbc42ec03e5172eeefff1726.zip qemu-2f719f195cfdacb0cbc42ec03e5172eeefff1726.tar.gz qemu-2f719f195cfdacb0cbc42ec03e5172eeefff1726.tar.bz2 | |
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>
Diffstat (limited to 'hw/dma')
| -rw-r--r-- | hw/dma/xilinx_axidma.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 14b887b..cc90eb5 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -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 *cs = XILINX_AXI_DMA_CONTROL_STREAM( &s->rx_control_dev); - Error *local_errp = NULL; + Error *local_err = NULL; object_property_add_link(OBJECT(ds), "dma", TYPE_XILINX_AXI_DMA, (Object **)&ds->dma, object_property_allow_set_link, OBJ_PROP_LINK_UNREF_ON_RELEASE, - &local_errp); + &local_err); object_property_add_link(OBJECT(cs), "dma", TYPE_XILINX_AXI_DMA, (Object **)&cs->dma, object_property_allow_set_link, OBJ_PROP_LINK_UNREF_ON_RELEASE, - &local_errp); - if (local_errp) { + &local_err); + if (local_err) { goto xilinx_axidma_realize_fail; } - object_property_set_link(OBJECT(ds), OBJECT(s), "dma", &local_errp); - object_property_set_link(OBJECT(cs), OBJECT(s), "dma", &local_errp); - if (local_errp) { + object_property_set_link(OBJECT(ds), OBJECT(s), "dma", &local_err); + object_property_set_link(OBJECT(cs), OBJECT(s), "dma", &local_err); + if (local_err) { goto xilinx_axidma_realize_fail; } @@ -567,7 +567,7 @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp) xilinx_axidma_realize_fail: if (!*errp) { - *errp = local_errp; + *errp = local_err; } } |