Commit 92fd453c authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Michael S. Tsirkin
Browse files

Revert "Revert "globals: Allow global properties to be optional"" 



This reverts commit 8fa70dbd.

Because we're about to revert it's neighbour and thus uses an optional
again.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190729162903.4489-2-dgilbert@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
parent fff31599

include/hw/qdev-core.h

+3 −0
Original line number Diff line number Diff line
@@ -252,6 +252,8 @@ 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.

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

    const char *value;

    bool used;

    bool optional;

} GlobalProperty;



static inline void

qom/object.c

+3 −0
Original line number Diff line number Diff line
@@ -386,6 +386,9 @@ 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) {