From: Igor Mammedov <imammedo@redhat.com>
To: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Cc: qemu-devel@nongnu.org, ehabkost@redhat.com,
"Andreas Färber" <afaerber@suse.de>
Subject: Re: [Qemu-devel] [PATCH for-3.2 v5 14/19] qdev-props: call object_apply_global_props()
Date: Mon, 10 Dec 2018 18:28:01 +0100 [thread overview]
Message-ID: <20181210182801.7eda2151@Igors-MacBook-Pro.local> (raw)
In-Reply-To: <20181204142023.15982-15-marcandre.lureau@redhat.com>
On Tue, 4 Dec 2018 18:20:18 +0400
Marc-André Lureau <marcandre.lureau@redhat.com> wrote:
> It's now possible to use the common function.
>
> Teach object_apply_global_props() to warn if Error argument is NULL.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/core/qdev-properties.c | 24 ++----------------------
> qom/object.c | 12 +++++++++++-
> 2 files changed, 13 insertions(+), 23 deletions(-)
>
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index a2d25d3d37..6061090dc2 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -1223,28 +1223,8 @@ int qdev_prop_check_globals(void)
>
> void qdev_prop_set_globals(DeviceState *dev)
> {
> - int i;
> -
> - for (i = 0; i < global_props()->len; i++) {
> - GlobalProperty *prop;
> - Error *err = NULL;
> -
> - prop = g_ptr_array_index(global_props(), i);
> - if (object_dynamic_cast(OBJECT(dev), prop->driver) == NULL) {
> - continue;
> - }
> - prop->used = true;
> - object_property_parse(OBJECT(dev), prop->value, prop->property, &err);
> - if (err != NULL) {
> - error_prepend(&err, "can't apply global %s.%s=%s: ",
> - prop->driver, prop->property, prop->value);
> - if (!dev->hotplugged) {
> - error_propagate(&error_fatal, err);
> - } else {
> - warn_report_err(err);
> - }
> - }
> - }
> + object_apply_global_props(OBJECT(dev), global_props(),
> + dev->hotplugged ? NULL : &error_fatal);
> }
>
> /* --- 64bit unsigned int 'size' type --- */
> diff --git a/qom/object.c b/qom/object.c
> index dbdab0aead..aa6f3a2a71 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -390,7 +390,17 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp
> if (err != NULL) {
> error_prepend(&err, "can't apply global %s.%s=%s: ",
> p->driver, p->property, p->value);
> - error_propagate(errp, err);
> + /*
> + * If errp != NULL, propagate error and return.
> + * If errp == NULL, report a warning, but keep going
> + * with the remaining globals.
> + */
> + if (errp) {
> + error_propagate(errp, err);
> + return;
> + } else {
> + warn_report_err(err);
> + }
> }
> }
> }
next prev parent reply other threads:[~2018-12-10 17:28 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 14:20 [Qemu-devel] [PATCH for-3.2 v5 00/19] Generalize machine compatibility properties Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 01/19] tests: qdev_prop_check_globals() doesn't return "all_used" Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 02/19] qom: make interface types abstract Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 03/19] qom: make user_creatable_complete() specific to UserCreatable Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 04/19] accel: register global_props like machine globals Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 05/19] qdev: move qdev_prop_register_global_list() to tests Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 06/19] qom: remove unimplemented class_finalize Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 07/19] hw: apply accel compat properties without touching globals Marc-André Lureau
2018-12-10 16:45 ` Igor Mammedov
2018-12-10 16:54 ` Igor Mammedov
2018-12-12 12:00 ` Marc-André Lureau
2018-12-13 12:06 ` Igor Mammedov
2018-12-11 13:14 ` Igor Mammedov
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 08/19] hw: apply machine " Marc-André Lureau
2018-12-10 17:31 ` Eduardo Habkost
2018-12-11 12:07 ` Marc-André Lureau
2018-12-11 14:02 ` Eduardo Habkost
2018-12-11 14:23 ` Eduardo Habkost
2018-12-11 14:30 ` Marc-André Lureau
2018-12-11 15:52 ` Igor Mammedov
2018-12-11 17:43 ` Eduardo Habkost
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 09/19] hw: remove SET_MACHINE_COMPAT Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 10/19] qdev: make a separate helper function to apply compat properties Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 11/19] qdev: all globals are now user-provided Marc-André Lureau
2018-12-10 17:00 ` Igor Mammedov
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 12/19] qdev-props: convert global_props to GPtrArray Marc-André Lureau
2018-12-10 17:05 ` Igor Mammedov
2018-12-11 12:12 ` Marc-André Lureau
2018-12-11 13:03 ` Igor Mammedov
2018-12-11 13:04 ` Igor Mammedov
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 13/19] qdev-props: remove errp from GlobalProperty Marc-André Lureau
2018-12-10 17:20 ` Igor Mammedov
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 14/19] qdev-props: call object_apply_global_props() Marc-André Lureau
2018-12-10 17:28 ` Igor Mammedov [this message]
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 15/19] qom: add object_class_get_class_data() Marc-André Lureau
2018-12-11 16:02 ` Igor Mammedov
2018-12-12 18:48 ` Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 16/19] RFC: arm: replace instance_post_init() Marc-André Lureau
2018-12-11 13:43 ` Igor Mammedov
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 17/19] hw/i386: add pc-i440fx-4.0 & pc-q35-4.0 Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 18/19] hw/arm/virt: add virt-4.0 machine type Marc-André Lureau
2018-12-04 14:20 ` [Qemu-devel] [PATCH for-3.2 v5 19/19] hostmem: use object id for memory region name with >= 4.0 Marc-André Lureau
2018-12-04 14:22 ` [Qemu-devel] [PATCH for-3.2 v5 00/19] Generalize machine compatibility properties Marc-André Lureau
2018-12-10 17:07 ` Eduardo Habkost
2018-12-10 17:31 ` Igor Mammedov
2018-12-10 17:39 ` Eduardo Habkost
2018-12-11 15:11 ` Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181210182801.7eda2151@Igors-MacBook-Pro.local \
--to=imammedo@redhat.com \
--cc=afaerber@suse.de \
--cc=ehabkost@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).