diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2019-07-29 17:29:02 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2019-07-29 16:57:27 -0400 |
| commit | 92fd453c6717acbeafcbbac39084a6f1c9ac6827 (patch) | |
| tree | b2115d0d9262aae071f5cb32bfcac8b0beb5961a | |
| parent | fff3159900d2b95613a9cb75fc3703e67a674729 (diff) | |
| download | focaccia-qemu-92fd453c6717acbeafcbbac39084a6f1c9ac6827.tar.gz focaccia-qemu-92fd453c6717acbeafcbbac39084a6f1c9ac6827.zip | |
Revert "Revert "globals: Allow global properties to be optional""
This reverts commit 8fa70dbd8bb478d9483c1da3e9976a2d86b3f9a0. Because we're about to revert it's neighbour and thus uses an optional again. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <20190729162903.4489-2-dgilbert@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | include/hw/qdev-core.h | 3 | ||||
| -rw-r--r-- | qom/object.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index e157fc4acd..136df7774c 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -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 diff --git a/qom/object.c b/qom/object.c index 3966a3d461..1555547727 100644 --- a/qom/object.c +++ b/qom/object.c @@ -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) { |