Commit cff8b715 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Acked-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent e12ca3ce

hw/core/qdev-properties.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

            }

include/hw/qdev-core.h

+2 −6
Original line number Diff line number Diff line
@@ -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

qom/cpu.c

+0 −1
Original line number Diff line number Diff line
@@ -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.",

target/i386/cpu.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

    }

target/sparc/cpu.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}