From: Zhao Liu <zhao1.liu@intel.com>
When a new topology child is to be inserted into the topology tree, its
parents (including non-direct parents) need to check if this child is
supported.
Add the virtual method to allow topology device to check the support for
their topology children.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
hw/core/cpu-topo.c | 22 ++++++++++++++++++++++
include/hw/core/cpu-topo.h | 4 ++++
2 files changed, 26 insertions(+)
diff --git a/hw/core/cpu-topo.c b/hw/core/cpu-topo.c
index e244f0a3564e..cba2dc747e74 100644
--- a/hw/core/cpu-topo.c
+++ b/hw/core/cpu-topo.c
@@ -168,6 +168,23 @@ static void cpu_topo_update_info(CPUTopoState *topo, bool is_realize)
}
}
+static void cpu_topo_check_support(CPUTopoState *topo, Error **errp)
+{
+ CPUTopoState *parent = topo->parent;
+ CPUTopoClass *tc;
+
+ while (parent) {
+ tc = CPU_TOPO_GET_CLASS(parent);
+ if (tc->check_topo_child) {
+ tc->check_topo_child(parent, topo, errp);
+ if (*errp) {
+ return;
+ }
+ }
+ parent = parent->parent;
+ }
+}
+
static void cpu_topo_set_parent(CPUTopoState *topo, Error **errp)
{
Object *obj = OBJECT(topo);
@@ -191,6 +208,11 @@ static void cpu_topo_set_parent(CPUTopoState *topo, Error **errp)
}
if (topo->parent) {
+ cpu_topo_check_support(topo, errp);
+ if (*errp) {
+ return;
+ }
+
cpu_topo_build_hierarchy(topo, errp);
if (*errp) {
return;
diff --git a/include/hw/core/cpu-topo.h b/include/hw/core/cpu-topo.h
index 79cd8606feca..1ffdb0be6d38 100644
--- a/include/hw/core/cpu-topo.h
+++ b/include/hw/core/cpu-topo.h
@@ -46,6 +46,8 @@ OBJECT_DECLARE_TYPE(CPUTopoState, CPUTopoClass, CPU_TOPO)
* @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.
+ * @check_topo_child: Method to check the support for new child (including
+ * direct child and non-direct child) to be added.
*/
struct CPUTopoClass {
/*< private >*/
@@ -55,6 +57,8 @@ struct CPUTopoClass {
CPUTopoLevel level;
void (*update_topo_info)(CPUTopoState *parent, CPUTopoState *child,
bool is_realize);
+ void (*check_topo_child)(CPUTopoState *parent, CPUTopoState *child,
+ Error **errp);
};
/**
--
2.34.1