qdev-props: remove errp from GlobalProperty
All qdev_prop_register_global() set &error_fatal for errp, except '-rtc driftfix=slew', which arguably should also use &error_fatal, as otherwise failing to apply the property would only report a warning. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Acked-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
e12ca3ce1c
commit
cff8b715c0
@ -1238,8 +1238,8 @@ void qdev_prop_set_globals(DeviceState *dev)
|
||||
if (err != NULL) {
|
||||
error_prepend(&err, "can't apply global %s.%s=%s: ",
|
||||
prop->driver, prop->property, prop->value);
|
||||
if (!dev->hotplugged && prop->errp) {
|
||||
error_propagate(prop->errp, err);
|
||||
if (!dev->hotplugged) {
|
||||
error_propagate(&error_fatal, err);
|
||||
} else {
|
||||
warn_report_err(err);
|
||||
}
|
||||
|
@ -250,18 +250,14 @@ struct PropertyInfo {
|
||||
/**
|
||||
* GlobalProperty:
|
||||
* @used: Set to true if property was used when initializing a device.
|
||||
* @errp: Error destination, used like first argument of error_setg()
|
||||
* in case property setting fails later. If @errp is NULL, we
|
||||
* print warnings instead of ignoring errors silently. For
|
||||
* hotplugged devices, errp is always ignored and warnings are
|
||||
* printed instead.
|
||||
*
|
||||
* An error is fatal for non-hotplugged devices, when the global is applied.
|
||||
*/
|
||||
typedef struct GlobalProperty {
|
||||
const char *driver;
|
||||
const char *property;
|
||||
const char *value;
|
||||
bool used;
|
||||
Error **errp;
|
||||
} GlobalProperty;
|
||||
|
||||
static inline void
|
||||
|
@ -312,7 +312,6 @@ static void cpu_common_parse_features(const char *typename, char *features,
|
||||
prop->driver = typename;
|
||||
prop->property = g_strdup(featurestr);
|
||||
prop->value = g_strdup(val);
|
||||
prop->errp = &error_fatal;
|
||||
qdev_prop_register_global(prop);
|
||||
} else {
|
||||
error_setg(errp, "Expected key=value format, found %s.",
|
||||
|
@ -3568,7 +3568,6 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
|
||||
prop->driver = typename;
|
||||
prop->property = g_strdup(name);
|
||||
prop->value = g_strdup(val);
|
||||
prop->errp = &error_fatal;
|
||||
qdev_prop_register_global(prop);
|
||||
}
|
||||
|
||||
|
@ -111,7 +111,6 @@ cpu_add_feat_as_prop(const char *typename, const char *name, const char *val)
|
||||
prop->driver = typename;
|
||||
prop->property = g_strdup(name);
|
||||
prop->value = g_strdup(val);
|
||||
prop->errp = &error_fatal;
|
||||
qdev_prop_register_global(prop);
|
||||
}
|
||||
|
||||
|
1
vl.c
1
vl.c
@ -2964,7 +2964,6 @@ static int global_init_func(void *opaque, QemuOpts *opts, Error **errp)
|
||||
g->driver = qemu_opt_get(opts, "driver");
|
||||
g->property = qemu_opt_get(opts, "property");
|
||||
g->value = qemu_opt_get(opts, "value");
|
||||
g->errp = &error_fatal;
|
||||
qdev_prop_register_global(g);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user