summaryrefslogtreecommitdiffstats
path: root/hw/intc/i8259.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2014-04-25 12:44:21 +0200
committerAndreas Färber <afaerber@suse.de>2014-05-05 19:08:49 +0200
commita7737e4496aa3c1c8c3a4b4b9d5e44875fe21e12 (patch)
treede26081ce5668f67961191cb7b719e3c7ad5b242 /hw/intc/i8259.c
parent2f719f195cfdacb0cbc42ec03e5172eeefff1726 (diff)
downloadhqemu-a7737e4496aa3c1c8c3a4b4b9d5e44875fe21e12.zip
hqemu-a7737e4496aa3c1c8c3a4b4b9d5e44875fe21e12.tar.gz
hw: Consistently name Error ** objects errp, and not err
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/intc/i8259.c')
-rw-r--r--hw/intc/i8259.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c
index c6f248b..ec01393 100644
--- a/hw/intc/i8259.c
+++ b/hw/intc/i8259.c
@@ -412,7 +412,7 @@ static const MemoryRegionOps pic_elcr_ioport_ops = {
},
};
-static void pic_realize(DeviceState *dev, Error **err)
+static void pic_realize(DeviceState *dev, Error **errp)
{
PICCommonState *s = PIC_COMMON(dev);
PICClass *pc = PIC_GET_CLASS(dev);
@@ -425,7 +425,7 @@ static void pic_realize(DeviceState *dev, Error **err)
qdev_init_gpio_out(dev, s->int_out, ARRAY_SIZE(s->int_out));
qdev_init_gpio_in(dev, pic_set_irq, 8);
- pc->parent_realize(dev, err);
+ pc->parent_realize(dev, errp);
}
void pic_info(Monitor *mon, const QDict *qdict)
OpenPOWER on IntegriCloud