OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

This reverts commit 8fa70dbd8b.

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>
This commit is contained in:
Dr. David Alan Gilbert 2019-07-29 17:29:02 +01:00 committed by Michael S. Tsirkin
parent fff3159900
commit 92fd453c67
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/hw/qdev-core.h
View File

@ -252,6 +252,8 @@ struct PropertyInfo {
/** /**
* GlobalProperty: * GlobalProperty:
* @used: Set to true if property was used when initializing a device. * @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. * 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 *property;
const char *value; const char *value;
bool used; bool used;
bool optional;
} GlobalProperty; } GlobalProperty;
static inline void static inline void

3
qom/object.c
View File

@ -386,6 +386,9 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp
if (object_dynamic_cast(obj, p->driver) == NULL) { if (object_dynamic_cast(obj, p->driver) == NULL) {
continue; continue;
} }
if (p->optional && !object_property_find(obj, p->property, NULL)) {
continue;
}
p->used = true; p->used = true;
object_property_parse(obj, p->value, p->property, &err); object_property_parse(obj, p->value, p->property, &err);
if (err != NULL) { if (err != NULL) {