| Message ID | 20181204142023.15982-15-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Generalize machine compatibility properties | expand |
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); > + } > } > } > }
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); + } } } }
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> --- hw/core/qdev-properties.c | 24 ++---------------------- qom/object.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 23 deletions(-)