commit 92fd453c6717acbeafcbbac39084a6f1c9ac6827
author Dr. David Alan Gilbert <dgilbert@redhat.com> Mon Jul 29 17:29:02 2019 +0100
committer Michael S. Tsirkin <mst@redhat.com> Mon Jul 29 16:57:27 2019 -0400
tree b2115d0d9262aae071f5cb32bfcac8b0beb5961a
parent fff3159900d2b95613a9cb75fc3703e67a674729

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>

qom/object.c

diff --git a/qom/object.c b/qom/object.c
index 3966a3d..1555547 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -386,6 +386,9 @@
         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) {