Commit 8fa70dbd authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Michael S. Tsirkin
Browse files

Revert "globals: Allow global properties to be optional" 



This reverts commit d7741743.

Relying on setting properties on parents types which may not
be relevant to certain sub-classes had unexpected side-effects
causing bugs in device config defaults. It is preferrable to
be explicit about which devices get which properties, even if
this needs repetition.

Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190215103239.28640-3-berrange@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent f2784eed

include/hw/qdev-core.h

+0 −3
Original line number Diff line number Diff line
@@ -251,8 +251,6 @@ struct PropertyInfo { 
/**

 * GlobalProperty:

 * @used: Set to true if property was used when initializing a device.

 * @optional: If set to true, GlobalProperty will be skipped without errors

 *            if the property doesn't exist.

 *

 * An error is fatal for non-hotplugged devices, when the global is applied.

 */
@@ -261,7 +259,6 @@ typedef struct GlobalProperty { 
    const char *property;

    const char *value;

    bool used;

    bool optional;

} GlobalProperty;



static inline void

qom/object.c

+0 −3
Original line number Diff line number Diff line
@@ -385,9 +385,6 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp 
        if (object_dynamic_cast(obj, p->driver) == NULL) {

            continue;

        }

        if (p->optional && !object_property_find(obj, p->property, NULL)) {

            continue;

        }

        p->used = true;

        object_property_parse(obj, p->value, p->property, &err);

        if (err != NULL) {