From nobody Tue Apr 1 08:34:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1742769745; cv=none; d=zohomail.com; s=zohoarc; b=i/WUKIY9UxLrPhZvfT0Q+i4+dwTizbIYAHhFL8nD5HoTmvLJ+6klsPyETPcPGjdpcEjJCzqyHEEhuf6O8zTkAwKD4bzSFCFI+dzUDBaRCZFJDIDkzwkU74PP6xoIGdX09WVf3z+qvUPBgbjbVXGznofk4r1t5qO0w9CxG1TAKRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742769745; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nhKX0vmLXuR6wN4mzYTdPit8e/28nQp1dDgh0h4fk/k=; b=lNELS60NTwbYyyNddZ2/8BCcRB5kHupd62ZEl/tya6BdZjZj/VLpK/1ESKXCvazvdjJjjoi342RZ63F3IqR6CbSEVLNIg2yyTbaXmqqMEO9emhAbqOX0K51+13fyJ2wM5x8ClabAlVI9MKuFtdpAaZ/TnW4CFAaJHBez/z6Nzs4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742769745406964.6035349440576; Sun, 23 Mar 2025 15:42:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twTzt-0005y6-Kx; Sun, 23 Mar 2025 18:40:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twTzs-0005xQ-71 for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:40:48 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twTzo-000693-TG for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:40:47 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3996af42857so3065906f8f.0 for ; Sun, 23 Mar 2025 15:40:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3997f9e6550sm8950122f8f.78.2025.03.23.15.40.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 23 Mar 2025 15:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742769643; x=1743374443; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nhKX0vmLXuR6wN4mzYTdPit8e/28nQp1dDgh0h4fk/k=; b=VBanfnSJMwgvfUJsf7NDjByC2mw8c9ktWIf+o6ljSb7CvRzMQLUwDb1czmZmUnUShl U0fKH61HqwmH3NE0cop0TqJxxqeqc2gCQv33hn+m2hMQt0wgB+LpuLJT8NvDOZupV67o 4jcmaPwnZTNy6JR27EHC7JqSaCylEoiY0pNaNKDKw4sjYf2Y5K6DK9bICYXjgn+7HuGZ ZbT63t+6uX3IRMw7E6R2KEkXcTMfTcv4Vo04wucjoA0pKQuU4raYFo5notwY4sbKs7tt pmMkiTxRw3VaOQh0BFVqs3Hd8mz6768aQ+geK27VgTxg6CynDIcBFnL0bJtwECrk5aWm rhDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742769643; x=1743374443; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nhKX0vmLXuR6wN4mzYTdPit8e/28nQp1dDgh0h4fk/k=; b=NLu6u4HO7X5arrynuO235Aqa8Rz80v+6JVDwhFgk+Ju3Kt+FvgrO8zefVNHML9WdHs cGxv+SClC+IYHO7KUqhmbS7vrR2rDAsCru5jX4MfzbCkVQ19EjdTGhPsBar2ZJScEpjd +D/F7sFwY9dnNjqho4lSKMeBOWXkmIecLYNXlGmcQ3WkzErrirdfU/tMhX763e2Ib1wg 4rS29VV6072BP17xAQ8qTdxgjU8kRJNF2EaT67qnmG88miTzSkE1chwkQLyqIHKfrz5d tN9e4HdN4tXqwL1Eqbq6pvW7L2jf4M1m7VRZNclbmakPUQ2X9ZsYlJBhdV/LcS+pBLXt 6rHw== X-Gm-Message-State: AOJu0YxPMbvMQCi8ojpJhQRwb7jZg5oKF4/tx4vGDaoOOAc5o0MOQORJ roQ1RqExwtkqEsEKrTfys24FnXhEfs83+0YUajdXyAgHI3x3FWRt9niQ4k/lPxSx1s6cv94411w 2 X-Gm-Gg: ASbGnctsL7B43kgXhV6dj33Lsg2LJoJGpw3Mwc8TUOLo5SCZb3DhAFNbN9TVzIFicwv f1dcaxGFDvvZtlsGlemhRFOES9je1X1UF2+xvEQCUzfeaP+wM1UmzNeI5A51oRxq3aWti8kMeyD 6B6iIh5XbJc+95pnNVR1riR8xLKKEcPN2gyMPsCxM5nJTYqnre/IGnqAB30hYxynLt4zg85h0h7 j8U9Y6Vv5xOGPrJNglnbYhTZPDW/TPMxL0lWoxMqJbqiFqiMcJWz5+uYriYTQTksHW6H+47993g o5tOxQbfpbVqQFg1ORLQrgxkogo34oOK4tLwtg5t4tqvTCoqbUjqAs3bNhk/JeMk0hfOnNUX88J C+DYm4ZxUQt5fz5WUaOq9bNpC X-Google-Smtp-Source: AGHT+IFflsrLMo/UGHQqRRk7o1mTQKQmadLe/rH1dXZf4WUm2XhZjj31meiSClOT8s3tIaqwtD/l0A== X-Received: by 2002:a5d:5889:0:b0:390:f9d0:5e7 with SMTP id ffacd0b85a97d-3997f90f2f2mr10700608f8f.13.1742769642913; Sun, 23 Mar 2025 15:40:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Artyom Tarasenko , Thomas Huth , Nicholas Piggin , qemu-ppc@nongnu.org, Zhao Liu , Richard Henderson , Pierrick Bouvier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 1/6] cpus: Introduce CPUClass::list_cpus() callback Date: Sun, 23 Mar 2025 23:40:30 +0100 Message-ID: <20250323224035.34698-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250323224035.34698-1-philmd@linaro.org> References: <20250323224035.34698-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1742769745638116600 Some targets define cpu_list to a method listing their CPUs on stdout. In order to make list_cpus() generic, introduce the CPUClass::list_cpus() callback. When no callback is registered, list_cpus() defaults to the cpu_list definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- include/hw/core/cpu.h | 2 ++ cpu-target.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 5d11d26556a..ccfcd3eb3a6 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -102,6 +102,7 @@ struct SysemuCPUOps; * CPUClass: * @class_by_name: Callback to map -cpu command line model name to an * instantiatable CPU type. + * @list_cpus: list available CPU models and flags. * @parse_features: Callback to parse command line arguments. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. * @mmu_index: Callback for choosing softmmu mmu index; @@ -150,6 +151,7 @@ struct CPUClass { /*< public >*/ =20 ObjectClass *(*class_by_name)(const char *cpu_model); + void (*list_cpus)(void); void (*parse_features)(const char *typename, char *str, Error **errp); =20 int (*mmu_index)(CPUState *cpu, bool ifetch); diff --git a/cpu-target.c b/cpu-target.c index cae77374b38..5947ca31a0a 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -98,7 +98,13 @@ static void cpu_list(void) =20 void list_cpus(void) { - cpu_list(); + CPUClass *cc =3D CPU_CLASS(object_class_by_name(CPU_RESOLVING_TYPE)); + + if (cc->list_cpus) { + cc->list_cpus(); + } else { + cpu_list(); + } } =20 /* enable or disable single step mode. EXCP_DEBUG is returned by the --=20 2.47.1 From nobody Tue Apr 1 08:34:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1742769721; cv=none; d=zohomail.com; s=zohoarc; b=fjtHybIkOLIwc46s6SbXx7IfU7WG2lx8Axr/D6tulXYYzu8CRszNosvlP6ZOBEYRN0w7rDNCltEaDASuP7NRX1YdAvOK9HxajRd2BYedMNJLuELqi1ul1ZdxKNe5M2grsYfcAKjvT5KbECV0gkLgpgWxmSUc/yUEUFx/2larcX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742769721; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZmDLsaOdc04ruhix/U5gYX9i3TxolNL0TznRXmkTJYc=; b=cpq/QYLf1s9L6CnG6ate0rqfTvJ+gV6e52ZYVUH39XWyXI9U+VHRyM81Ae+ZhG69QIZm4MpI9LBjJEIHxQ/fevi6NsiXw4dZ69shY9bBZfoD3+wxSTtUCXunKLXGKlhfxJtEWD8K9+YqxSRu/N/4QifdYxgHYLhHe7Pw5IBwG4Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174276972164326.684224307934414; Sun, 23 Mar 2025 15:42:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twTzx-0005z5-RB; Sun, 23 Mar 2025 18:40:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twTzw-0005yf-N5 for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:40:52 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twTzt-00069x-NA for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:40:52 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso35384315e9.2 for ; Sun, 23 Mar 2025 15:40:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43f55c3dsm151982885e9.23.2025.03.23.15.40.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 23 Mar 2025 15:40:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742769648; x=1743374448; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZmDLsaOdc04ruhix/U5gYX9i3TxolNL0TznRXmkTJYc=; b=u8tUT9R/qM4a+5Rmv+ZyQECWIJcNvO+/QgV6U3jUQBP1UxvrQjxcPJOhzOA5tl4Kkj euH7QWm8gl9/qLtqKrQmAOdywj2f9Iyp6E9Z8xZNxvHBob/SeiOYJ/lXkEnGu+DuaicE OFVElRFF4CZal+ZXtGvCn2HukbbxWqtD+elFIZR43jv5zcsJCWiO/IwqK/Ac00CVtxgW +8hfnm4g9DeXN+GVmnmUlH8j4592Cp9wu6l0iR8L9sfDoAhrWz91sbAIVerstCzEsv33 /dCqyuet4Z/wvdivZoIYy8uVLn6xrRIYcyrvCg7YGmZAufqSI5lTtO2C3/6o4LMvWFjm 6ZWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742769648; x=1743374448; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZmDLsaOdc04ruhix/U5gYX9i3TxolNL0TznRXmkTJYc=; b=A76Xp0rd+wRpWW5KULJgHY2TEIy6BJ5EO0s7jbfk3ISzWFuaIc4cKrc/ZB4bULUvpY VqbHc2GIqPDjkA2DpORrs8krOA35mTH4Ngb7aM2U6SDEKrgHlsJzGo0IG/GTkuuAKgpV T1SUSu8ctdGB2c0ZP+O//LohC84FSMJf/TNm11SYVbmu2hc1KsI2Go7NawDXjTAQ1+Ze se2AoQTNb3yve6eUIjayh3IoiFmHNTSFEivACcglnehv4U7Vo3mpuqK4QeYP+OCOV6mD Z9NJnqC09lE2mc0FZmODlFcn+gDeYNxHOWQyXIPjWGqbi+TA9dMBGZuFdLnqszskUqZr /nxQ== X-Gm-Message-State: AOJu0Yz8RBqs4VnQ6TqZyKYkYij0PkgNzf53TB4YtkhpSE3VlP86t5XM 7mAtsRd65D/a6Ze9rYg+sDEuTvR4zecKXJs8qaiVcEHAvHOBVAsVXpXhsl7764rxHo6XGSF5WrO u X-Gm-Gg: ASbGnctFBNeuXRa5Lfs+Nc9C5OeOp6BQW/Ho/iJbO1/D3U6QYM5XgYqLKI4ZSjOqbmX h+lAmRZxV4KbViE10nMafHKfPSk8FtMS5MIRtyknQWGFhaXijiPQ+QtbvyTiBKYfhMjm3dgv3d3 0XmfmZ+CdgmsCj4P+HUs3n48UAADAUCXEwpT7J4rQ7mjFS8tezVLC8j7XKsaaetl98Ao5yhcxeM BstLq7eW9xSlyhpKX8OJg6e4anoNe3WGVexHZa+yeuwCCkNbr8A9KgIMXotoaeQgcvx3XDxm4w3 q7lVUHcugdU+cUDnY/184Fy16RlPtZ6omfV5WthTxckHzvQ1oIbi51/tlBL+MwFJXQiSlSYlXzN 5x6M0a38TfGiNXor6kYSailr1 X-Google-Smtp-Source: AGHT+IFvcP7ypu5CUz1neqAdFZu7HYZVYYz35GwT9ZxpgVEhiRaySxRa4am+20mgwMgEDUJ/eQ8i+A== X-Received: by 2002:a05:600c:4695:b0:43c:f75a:eb54 with SMTP id 5b1f17b1804b1-43d50a0a023mr93935705e9.13.1742769647766; Sun, 23 Mar 2025 15:40:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Artyom Tarasenko , Thomas Huth , Nicholas Piggin , qemu-ppc@nongnu.org, Zhao Liu , Richard Henderson , Pierrick Bouvier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 2/6] target/i386: Register CPUClass:list_cpus Date: Sun, 23 Mar 2025 23:40:31 +0100 Message-ID: <20250323224035.34698-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250323224035.34698-1-philmd@linaro.org> References: <20250323224035.34698-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1742769723345116600 Register x86_cpu_list() as CPUClass:list_cpus callback. Reduce its scope and remove the cpu_list definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- target/i386/cpu.h | 3 --- target/i386/cpu.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 76f24446a55..28011eff0a8 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2367,7 +2367,6 @@ int x86_cpu_gdb_read_register(CPUState *cpu, GByteArr= ay *buf, int reg); int x86_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void x86_cpu_gdb_init(CPUState *cs); =20 -void x86_cpu_list(void); int cpu_x86_support_mca_broadcast(CPUX86State *env); =20 #ifndef CONFIG_USER_ONLY @@ -2561,8 +2560,6 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu32") #endif =20 -#define cpu_list x86_cpu_list - /* MMU modes definitions */ #define MMU_KSMAP64_IDX 0 #define MMU_KSMAP32_IDX 1 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1b64ceaaba4..1f502587c96 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6305,7 +6305,7 @@ static void x86_cpu_list_entry(gpointer data, gpointe= r user_data) } =20 /* list available CPU models and flags */ -void x86_cpu_list(void) +static void x86_cpu_list(void) { int i, j; GSList *list; @@ -8924,6 +8924,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc= , void *data) cc->reset_dump_flags =3D CPU_DUMP_FPU | CPU_DUMP_CCOP; =20 cc->class_by_name =3D x86_cpu_class_by_name; + cc->list_cpus =3D x86_cpu_list; cc->parse_features =3D x86_cpu_parse_featurestr; cc->mmu_index =3D x86_cpu_mmu_index; cc->dump_state =3D x86_cpu_dump_state; --=20 2.47.1 From nobody Tue Apr 1 08:34:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1742769723; cv=none; d=zohomail.com; s=zohoarc; b=QHvAn57guN8OdwRbOgXymFJQzWoCOvt8xLwDzzlBgautqjcqPWuO32sL/m0QBifdqntWZQmA7sa3yHIUP1NGBcVrV3XWQruCCMJJiN7CY9CfjN92YUYTNazvqU8mlDWcRiB9Xpy7mA0tcLQmmz1rAemO5dwaFLI34dMgnlYRu/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742769723; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mYynSm+9EDEtOgu3b8Om5yz3MdguMMae0p+vB1NumPQ=; b=SjiHKitZTTlfPImkY+vxg8JUiJV/yIfXuXG9CD0NDdfb4d1bUsjOF0s7fp5tJCwhMWj4xX0NiZu4to0n+74b/Q0WTCt0jaVvUVjIyyPyF/ABg9T0esFSKQYS45RjD0kvWUn2ta1Ko7PfRVytGgb9ojUgGPhEuOMZHeqLiGya+LY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742769723424911.8734947642622; Sun, 23 Mar 2025 15:42:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twU02-000615-QF; Sun, 23 Mar 2025 18:40:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twU01-00060Q-MD for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:40:57 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twTzz-0006Av-4z for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:40:57 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso26970255e9.3 for ; Sun, 23 Mar 2025 15:40:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d4fd9ec29sm99906115e9.30.2025.03.23.15.40.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 23 Mar 2025 15:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742769653; x=1743374453; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mYynSm+9EDEtOgu3b8Om5yz3MdguMMae0p+vB1NumPQ=; b=i6KJbQ51IkhJIjqUwthMdGXCckcUT23ysqq4nlLotXpcVRipAhSAfH7bPTbz656GQL 5vGttspcMvLklXZf/XgiMWokZgL+MXUsFTWEdyOwCwfkVmzCmqelsPcYt5Ec6uhWoDpy a3geNcMCK7VsbN2FUMeFRNrPuTRP0+ZOSyJjCytpKArnt0ASpSUvMsZk3NvpmKZ6seDX 3MOJEWu0+f++X/TjK4pkJG/ygKxLoQ5Xk2ynMq/nn1H516mSnbA6bz0v78Ti7sDoZUej 8U3rFQPSKKf5VhISNi4r6hbO+mnRRHalg74r352EbzOyKRegZpZu0v4BE6yl1bWts5wv x+yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742769653; x=1743374453; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mYynSm+9EDEtOgu3b8Om5yz3MdguMMae0p+vB1NumPQ=; b=GQLgtXlqrgIr1IBnhSpm9aGFW1eG2rxBiR8oA1+OQJUMVm/q1OP8YE3W6obS9phU9b O2WD/EBVHwpgR/s8F9U9Ej9RyEkiH/PK41D61S8fC4CVAvfnSYe0IV2zjaV56ZpgKkOe Xk+XHrCk9GYJALHxATI4QjdRatwo4Wx7nyaOCsgp2PXgcloApWpnhJMdGhIo0rce38Zw mHL7NHRNa6p0CJ4dUqaj3HfC7XaOsIk6B5JatY6ZQv5JyVkU5E331QvH7DxwdF6ABCOr GJvV8iCkPMd7v4iOTHtIqBUYIVgw+Rgwl+kt2Y58iMtuzeU19dAl4c9lA2ZrQ23dXX+w 63Eg== X-Gm-Message-State: AOJu0Yy4u4rxSr0OPGl/4OCjj6Y9eng2MzHDrYrZgzfKjp1aQGl6sVzL TVdKwB9VryiKZHwwzYlxLQf7rdtFxWFDdPbmgJlodZsJsq0/GCd9W2BB7JMVSHiKwtF5KzpfwWl x X-Gm-Gg: ASbGnctOCtPN/W0hhXRTzmVYKhwjTbpE/WRwo3sqHQiDmbPwdV3ycZ8ak53KsiwBJbN 2D9uubm+gDZ1BnCB4haoq5ih6H08WNDOad3+mn/+KnCrn1oPGimLZoKuYUyLl0RT+nlB1rqnh/I ECuCIqZmxFVgB9/mc2krbun1TeAKSkpBP1jVhXFbipNT5GoCBmyw7LZVOuCdlqDtRT5gUzymSZy RJwMyFxTQxux7ge98oZ23IFCgybFoUy1by4Y6jFOmIsBX+/kfpzO1Q7LxhOt9G5BydFUbeLchC/ 1j8j09wXxArkx4TZpR2RvYG342D4YMD5xxHyEt909jTKGVbOF3yvSF1/YMd7OhPkSqv0A60yylp NBG+tW232tILmWvwyg6aAEnBa X-Google-Smtp-Source: AGHT+IHu6nTaDTvMdJva7IIQ+uauVzNPBByWzEHqVWKP9akbw5+xGLq7TD467xePGXFnQLiQkkWnWw== X-Received: by 2002:a05:600c:3c9b:b0:43d:d06:3798 with SMTP id 5b1f17b1804b1-43d50a31ffamr100862405e9.20.1742769653276; Sun, 23 Mar 2025 15:40:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Artyom Tarasenko , Thomas Huth , Nicholas Piggin , qemu-ppc@nongnu.org, Zhao Liu , Richard Henderson , Pierrick Bouvier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 3/6] target/ppc: Register CPUClass:list_cpus Date: Sun, 23 Mar 2025 23:40:32 +0100 Message-ID: <20250323224035.34698-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250323224035.34698-1-philmd@linaro.org> References: <20250323224035.34698-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1742769725374116600 Register ppc_cpu_list() as CPUClass:list_cpus callback. Reduce its scope and remove the cpu_list definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- target/ppc/cpu.h | 4 ---- target/ppc/cpu_init.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index efab54a0683..0062579ef3e 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1597,8 +1597,6 @@ void ppc_store_dawrx1(CPUPPCState *env, uint32_t valu= e); #endif /* !defined(CONFIG_USER_ONLY) */ void ppc_store_msr(CPUPPCState *env, target_ulong value); =20 -void ppc_cpu_list(void); - /* Time-base and decrementer management */ uint64_t cpu_ppc_load_tbl(CPUPPCState *env); uint32_t cpu_ppc_load_tbu(CPUPPCState *env); @@ -1660,8 +1658,6 @@ static inline uint64_t ppc_dump_gpr(CPUPPCState *env,= int gprn) int ppc_dcr_read(ppc_dcr_t *dcr_env, int dcrn, uint32_t *valp); int ppc_dcr_write(ppc_dcr_t *dcr_env, int dcrn, uint32_t val); =20 -#define cpu_list ppc_cpu_list - /* MMU modes definitions */ #define MMU_USER_IDX 0 static inline int ppc_env_mmu_index(CPUPPCState *env, bool ifetch) diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 8b590e7f17c..0ccb9068c89 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7184,7 +7184,7 @@ static void ppc_cpu_list_entry(gpointer data, gpointe= r user_data) g_free(name); } =20 -void ppc_cpu_list(void) +static void ppc_cpu_list(void) { GSList *list; =20 @@ -7525,6 +7525,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void = *data) &pcc->parent_phases); =20 cc->class_by_name =3D ppc_cpu_class_by_name; + cc->list_cpus =3D ppc_cpu_list; cc->mmu_index =3D ppc_cpu_mmu_index; cc->dump_state =3D ppc_cpu_dump_state; cc->set_pc =3D ppc_cpu_set_pc; --=20 2.47.1 From nobody Tue Apr 1 08:34:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1742769698; cv=none; d=zohomail.com; s=zohoarc; b=Xe1VE1uYCDtph98nIgKZATnx6BBzEQdaIjGJP+9BRnogUiyFGukfKy1F8qLScQ+tghodY1yqNfYXZhjzmck0Eym/d98MTFz904oWiaSloZ4qNvLnEH9kI35fjqirceeBm1mdzc57vDmCA0uAiILlt/LvkxhxwrGzZZMa6Vks8dI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742769698; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=F3UrwbOIIaM8kGadwD98OC60MbBxsesgGxlGmJo4cKw=; b=S8kYHmDIumBPOyUZuY47TR2KgO0EfsaklKrMiQ+SOls7lj1GikusosZ7yH+4xGcLHi+31HLtfiTW6XUMXmCGoOrc5VXIGmkowtn2I+djJCb81E9AaIZOAxpV17TcXjxXEOVvMupKFh3xyKwwBUMaXTdwa4OYJNTPUWyIaDPMP0Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742769698063907.8663800130317; Sun, 23 Mar 2025 15:41:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twU09-00063Z-Ue; Sun, 23 Mar 2025 18:41:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twU07-000628-BQ for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:41:03 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twU04-0006Bu-HX for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:41:03 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4394a823036so37961855e9.0 for ; Sun, 23 Mar 2025 15:41:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43f47196sm150164465e9.16.2025.03.23.15.40.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 23 Mar 2025 15:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742769659; x=1743374459; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F3UrwbOIIaM8kGadwD98OC60MbBxsesgGxlGmJo4cKw=; b=kyGoI3dbmIEO5h4Z6lodldM1OVzo3hWQivogsOGviwoDqvKUz4/2iT8CRJc95+wsl5 rZFbwG5ERpeFx54F1moNnSXfHG1xC/rdDF7//UGk93Iy4zhG075XzQxPJVpNm4fB9IqX 5xH8KxVn0uHkJV5jRIwXS7NY2Q42oxGJgsyp7MRerWXx96zocqANnx/sPWD6PMs5r+cI uB7dA+BjRWLsUM2qLkZyOFWXRIb9BScDLEXnlqWlkh1EfBkbQV3BY7LdhSe5/Gs3l2MK SR+YW8B2jqtdO+/SJ32IBhAhnIYcn4ZSuAShASpyja9e/iAuhuWR4AdB+oo4PWJtqYjj mk7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742769659; x=1743374459; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F3UrwbOIIaM8kGadwD98OC60MbBxsesgGxlGmJo4cKw=; b=kpTLv+jotSUsNrBEzszQDF4Pw16J4ZMSKhqkqKfP/EB3O/J65YBkM7PZXCckqtf1sh s7JDQLU9dfYfM1vL3gNKQf+dhgg7YhjDUDbfK9F0Hf5jYNG4sqvbH3w2mNtno4pDfWsD Aw/4wTVXKN7dYMDFd39CsG6pVLfKijj6YPRXgmkyfgMFHAw4nel0GRDbmFXL9l+zGb9/ utgBd1ga3NGVg+E4k8SDm0udT6MvgZZ8+AsANLPG4G3IzKPVkspfhl5uz6eq2Y+EAE9B 25+N99p8GqLMl1zeJ7QGjMeZGuIx3rkap2GcielTMq4iqjy7v0hkkVQqkEwmPlP4qYGY KRsQ== X-Gm-Message-State: AOJu0YyP8cMSxK0oHHEEvJk4YJq4j9Cgvq4AaGjUvTf+OVGAFV1D+ntS rYPOQ5MKrcfcKg8JpY3jMPvoJxutDkrOVe3U+8kOY2YyvvQ6GDhRNi84utHK2FjCbduKmWBhe7B 6 X-Gm-Gg: ASbGnctrm6wmcgLCVQ04zd2BFS2TR5t94UKzwFTLy/lhIiPRPxWy+Gwqq9J+r/He4qa k7sMHWPuaKrOPkqSlZ6HAt9myp7FDKe4c3f40BzBdLrDdUmXDCmq2pEMexH1WLAi9il8AVu/Xgn gw0rg7WdNGAmMbfFRcchTzy6b64uQcIzTTefkb0JQLM23yxtGo0gpJqPnY4nXEWOzI/D2F0pRyl jLER1fhQgtZYsTCPbGgB6LaHnKnXRk+kuYW9slcZ7lSbFiFnjP3wtVHA7x0/5J52oAmauCJk2L/ cKT8iWHCjpuQVxtTPAmO1kyJkkm/SmytIEnZAP25fzajcGc/1pKrgFVI/FB7OaR2/eWW1gWbZwC KiguYUbjKmcb0+JIMU/Gob36x X-Google-Smtp-Source: AGHT+IGmoYGTMc2RrnredA98U8J6aihwrxlN1VEBWVgsFAoOSA+5fLhhzu4HgdCTkxWD1fAHXAZTgQ== X-Received: by 2002:a05:6000:400a:b0:390:fe05:da85 with SMTP id ffacd0b85a97d-3997f8fc301mr10772575f8f.16.1742769658808; Sun, 23 Mar 2025 15:40:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Artyom Tarasenko , Thomas Huth , Nicholas Piggin , qemu-ppc@nongnu.org, Zhao Liu , Richard Henderson , Pierrick Bouvier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 4/6] target/sparc: Register CPUClass:list_cpus Date: Sun, 23 Mar 2025 23:40:33 +0100 Message-ID: <20250323224035.34698-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250323224035.34698-1-philmd@linaro.org> References: <20250323224035.34698-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1742769699158116600 Register sparc_cpu_list() as CPUClass:list_cpus callback. Reduce its scope and remove the cpu_list definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- target/sparc/cpu.h | 3 --- target/sparc/cpu.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 462bcb6c0e6..7c6296ae70e 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -594,7 +594,6 @@ G_NORETURN void cpu_raise_exception_ra(CPUSPARCState *,= int, uintptr_t); =20 /* cpu_init.c */ void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu); -void sparc_cpu_list(void); /* mmu_helper.c */ bool sparc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, @@ -665,8 +664,6 @@ hwaddr cpu_get_phys_page_nofault(CPUSPARCState *env, ta= rget_ulong addr, =20 #define CPU_RESOLVING_TYPE TYPE_SPARC_CPU =20 -#define cpu_list sparc_cpu_list - /* MMU modes definitions */ #if defined (TARGET_SPARC64) #define MMU_USER_IDX 0 diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 57161201173..635d5d81143 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -579,7 +579,7 @@ static void print_features(uint32_t features, const cha= r *prefix) } } =20 -void sparc_cpu_list(void) +static void sparc_cpu_list(void) { unsigned int i; =20 @@ -1031,6 +1031,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, voi= d *data) &scc->parent_phases); =20 cc->class_by_name =3D sparc_cpu_class_by_name; + cc->list_cpus =3D sparc_cpu_list, cc->parse_features =3D sparc_cpu_parse_features; cc->mmu_index =3D sparc_cpu_mmu_index; cc->dump_state =3D sparc_cpu_dump_state; --=20 2.47.1 From nobody Tue Apr 1 08:34:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1742769716; cv=none; d=zohomail.com; s=zohoarc; b=e6sWlOyGl2V3kLmO+SpB+yDP/0m1zsj9LLrJQanwhqFwFq8iTLn8Hw+OqbenRaiClwY/0UmlLosij7ymvhEedX6m18eFcGe21G9WydmW6p+Z6nAwrkkkX9PrJYANt6r5iPWjKZLducBy+c7hfQDV7gI+Awyr+EXiefquWOx2ihI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742769716; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=T3Zk7MdXWZU4ANE3vptmnFw5A7ucP+LsDCikXZArmmk=; b=arqb6yCOxe6C79DvyPDtGKVQhdXCXiBupBkdU0p5QiBWkY8LSbteCNFo9xHRejEtV5twZLEBNVoBF21BV1VQH890/Oezf938w/HYlevNoov/OL+IhBb6lQSXri5fY95b/uczgEGyOtkULxApBqv3TJsw3pAdJPrpzpBueJpPvHc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17427697168573.1163223273670155; Sun, 23 Mar 2025 15:41:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twU0G-00065u-IV; Sun, 23 Mar 2025 18:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twU0D-00064f-JZ for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:41:09 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twU0B-0006Co-3T for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:41:09 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-39129fc51f8so2990218f8f.0 for ; Sun, 23 Mar 2025 15:41:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d4fcea65fsm103407795e9.7.2025.03.23.15.41.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 23 Mar 2025 15:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742769665; x=1743374465; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T3Zk7MdXWZU4ANE3vptmnFw5A7ucP+LsDCikXZArmmk=; b=kBTiumsq4Tdnaq5heDD6ruR6YSU5vRCFvG5d6LT3IRdRdRAn+SdRkTiQOlzXG/PGnk iPKztdq7C1o3Xjcbu0oHs8OI9vnvs2TUBOWO6IBdp4ZlGFgvwEw6S/JAncSXR30PuPJp 23/TK9uXnjg/WhLhVQNz9qCe9lhln7FRharoYIafsYNGG8f3Ko+SpP9+BNHMa/Ibc5h4 DprovfLeMwzBmLBFZ5r9zUQIUpd40JRK4LO66VLdanHqaUcPJXSwlLc1YAwSPONAoKLt wvl/ANjH0XYwRLW9SwIA83BEkEtR8RWv8q4zeAp6K12R3FHlVJJaBMKSP+H+IYxHG2lj asSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742769665; x=1743374465; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T3Zk7MdXWZU4ANE3vptmnFw5A7ucP+LsDCikXZArmmk=; b=rD9MMcsqlfqa94Okajx85um5lk6y835jFWF3LeZro/udAxdtGm+qFXcfI+JhnWdbUt SYOerPegPtpf66koXEmi5ZlCkoeMMt1PefWq0xLS6cx8iNMGpg16fl8eI0SPw16ySoqA XV6NXtrwUKQnM7tmdfUtUJkBmg9p3RndNtwXD+pV0k5yEnLlM9NZs0Vki5EbfDs0NXWl KFjmNFL6U0zRxbHUs3LLQf/7+O+pQRO5TiuWav+SSeTZsnf42OE4WkhlfoCGTIrUtTla 5Tk/oulafdNwHLQYbpnlq+o1FIMhOLvp27gV+20rnj3HFewPPPCkoMruL5u0E5hUlNMd 82dw== X-Gm-Message-State: AOJu0Yw2WYij4oW3g/qEZ0pfzbyg7Uw+MjrVSKuMn5wJ3Y0fEG4vmD6S SfFtyU3SGmCq4IEzPV3H29b9Gq46aihYpoiu0eL9jp1R7OhItZ+vco16Ej2I9EiCw+VtvN6x1P+ e X-Gm-Gg: ASbGnct8nbOoyBo6xxnMU9Sm2tnpZll+quPWEa7O3PR8bcbH6oeg8W91uD8KVXpfHWh oUrDolxho4DnaF8H7UYwBv+malwpBzJPfZf/GZb6qZAjHpwe4SqslAjcUcDe+2B0IqRu/bTWMA/ dUF4jG4khyll9or5RNdC2W2uIDxasaTTA0DJB7MZJYiywCV465vheEBjFV0uM9phE0zMKYGdqds UPWZCM61d/MftYJDr8Bs4TV9ssNx8PB7fdfpUiQIVtWMg9fb14ZItpL14srnkN3lhTlUvyyTxPf WrtiG3WXuJ9RRddYaDoLgruw5hA8e7ZZ08SEn/lDVddpJ+d7qAVCjSnW1Zu0VB4jpXfKtlAICnK JFrlRz5fHLRsxOxGGz3jCmoXH X-Google-Smtp-Source: AGHT+IEXtZI/oI3Z9Oa+kgpS7jNe6nuckG2er4saJTC4nC1kDuxWn0roHjppUBlEdZDYz7XFDzcBeA== X-Received: by 2002:a05:6000:18a3:b0:38f:2efb:b829 with SMTP id ffacd0b85a97d-3997f940da2mr7788944f8f.50.1742769665186; Sun, 23 Mar 2025 15:41:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Artyom Tarasenko , Thomas Huth , Nicholas Piggin , qemu-ppc@nongnu.org, Zhao Liu , Richard Henderson , Pierrick Bouvier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 5/6] target/sparc: Register CPUClass:list_cpus Date: Sun, 23 Mar 2025 23:40:34 +0100 Message-ID: <20250323224035.34698-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250323224035.34698-1-philmd@linaro.org> References: <20250323224035.34698-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1742769717291116600 Register sparc_cpu_list() as CPUClass:list_cpus callback and remove the cpu_list definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/s390x/cpu.h | 1 - target/s390x/cpu.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 5b7992deda6..1aac967a0ce 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -902,7 +902,6 @@ static inline uint8_t s390_cpu_get_state(S390CPU *cpu) =20 /* cpu_models.c */ void s390_cpu_list(void); -#define cpu_list s390_cpu_list void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga, const S390FeatInit feat_init); =20 diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 1f75629ddc2..ac05e82f0ac 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -378,6 +378,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *= data) &scc->parent_phases); =20 cc->class_by_name =3D s390_cpu_class_by_name; + cc->list_cpus =3D s390_cpu_list; cc->mmu_index =3D s390x_cpu_mmu_index; cc->dump_state =3D s390_cpu_dump_state; cc->query_cpu_fast =3D s390_query_cpu_fast; --=20 2.47.1 From nobody Tue Apr 1 08:34:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1742769753; cv=none; d=zohomail.com; s=zohoarc; b=JrqH4d+d0bS4zHUe6d3vWDpW/zesaNx+I03HLCeWyq98D+4WqtKQNpPmZ9XkCAusQCfyMfUEqlnHKJYeF3lPnKNwQN5DVCfhB6u5kDYvePNHd191KV9DOtTHAOojNs9a5aVOFk0VFLH+nRHv+/f5FiD5WmfcWZqHeBUBZjQ524g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742769753; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dCQIZKUBzJuxBIof22dcIv0mCLqdpttz0aPD7GjZTzg=; b=RNt5YLNW4wc6uaVzHddaiCs0JNAJaYPYvtsqi9t8oe5dVK44rRbw7Q8SXXgvFwzf0BrZ9K4HpCjYrKej3uVix3L6OzoXzPvl30E190jTv12u5ahCjrm6FrfogW0rLNE1Y7zyJhCfJhWeMdHOMg2w0TK3Kea/CBt4KE2uVaLvgD8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742769753041899.6755320490016; Sun, 23 Mar 2025 15:42:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twU0L-00068D-2m; Sun, 23 Mar 2025 18:41:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twU0J-00067j-Ak for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:41:15 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twU0G-0006Ej-J6 for qemu-devel@nongnu.org; Sun, 23 Mar 2025 18:41:15 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3912e96c8e8so2080899f8f.2 for ; Sun, 23 Mar 2025 15:41:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d4fdbd1c7sm102399385e9.40.2025.03.23.15.41.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 23 Mar 2025 15:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742769671; x=1743374471; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dCQIZKUBzJuxBIof22dcIv0mCLqdpttz0aPD7GjZTzg=; b=VJG5IBZJKk3GGPK1Wuuag6zrGVAUx7K6oYY1qZX0V9UeBxfP2hLX6GrzkZ3C4AxZnr B8FzgoCfkQHAOSJmGjdxFwmjjPZcnMG6WRjVWdpjVHyva7VbM7DNGKm1T7x3l3kTihPG 1veJq/qLoK9ZEorIn8J1nFdX5aiSDKHtMHY34jPZfTExzc46DimfR3oTuWfxwLoMBWfu v2TFq4jG3jPUKtSrdpIWeOn8C4izgyXt9lzoQY0rBWWTiqRwUgsX2rPfKHMC6cR/tuTM hRKtp6+a+CaXNO9t7Hyhq7qqOrk0DPErKomCcUMjhXz4KOkKe1bbzt7NJ3K2/k3OT3v+ 4ZpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742769671; x=1743374471; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dCQIZKUBzJuxBIof22dcIv0mCLqdpttz0aPD7GjZTzg=; b=mbVKqPOCPs0+iXCMZLouIqj0jfIT6T19fYWO0dUs08yh8ntUfCS6RSCOIrH1H14W21 ViCKu9TRcVi+J9R6HJMI8II6q2JOgA0EToS+9X3oDHdQ7642CZTbquKiha27Ob+eIX6o R3HLYtiGvsZM8t5r2NOD1E0kZX5wu63Cfo3JzcKSE2UbRPk/0hUq/MW9t+ynb3947nXH lZGtQ6jYI2CZO/giAdoIiH+nVHU5ZEsLuEcEj57EMEG0mbCZ6XjS5E8jyU57oOAk77ym 3YTAEugOY3ztarkZirQgLVxEsvUSVH7SRwnmsyiHOqwZart1CDEb9dYLs+jlmxKDiPkH LTkw== X-Gm-Message-State: AOJu0YwkWs74+8m2P7GaWRXfk0bzEyAab78J5BKJsUQYNLIHEL+Ggx7m 0VUC/tElYhzCm/o9IkTBtfszoFFB/FWje/Yh14QGc5TznkkJv0O9hcqpXMcQl21SeUgLPPsQUjY I X-Gm-Gg: ASbGncswi+ZATX3q0fVHYg0/oChtvOZvGORhwp/2+xyCvItsWOMk5jlLOeF1mWqElyg rCmIh7r5DNSJvnvpijZHGxLCzRBtrCPzr2EL1lP/eWFYl+Ekt6lSGe7SQQ7aAdwv49jbof1EsTq IQih7MopHEHZcL5zUzEao1BnwGKdwwhxmZI32pw8+6TdvMAiXu/Su+DIXJ5jf4anPbhIZlSHKOg 27+9WrbDsKxz8UrJwGndlmhYOlnhhv8EsR5mujmRRb3C6R0o3ol55xNkLqU8TlFjlZKTeN9jRG9 se2qXeuetrA1VNWNqyhGM6rx8Wo2m3qXo/HCyYSI2WnDKiLIoPtGVuI4jjcMyqRiAXpp85mvqbX HDigqg08KAnmKyKbB3ES8SUJz X-Google-Smtp-Source: AGHT+IEOgHfSlCMt+Rq/A1xP/IorgjGxg5TZ3u1AF/zjTwlIYo849QYaRMRWOJHJ5oxUCfvfDXbWbQ== X-Received: by 2002:a5d:5f8c:0:b0:390:e7c1:59d3 with SMTP id ffacd0b85a97d-3997f8ee934mr8331895f8f.2.1742769670880; Sun, 23 Mar 2025 15:41:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Artyom Tarasenko , Thomas Huth , Nicholas Piggin , qemu-ppc@nongnu.org, Zhao Liu , Richard Henderson , Pierrick Bouvier , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 6/6] cpus: Remove #ifdef check on cpu_list definition Date: Sun, 23 Mar 2025 23:40:35 +0100 Message-ID: <20250323224035.34698-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250323224035.34698-1-philmd@linaro.org> References: <20250323224035.34698-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1742769753750116600 Since we removed all definitions of cpu_list, the #ifdef check is always true. Remove it, inlining cpu_list(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- cpu-target.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/cpu-target.c b/cpu-target.c index 5947ca31a0a..30598619581 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -71,7 +71,6 @@ const char *parse_cpu_option(const char *cpu_option) return cpu_type; } =20 -#ifndef cpu_list static void cpu_list_entry(gpointer data, gpointer user_data) { CPUClass *cc =3D CPU_CLASS(OBJECT_CLASS(data)); @@ -85,17 +84,6 @@ static void cpu_list_entry(gpointer data, gpointer user_= data) } } =20 -static void cpu_list(void) -{ - GSList *list; - - list =3D object_class_get_list_sorted(TYPE_CPU, false); - qemu_printf("Available CPUs:\n"); - g_slist_foreach(list, cpu_list_entry, NULL); - g_slist_free(list); -} -#endif - void list_cpus(void) { CPUClass *cc =3D CPU_CLASS(object_class_by_name(CPU_RESOLVING_TYPE)); @@ -103,7 +91,12 @@ void list_cpus(void) if (cc->list_cpus) { cc->list_cpus(); } else { - cpu_list(); + GSList *list; + + list =3D object_class_get_list_sorted(TYPE_CPU, false); + qemu_printf("Available CPUs:\n"); + g_slist_foreach(list, cpu_list_entry, NULL); + g_slist_free(list); } } =20 --=20 2.47.1