diff options
| author | Markus Armbruster | 2019-03-08 14:14:35 +0100 |
|---|---|---|
| committer | Markus Armbruster | 2019-03-11 22:53:44 +0100 |
| commit | 617902af2c9203f4bb4112eb384870e248d42ad7 (patch) | |
| tree | f738ec26eb13850a77abe77c32c201da79467370 /include | |
| parent | qdev: Fix latent bug with compat_props and onboard devices (diff) | |
| download | qemu-617902af2c9203f4bb4112eb384870e248d42ad7.tar.gz qemu-617902af2c9203f4bb4112eb384870e248d42ad7.tar.xz qemu-617902af2c9203f4bb4112eb384870e248d42ad7.zip | |
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 'include')
| -rw-r--r-- | include/hw/qdev-core.h | 4 | ||||
| -rw-r--r-- | include/qom/object.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index aa8a3ea782..33ed3b8dde 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -431,10 +431,6 @@ const char *qdev_fw_name(DeviceState *dev); Object *qdev_get_machine(void); -void object_set_machine_compat_props(GPtrArray *compat_props); -void object_set_accelerator_compat_props(GPtrArray *compat_props); -void object_apply_compat_props(Object *obj); - /* FIXME: make this a link<> */ void qdev_set_parent_bus(DeviceState *dev, BusState *bus); diff --git a/include/qom/object.h b/include/qom/object.h index e0262962b5..288cdddf44 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -677,6 +677,9 @@ Object *object_new_with_propv(const char *typename, void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp); +void object_set_machine_compat_props(GPtrArray *compat_props); +void object_set_accelerator_compat_props(GPtrArray *compat_props); +void object_apply_compat_props(Object *obj); /** * object_set_props: |