From patchwork Thu Nov 30 14:41:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Liu X-Patchwork-Id: 13474503 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="dUHBhGU+" Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA41185 for ; Thu, 30 Nov 2023 06:32:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701354753; x=1732890753; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qW0hllcBGqseRYTHsmnEpW0X6HH9DmoP+0BU5Dr4Av4=; b=dUHBhGU+/1nnI1/vPshlXbuLn8PoBar2f9HkxQDszRrbx7uQxpohtHGA zXMXTAaW52iyp72df7/7K2/y+URa/SAGPyTGudRL4YFHmI6Ss2oYOugZi 0RXAVX+IsMcrRRgvtcnzUjeE6HO3L0KRPzzszPO1mCfDVjItS7eTc0FHG Mzo6wt+jhu8DOny4zEG26pIEHjqZZZhxo3zpqXmwjjQg9iuaFfn4+qvRb g6drzo/0yfaXihqC3pBNGS+m7O50cjRJ6Ura8TSeR9YNelFUbnjDaBAo/ OboSDuesBsVkYu9MdccCFnoUSLi5jd9LafXuOhYLu8iFeaQCSP7l3inif w==; X-IronPort-AV: E=McAfee;i="6600,9927,10910"; a="479531596" X-IronPort-AV: E=Sophos;i="6.04,239,1695711600"; d="scan'208";a="479531596" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2023 06:32:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10910"; a="942729823" X-IronPort-AV: E=Sophos;i="6.04,239,1695711600"; d="scan'208";a="942729823" Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orsmga005.jf.intel.com with ESMTP; 30 Nov 2023 06:32:07 -0800 From: Zhao Liu To: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Richard Henderson , "Michael S . Tsirkin" , Jason Wang , Nicholas Piggin , Daniel Henrique Barboza , Igor Mammedov , =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?b?RnLDqWTDqXJp?= =?utf-8?b?YyBCYXJyYXQ=?= , David Gibson , Harsh Prateek Bora , Stefano Stabellini , Anthony Perard , Paul Durrant , Gerd Hoffmann , Peter Maydell , Alistair Francis , "Edgar E . Iglesias" , =?utf-8?q?Daniel_P_=2E_Ber?= =?utf-8?q?rang=C3=A9?= , Bin Meng , Palmer Dabbelt , Weiwei Li , Liu Zhiwei , qemu-devel@nongnu.org, kvm@vger.kernel.org, qemu-ppc@nongnu.org, xen-devel@lists.xenproject.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org Cc: Nina Schoetterl-Glausch , Thomas Huth , Zhiyuan Lv , Zhenyu Wang , Yongwei Ma , Zhao Liu Subject: [RFC 11/41] hw/core/topo: Add virtual method to check topology child Date: Thu, 30 Nov 2023 22:41:33 +0800 Message-Id: <20231130144203.2307629-12-zhao1.liu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231130144203.2307629-1-zhao1.liu@linux.intel.com> References: <20231130144203.2307629-1-zhao1.liu@linux.intel.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Zhao Liu 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 --- 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); }; /**