diff options
| author | Dr. David Alan Gilbert | 2019-07-29 18:29:02 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2019-07-29 22:57:27 +0200 |
| commit | 92fd453c6717acbeafcbbac39084a6f1c9ac6827 (patch) | |
| tree | b2115d0d9262aae071f5cb32bfcac8b0beb5961a /qom | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190726'... (diff) | |
| download | qemu-92fd453c6717acbeafcbbac39084a6f1c9ac6827.tar.gz qemu-92fd453c6717acbeafcbbac39084a6f1c9ac6827.tar.xz 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>
Diffstat (limited to 'qom')
| -rw-r--r-- | qom/object.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) { |