diff options
author | Markus Armbruster <armbru@redhat.com> | 2019-03-08 14:14:35 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2019-03-11 22:53:44 +0100 |
commit | 617902af2c9203f4bb4112eb384870e248d42ad7 (patch) | |
tree | f738ec26eb13850a77abe77c32c201da79467370 /hw/core | |
parent | 1a3ec8c1564f51628cce10d435a2e22559ea29fd (diff) | |
download | qemu-617902af2c9203f4bb4112eb384870e248d42ad7.zip qemu-617902af2c9203f4bb4112eb384870e248d42ad7.tar.gz qemu-617902af2c9203f4bb4112eb384870e248d42ad7.tar.bz2 |
qom: Move compat_props machinery from qdev to QOM
See the previous commit for rationale.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190308131445.17502-3-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/core')
-rw-r--r-- | hw/core/qdev.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 4f3200d..f9b6efe 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -978,45 +978,6 @@ static void device_initfn(Object *obj) QLIST_INIT(&dev->gpios); } -/* - * Global property defaults - * Slot 0: accelerator's global property defaults - * Slot 1: machine's global property defaults - * Each is a GPtrArray of of GlobalProperty. - * Applied in order, later entries override earlier ones. - */ -static GPtrArray *object_compat_props[2]; - -/* - * Set machine's global property defaults to @compat_props. - * May be called at most once. - */ -void object_set_machine_compat_props(GPtrArray *compat_props) -{ - assert(!object_compat_props[1]); - object_compat_props[1] = compat_props; -} - -/* - * Set accelerator's global property defaults to @compat_props. - * May be called at most once. - */ -void object_set_accelerator_compat_props(GPtrArray *compat_props) -{ - assert(!object_compat_props[0]); - object_compat_props[0] = compat_props; -} - -void object_apply_compat_props(Object *obj) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(object_compat_props); i++) { - object_apply_global_props(obj, object_compat_props[i], - &error_abort); - } -} - static void device_post_init(Object *obj) { /* |