From: Zhao Liu <zhao1.liu@xxxxxxxxx> When a new topology device is inserted into the topology tree, its'parents (including non-direct parent) need to update topology information. Add the virtual method to help parents on topology tree update topology information statistics. Signed-off-by: Zhao Liu <zhao1.liu@xxxxxxxxx> --- hw/core/cpu-topo.c | 20 ++++++++++++++++++++ include/hw/core/cpu-topo.h | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/hw/core/cpu-topo.c b/hw/core/cpu-topo.c index 3e0c183388d8..e244f0a3564e 100644 --- a/hw/core/cpu-topo.c +++ b/hw/core/cpu-topo.c @@ -154,6 +154,20 @@ static void cpu_topo_build_hierarchy(CPUTopoState *topo, Error **errp) cpu_topo_refresh_free_child_index(parent); } +static void cpu_topo_update_info(CPUTopoState *topo, bool is_realize) +{ + CPUTopoState *parent = topo->parent; + CPUTopoClass *tc; + + while (parent) { + tc = CPU_TOPO_GET_CLASS(parent); + if (tc->update_topo_info) { + tc->update_topo_info(parent, topo, is_realize); + } + parent = parent->parent; + } +} + static void cpu_topo_set_parent(CPUTopoState *topo, Error **errp) { Object *obj = OBJECT(topo); @@ -178,6 +192,11 @@ static void cpu_topo_set_parent(CPUTopoState *topo, Error **errp) if (topo->parent) { cpu_topo_build_hierarchy(topo, errp); + if (*errp) { + return; + } + + cpu_topo_update_info(topo, true); } } @@ -203,6 +222,7 @@ static void cpu_topo_destroy_hierarchy(CPUTopoState *topo) return; } + cpu_topo_update_info(topo, false); QTAILQ_REMOVE(&parent->children, topo, sibling); parent->num_children--; diff --git a/include/hw/core/cpu-topo.h b/include/hw/core/cpu-topo.h index c0dfff9dc63b..79cd8606feca 100644 --- a/include/hw/core/cpu-topo.h +++ b/include/hw/core/cpu-topo.h @@ -44,6 +44,8 @@ OBJECT_DECLARE_TYPE(CPUTopoState, CPUTopoClass, CPU_TOPO) /** * CPUTopoClass: * @level: Topology level for this CPUTopoClass. + * @update_topo_info: Method to update topology information statistics when + * new child (including direct child and non-direct child) is added. */ struct CPUTopoClass { /*< private >*/ @@ -51,6 +53,8 @@ struct CPUTopoClass { /*< public >*/ CPUTopoLevel level; + void (*update_topo_info)(CPUTopoState *parent, CPUTopoState *child, + bool is_realize); }; /** -- 2.34.1