We now can use TargetInfo information available from QOM, and remove duplicated target_info() symbol.
Reviewed-by: Marc-André Lureau <[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 859451c672e..a9efd8a1e40 100644 --- a/include/qemu/target-info-init.h +++ b/include/qemu/target-info-init.h @@ -50,11 +50,6 @@ typedef struct TargetInfoQomTargetClass { OBJECT_DECLARE_TYPE(TargetInfoQomTarget, TargetInfoQomTargetClass, TARGET_INFO_TARGET) #define target_info_init(ti_var) \ -const TargetInfo *target_info(void) \ -{ \ - return &ti_var; \ -} \ - \ static void target_info_qom_class_init(ObjectClass *oc, const void * data) \ { \ TargetInfoQomTargetClass *klass = TARGET_INFO_TARGET_CLASS(oc); \ diff --git a/target-info-qom.c b/target-info-qom.c index 9d1f50ffcab..cc470b3b4d6 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -39,6 +39,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
