[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/20] hw: Consistently name Error ** objects errp, a
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 08/20] hw: Consistently name Error ** objects errp, and not err |
Date: |
Mon, 5 May 2014 21:03:52 +0200 |
From: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/core/qdev.c | 20 ++++++++++----------
hw/intc/i8259.c | 4 ++--
hw/timer/i8254.c | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 60f9df1..2fd5100 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -174,14 +174,14 @@ int qdev_init(DeviceState *dev)
return 0;
}
-static void device_realize(DeviceState *dev, Error **err)
+static void device_realize(DeviceState *dev, Error **errp)
{
DeviceClass *dc = DEVICE_GET_CLASS(dev);
if (dc->init) {
int rc = dc->init(dev);
if (rc < 0) {
- error_setg(err, "Device initialization failed.");
+ error_setg(errp, "Device initialization failed.");
return;
}
}
@@ -504,14 +504,14 @@ static void bus_unparent(Object *obj)
}
}
-static bool bus_get_realized(Object *obj, Error **err)
+static bool bus_get_realized(Object *obj, Error **errp)
{
BusState *bus = BUS(obj);
return bus->realized;
}
-static void bus_set_realized(Object *obj, bool value, Error **err)
+static void bus_set_realized(Object *obj, bool value, Error **errp)
{
BusState *bus = BUS(obj);
BusClass *bc = BUS_GET_CLASS(bus);
@@ -540,7 +540,7 @@ static void bus_set_realized(Object *obj, bool value, Error
**err)
return;
error:
- error_propagate(err, local_err);
+ error_propagate(errp, local_err);
}
void qbus_create_inplace(void *bus, size_t size, const char *typename,
@@ -724,13 +724,13 @@ void qdev_property_add_static(DeviceState *dev, Property
*prop,
}
}
-static bool device_get_realized(Object *obj, Error **err)
+static bool device_get_realized(Object *obj, Error **errp)
{
DeviceState *dev = DEVICE(obj);
return dev->realized;
}
-static void device_set_realized(Object *obj, bool value, Error **err)
+static void device_set_realized(Object *obj, bool value, Error **errp)
{
DeviceState *dev = DEVICE(obj);
DeviceClass *dc = DEVICE_GET_CLASS(dev);
@@ -738,7 +738,7 @@ static void device_set_realized(Object *obj, bool value,
Error **err)
Error *local_err = NULL;
if (dev->hotplugged && !dc->hotpluggable) {
- error_set(err, QERR_DEVICE_NO_HOTPLUG, object_get_typename(obj));
+ error_set(errp, QERR_DEVICE_NO_HOTPLUG, object_get_typename(obj));
return;
}
@@ -797,14 +797,14 @@ static void device_set_realized(Object *obj, bool value,
Error **err)
}
if (local_err != NULL) {
- error_propagate(err, local_err);
+ error_propagate(errp, local_err);
return;
}
dev->realized = value;
}
-static bool device_get_hotpluggable(Object *obj, Error **err)
+static bool device_get_hotpluggable(Object *obj, Error **errp)
{
DeviceClass *dc = DEVICE_GET_CLASS(obj);
DeviceState *dev = DEVICE(obj);
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)
diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 28152d8..3450c98 100644
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -322,7 +322,7 @@ static void pit_post_load(PITCommonState *s)
}
}
-static void pit_realizefn(DeviceState *dev, Error **err)
+static void pit_realizefn(DeviceState *dev, Error **errp)
{
PITCommonState *pit = PIT_COMMON(dev);
PITClass *pc = PIT_GET_CLASS(dev);
@@ -338,7 +338,7 @@ static void pit_realizefn(DeviceState *dev, Error **err)
qdev_init_gpio_in(dev, pit_irq_control, 1);
- pc->parent_realize(dev, err);
+ pc->parent_realize(dev, errp);
}
static Property pit_properties[] = {
--
1.8.4.5
- [Qemu-devel] [PULL 01/20] qdev: Fix crash by validating the object type, (continued)
- [Qemu-devel] [PULL 01/20] qdev: Fix crash by validating the object type, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 05/20] machine: Replace QEMUMachine by MachineClass in accelerator configuration, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 13/20] qtest: Add error reporting to socket_accept(), Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 16/20] tests: Add es1370 qtest, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 18/20] tests: Add ioh3420 qtest, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 14/20] qtest: Be paranoid about accept() addrlen argument, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 04/20] vl.c: Replace QEMUMachine with MachineClass in QEMUMachineInitArgs, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 06/20] machine: Remove QEMUMachine indirection from MachineClass, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 03/20] machine: Copy QEMUMachine's fields to MachineClass, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 09/20] qom: Clean up fragile use of error_is_set() in set() methods, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 08/20] hw: Consistently name Error ** objects errp, and not err,
Andreas Färber <=
- [Qemu-devel] [PULL 15/20] tests: Add ac97 qtest, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 20/20] PortioList: Store PortioList in device state, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 17/20] tests: Add intel-hda qtests, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 07/20] hw: Consistently name Error * objects err, and not errp, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 19/20] tests: Add EHCI qtest, Andreas Färber, 2014/05/05
- Re: [Qemu-devel] [PULL 00/20] QOM devices patch queue 2014-05-05, Peter Maydell, 2014/05/07