[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 07/15] set_property(): push error handling to
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH v2 07/15] set_property(): push error handling to callers |
Date: |
Thu, 7 Feb 2013 16:55:35 -0200 |
On Tue, 5 Feb 2013 21:39:20 +0100
Laszlo Ersek <address@hidden> wrote:
> The return type can't be changed to void, because "set_property" must have
> type "qemu_opt_loopfunc".
>
> Conversion status (call chains covered or substituted by error propagation
> marked with square brackets):
This is fine to be squashed with the previous patch because only
set_property() and its caller are touched. Hope I didn't say the
contrary for this patch in my last review :)
One more comment below.
>
> do_device_add -> [qemu_find_opts -> error_report]
> do_device_add -> qdev_device_add -> qerror_report
> do_device_add -> qdev_device_add -> qbus_find -> qbus_find_recursive
> -> qerror_report
> do_device_add -> qdev_device_add -> qbus_find -> qerror_report
> do_device_add -> qdev_device_add -> [set_property -> qdev_prop_parse
> -> qerror_report_err]
>
> Signed-off-by: Laszlo Ersek <address@hidden>
> ---
> hw/qdev-monitor.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
> index 545e66c..da32763 100644
> --- a/hw/qdev-monitor.c
> +++ b/hw/qdev-monitor.c
> @@ -117,8 +117,7 @@ static int set_property(const char *name, const char
> *value, void *opaque)
>
> qdev_prop_parse(ctx->dev, name, value, &err);
> if (error_is_set(&err)) {
> - qerror_report_err(err);
> - error_free(err);
> + error_propagate(ctx->errp, err);
> return -1;
> }
> return 0;
> @@ -424,6 +423,7 @@ DeviceState *qdev_device_add(QemuOpts *opts)
> const char *driver, *path, *id;
> DeviceState *qdev;
> BusState *bus;
> + Error *local_err = NULL;
>
> driver = qemu_opt_get(opts, "driver");
> if (!driver) {
> @@ -488,9 +488,11 @@ DeviceState *qdev_device_add(QemuOpts *opts)
> }
>
> {
> - PropertyContext ctx = { .dev = qdev, .errp = NULL };
> + PropertyContext ctx = { .dev = qdev, .errp = &local_err };
>
> if (qemu_opt_foreach(opts, set_property, &ctx, 1) != 0) {
It's better to use local_err to check for error, as that's what
you use below.
> + qerror_report_err(local_err);
> + error_free(local_err);
> qdev_free(qdev);
> return NULL;
> }
- Re: [Qemu-devel] [PATCH v2 03/15] qdev_prop_parse(): extend signature with Error, (continued)
- [Qemu-devel] [PATCH v2 04/15] qdev_prop_parse(): push error handling to callers, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 05/15] qdev_prop_parse(): change return type to void, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 06/15] set_property(): extend signature with Error, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 07/15] set_property(): push error handling to callers, Laszlo Ersek, 2013/02/05
- Re: [Qemu-devel] [PATCH v2 07/15] set_property(): push error handling to callers,
Luiz Capitulino <=
- [Qemu-devel] [PATCH v2 12/15] qbus_find(): propagate error handling / consumption to callers, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 11/15] qbus_find(): extend signature with Error, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 15/15] qdev_device_add(): beautify "driver not found" error message, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 09/15] qbus_find_recursive(): extend signature with Error, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 08/15] qbus_find_recursive(): reorganize, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 13/15] qdev_device_add(): extend signature with Error, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 14/15] qdev_device_add(): push error handling/consumption to callers, Laszlo Ersek, 2013/02/05
- [Qemu-devel] [PATCH v2 10/15] qbus_find_recursive(): push Error and make it terminate a recursive search, Laszlo Ersek, 2013/02/05
- Re: [Qemu-devel] [PATCH v2 00/15] propagate Errors to do_device_add(), Luiz Capitulino, 2013/02/08