diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2016-06-15 16:08:06 -0300 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-07-07 15:24:52 -0300 |
| commit | 77280adbdf308af855844d921e5f16a873840568 (patch) | |
| tree | 03bc6680d5583bcc0f91a87821d58acc8d121090 /hw/core | |
| parent | 8d76bfe8f8dbc7995bc0682d14f5f92583ae5b0a (diff) | |
qdev: GlobalProperty.errp field
The new field will allow error handling to be configured by
qdev_prop_register_global() callers: &error_fatal and
&error_abort can be used to make QEMU exit or abort if any errors
are reported when applying the properties.
While doing it, change the error message from "global %s.%s=%s
ignored" to "can't apply global %s.%s=%s".
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/qdev-properties.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index c10edeecf1..3c20c8e4b2 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1085,9 +1085,14 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev, prop->used = true; object_property_parse(OBJECT(dev), prop->value, prop->property, &err); if (err != NULL) { - assert(prop->user_provided); - error_reportf_err(err, "Warning: global %s.%s=%s ignored: ", - prop->driver, prop->property, prop->value); + error_prepend(&err, "can't apply global %s.%s=%s: ", + prop->driver, prop->property, prop->value); + if (prop->errp) { + error_propagate(prop->errp, err); + } else { + assert(prop->user_provided); + error_reportf_err(err, "Warning: "); + } } } } |