We now can use TargetInfo information available from QOM, and remove duplicated target_info() symbol.
Reviewed-by: Marc-André Lureau <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Pierrick Bouvier <[email protected]> --- include/qemu/target-info-init.h | 5 ----- target-info-qom.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/qemu/target-info-init.h b/include/qemu/target-info-init.h index 32c323a7ef9..b7024c9faef 100644 --- a/include/qemu/target-info-init.h +++ b/include/qemu/target-info-init.h @@ -38,11 +38,6 @@ const TargetInfo *target_info(void) \ #include "qom/object.h" #define target_info_init(ti_var) \ -const TargetInfo *target_info(void) \ -{ \ - return &ti_var; \ -} \ - \ static const TypeInfo target_info_qom_target_type_info = { \ .name = TYPE_TARGET_INFO"-"TARGET_NAME, \ .parent = TYPE_TARGET_INFO, \ diff --git a/target-info-qom.c b/target-info-qom.c index 9947fcc9922..b48714cc77f 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -49,6 +49,11 @@ DEFINE_TARGET_INFO_TYPE(target_info_parent_type) static const TargetInfo *target_info_ptr; +const TargetInfo *target_info(void) +{ + return target_info_ptr; +} + void target_info_qom_set_target(void) { g_autoptr(GSList) targets = object_class_get_list(TYPE_TARGET_INFO, false); -- 2.43.0
