diff options
| author | Markus Armbruster | 2014-04-25 12:44:20 +0200 |
|---|---|---|
| committer | Andreas Färber | 2014-05-05 19:08:49 +0200 |
| commit | 2f719f195cfdacb0cbc42ec03e5172eeefff1726 (patch) | |
| tree | fa1ebd895d8830aafe08d642db99611f615a3bb8 /hw/core | |
| parent | machine: Remove QEMUMachine indirection from MachineClass (diff) | |
| download | qemu-2f719f195cfdacb0cbc42ec03e5172eeefff1726.tar.gz qemu-2f719f195cfdacb0cbc42ec03e5172eeefff1726.tar.xz qemu-2f719f195cfdacb0cbc42ec03e5172eeefff1726.zip | |
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/core')
| -rw-r--r-- | hw/core/qdev-properties-system.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index de835612f0..404cf1843d 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -338,13 +338,13 @@ PropertyInfo qdev_prop_vlan = { int qdev_prop_set_drive(DeviceState *dev, const char *name, BlockDriverState *value) { - Error *errp = NULL; + Error *err = NULL; const char *bdrv_name = value ? bdrv_get_device_name(value) : ""; object_property_set_str(OBJECT(dev), bdrv_name, - name, &errp); - if (errp) { - qerror_report_err(errp); - error_free(errp); + name, &err); + if (err) { + qerror_report_err(err); + error_free(err); return -1; } return 0; |