From patchwork Mon Mar 24 18:46:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875773 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2294107wrb; Mon, 24 Mar 2025 11:47:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUoJKRQlKUrrOJinh+uLcQV7TXNpzm+KrkpUyk9ZcOlke810CK/j9rfH1QO6a8Gi0LeRAJzEA==@linaro.org X-Google-Smtp-Source: AGHT+IHEddos98Aj4jFPO8mlJQ+UDk3ulHFCppVkEZN+yuaJVzwsVzPRW7J24YXYM223HPq6hFQk X-Received: by 2002:a05:620a:4725:b0:7c5:afa6:83ed with SMTP id af79cd13be357-7c5ba139e4fmr2120505485a.11.1742842025381; Mon, 24 Mar 2025 11:47:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742842025; cv=none; d=google.com; s=arc-20240605; b=BOOrbMHB+LlWWJWCpr1wbzwc0X1URffmV93hh8RUi0tcdckzwfZex/2zi5K9iBmzIk Q71cYmh/KhQPI21GIA9XfMEoOD7cMWGgT3FoviWex68yXFTZpgpZ4WmG5/k67zGlYNrq 2HNOy1cA+34nu1EG6iqwAMlRbdr4093jN5vN67SL6uQ1ZkXF/o6NQ2fZeRcocC8f8vCv BQ7TKFJkseN2Vyp/lgEvSXkI9+QdFAY0QucgCgnbnr2FGIyJchrq/g0jYpEKulkwKM7u OJSnrB4/lkIR4EdUjdUcffRg44aSe6me9KYkDDeb7Md1Uw/pwQ+252ZpRySguwUSiDdY UxAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/58CM7Dh+rZOrGRbi6LZSjetyigBShWpCAkZGEHO9xU=; fh=jn65LpBog/h77pKixoe86z6WrIBQWrzlfmjRxMqbSL8=; b=bdPMdUgkSJVxSSdrRsXm+3eYp1IOkVBno3bAbMImRabTaM6I6AezhUYsLt2Zul5EzI LLDPf09V6zVIX/LPDhc5zreJUDw/lRavHnKtmfzR73fiyKyAPIymoaQMQS01rkQ5nKnJ kJk85tBcZugvoWa+JDrNEU4PNvnNq04oDXkY82c3H4UniwEAkcIvR6bdal6JzLNgb8BV KZZzJlNiKGb6+FjjcB6smEERXffS1kGZO1pCJ2uVZjWIBh4uB4sQj2j1CdabBWjwUeAc BRNQ+TDUV8kti7olXIoWxZxpGwDmJ5upcpigTVWbqcHt3IyRs82Qcay8ziXXLToHe6GK 0Y+w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F5UeRsf1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b9368eb7si794111585a.583.2025.03.24.11.47.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 11:47:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F5UeRsf1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twmoc-0000yB-52; Mon, 24 Mar 2025 14:46:26 -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 1twmob-0000xI-2i for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:25 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twmoY-0008Ng-Ab for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:24 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-39727fe912cso1716559f8f.3 for ; Mon, 24 Mar 2025 11:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742841980; x=1743446780; 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=/58CM7Dh+rZOrGRbi6LZSjetyigBShWpCAkZGEHO9xU=; b=F5UeRsf1srJ3vWTtXCMZZ/gB1IsMa9w9onjIEO7gA9jjDoRyObA1eFhSv8zrmJWFru goYRD9TXeWG/23L0b2PINcL16/vcvfAQHyTiVHWZHLfTosYvJk2G0X4nhfEZdunpgVre 3p4tuf51riBR/OgTBrdDMOgh/EgvhRttudHRKz96MO7cpoQLD6PyXx2hQzyLeyKLxkff FmFHIldArD5aYYdm0lc9aMV/OGEvXXgpG5BVdeVEJgG4KEACjUl4YMEkd6FBN1KO3O4u TCgYrSpO5ZkqHGqfdkGD1BZq2INWGXzUb8rH/JeYhmAFopRixYUwa7SRGZ9FN34kWBDR eH5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742841980; x=1743446780; 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=/58CM7Dh+rZOrGRbi6LZSjetyigBShWpCAkZGEHO9xU=; b=pfoGMFbmGmLP5SBpD2eBfdi1E4QKqfFXoAQAI3g72MxzrKJH6WFxRLuO777uflnP8G WzJGs71KgPMKfYstDaDvjWkijFM0zLDTeZhOgzt9Afgqr0bBW00gCYPB48oFszKMn2hX WLd4RZwdpfPqqX+hnVXmkyVhpvarghS0oN/CLiNRMvz6qk9Aq4weURg5huCiwyiGR7rd UMaYQzj0bWtCCYkK5MDlizjgYsAy4S7i0NztYnWNoRUTlva6KUbVb/CGbaZvMyck++MB Z03MzYu12vTDwCoqHzANE0ofcgRddk5z3jE75DbbfasJIYi+iKG9Hocya4W5aosmouKt ub+g== X-Gm-Message-State: AOJu0YxnxKI3tk6+Zd4LJj4CLeHylq8MYHmXxHzYnfHKLN5dGFlui98r gWqF84QYpu9t3eNZ+EM8lVP/hV/G+tr4SU2OCrqoYp16HJycLgiosMQAGUd69/QxhQaXr9GGcGj D X-Gm-Gg: ASbGncs3reaX7I0ifVNzg/FQjSxJp20D76A1zzYFcmK5li9rfLcV7LM6UPZbOHunUoY 3AeZ1HyEvBOGc/LHYVjC93nJMo/RlU0fKMuh/LoXIsyBmogyDRW90qQviq0+tTuvQHRZOF26DIc jAAKY6Q8RjBxEzAYoHDxRX6m4QQUsPIViNtnRXimClOH2b0PV0zRJZsxTapDTXDn90dRb3/ObUb yC9FjWLGygtJBXdJbTP6jeH5UhhMjwk3tPCfGlHznSrBL5ryMXXw7v+JsV4BynMhIuiwi23XGMe Me5oz0hSXOdbcGGacOcA6y/NSPBY8S3HCPzNRDMicEjeIlfWwZgacAtiovzS3nfIrjREgzXGriZ vSi8vTlFeH+0VhBpF1QcV8dxR X-Received: by 2002:a5d:5f4b:0:b0:391:4873:792f with SMTP id ffacd0b85a97d-3997f937b48mr13735740f8f.45.1742841980396; Mon, 24 Mar 2025 11:46:20 -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-3997f9e65besm11796461f8f.65.2025.03.24.11.46.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Mar 2025 11:46:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , Ilya Leoshkevich , Nicholas Piggin , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Paolo Bonzini , Mark Cave-Ayland , qemu-s390x@nongnu.org, Christian Borntraeger , Daniel Henrique Barboza , Richard Henderson , Thomas Huth , Artyom Tarasenko , Zhao Liu , qemu-ppc@nongnu.org, Pierrick Bouvier , David Hildenbrand , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 1/7] cpus: Introduce CPUClass::list_cpus() callback Date: Mon, 24 Mar 2025 19:46:05 +0100 Message-ID: <20250324184611.44031-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250324184611.44031-1-philmd@linaro.org> References: <20250324184611.44031-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é 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 54570d21aea..b633766ee8f 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 >*/ ObjectClass *(*class_by_name)(const char *cpu_model); + void (*list_cpus)(void); void (*parse_features)(const char *typename, char *str, Error **errp); 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) void list_cpus(void) { - cpu_list(); + CPUClass *cc = CPU_CLASS(object_class_by_name(CPU_RESOLVING_TYPE)); + + if (cc->list_cpus) { + cc->list_cpus(); + } else { + cpu_list(); + } } /* enable or disable single step mode. EXCP_DEBUG is returned by the From patchwork Mon Mar 24 18:46:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875771 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2294104wrb; Mon, 24 Mar 2025 11:47:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWxTVyE4M94PJi31HJhtJkUIMkVUZ7hDyNoub8UI72vYrGd/DNrLJ0whK748ZyD1UQkoTgoxQ==@linaro.org X-Google-Smtp-Source: AGHT+IGDDtpQskcr0b45TWkcjvhlfBwSGO8rKT7Z7OI2nY4xSFqPh0gnrbHmlAyXtDTlHR9zjXWQ X-Received: by 2002:a05:6214:212a:b0:6eb:2e6c:3e02 with SMTP id 6a1803df08f44-6eb3f18565fmr226733086d6.21.1742842024946; Mon, 24 Mar 2025 11:47:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742842024; cv=none; d=google.com; s=arc-20240605; b=jHvzuCRXonFG8Zt/kjGEzjMFwOc17IvaBoimyXYDoQnAGlhJMens0FfVlPX8+ipmpQ t0SaO6jSL8JnMxMYIYWHVDuHkMELKHtpaW9ucRyMhMCiIDmaLh7Xm8ULqoFR56moIBjo X6ms0rv+IFHqKu+Ov8H5I8n9J6SKSfeuV20qoKtaMleBBykOIFHLGtxdyJXL2o7ZNVAR NQHpHNg56G/4KNslCceBXMEGhEbbTpM6yQPGlgXlqkhdeOPF/OcHTRlC6/pWARnax218 jGyMSLaayoOfRCs77Zizz4YsR4shQv2bduKzDGa10Y5FX9WjTNKplCD3B7N8I/Fi3Svi bL6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UVmEVjUsWOxsPo3u/Y0kR5E5YJmUOlp4odxRJhRKZMg=; fh=jn65LpBog/h77pKixoe86z6WrIBQWrzlfmjRxMqbSL8=; b=DkMlY5GLbMw5YyYxbgowg9qc+zL6psKxBnbeRw9MeINXYgEIZ/4YSDixnaDpZdguj3 XCUehfBWMAqeZDBsYTOEZuL2pFnh8KY02pnTldeob8aTj1wkeBo0VNEH5faR5CwFVdpu RLrlRS7pWp/qBooX+BTA+sdMqI0ZfQk5+soN15lUV/4+OuZcy+PuwcxF7GysS+vtQu4u SdqKZq85tKuB1fYz01RLyHkpt9+7ERV/LiiIJ8b0la3JjqPNAEY51/RngmVsayg1zZ9D bXE5Tw4dI7K/Poot7BOogfDFFwKiOvbBMP9mkgq3vAxtT95ATkJeSW8ce3WqyGSO2kq8 Yxww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IkDEr31D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3f04d4d8si79973276d6.490.2025.03.24.11.47.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 11:47:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IkDEr31D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twmoi-000151-7R; Mon, 24 Mar 2025 14:46:32 -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 1twmog-00012o-Kp for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:30 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twmod-0008Ok-ME for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:30 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43d0c18e84eso21703345e9.3 for ; Mon, 24 Mar 2025 11:46:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742841986; x=1743446786; 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=UVmEVjUsWOxsPo3u/Y0kR5E5YJmUOlp4odxRJhRKZMg=; b=IkDEr31D8WXmMtefQ2RFTYgl+7cXg4tPKfEJGfH7cY43HESBLxKFZjPzykoCRDJT5v WrH3uw09c8wf6skZDXSoRw/0gD+KcvTjKvsehDv+otPLu46mauI/+Gi3b9ocn1VXKt6J sOdWOHBJCuXZdvCfoLHzRPuFVtp4jXGVoQW2Mi536j/VUyidWESDPPXrsIQMogVHpXkt til+np31/scay/dED1SGHOMHgpp5TQbbJVaIQltUxb+M/1x9P8Au9pwVcSxNEEqpOCGA uS69Ih5zE++HXci3Znmmx5cy1aGqHAoURIW7a5rnkn693VYo54qt7sgaSs37Gw0b2thT Ipug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742841986; x=1743446786; 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=UVmEVjUsWOxsPo3u/Y0kR5E5YJmUOlp4odxRJhRKZMg=; b=HUN564638srn/AkYrJCtcEaOIlWTtSJGqR06RGXkSFcaVsVaxDWhPhJCPU6KozsjEr WskV4Arj4l9H6/xCMl7xcyk4gg84W726JWi2FaFkMg/AhnOatDCY2WmYDubu0YZ+VILw xFoIi55J7XJf9Gg8G8c7P8RgPwo5GKa9ocga8kgMTT1nDSREaPLq4OMMKnJvtwdmmeO9 yFYa0fm2dhIGLJkpk3OKD8JI4tENvuNIxlZNj5bn1LVgLUJpTRnbt5xagxkInC0L0AiN y0ne2Zd8El5f224UVyA/co6KMBWuzqQM1qSHDffB4vJ/aFuLJ35ByCscPrC6CW2/uU5i n6RA== X-Gm-Message-State: AOJu0YyewkwUc3D4P5cFf9wAN+jrmsY7QTO740R1jyGc/IRPpyKT97BQ NTsWl7mqjbNFXE9p9FaS/P6p7A+1EXe4E+fXIxcLWJuhvJGgF+NnmzGrnUISoxSo2bZZgcvrDwL m X-Gm-Gg: ASbGncsqCzC4OU3vGf+Ik9FeDgUXEGvNh4gvUUDWjt7IzQlmcsrTE5jutsEc+B+GL4L WFNOkFnDRDGkhLsAQrPqPwFro5kpfxmBBvSPU456TUUoJi66aE0NGjWo0M6N9yKZkY3XMts3MRq j9khdMiHgb+XC4mN5Zfv6AOf65j+kRTfj97TqGydkA2071dBrUXdtdyplkpAPCdx1LVhVYgxWxg v2CaU+MP4vJHc1eL9OY1kNYI4osMNzk98vIbn3lTpp+YzaqkY+OTL46o9hzBpkHQYZa0FvCadHN dd4CDf8PtpQa2pyyP7jznr9hiLZA3oiXH13fGH11iYybyF0mR/uPjiK0Up821VaFsh0Gz93JQcP Xv9r3EgUbu44cti2Z4FhZ4gee X-Received: by 2002:a05:600c:3b9c:b0:43d:160:cd97 with SMTP id 5b1f17b1804b1-43d50a4a7a7mr98114915e9.25.1742841985732; Mon, 24 Mar 2025 11:46:25 -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-3997f9e65f0sm11744102f8f.74.2025.03.24.11.46.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Mar 2025 11:46:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , Ilya Leoshkevich , Nicholas Piggin , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Paolo Bonzini , Mark Cave-Ayland , qemu-s390x@nongnu.org, Christian Borntraeger , Daniel Henrique Barboza , Richard Henderson , Thomas Huth , Artyom Tarasenko , Zhao Liu , qemu-ppc@nongnu.org, Pierrick Bouvier , David Hildenbrand , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 2/7] target/i386: Register CPUClass:list_cpus Date: Mon, 24 Mar 2025 19:46:06 +0100 Message-ID: <20250324184611.44031-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250324184611.44031-1-philmd@linaro.org> References: <20250324184611.44031-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Register x86_cpu_list() as CPUClass:list_cpus callback. Reduce its scope and remove the cpu_list definition. Signed-off-by: Philippe Mathieu-Daudé 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, GByteArray *buf, int reg); int x86_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void x86_cpu_gdb_init(CPUState *cs); -void x86_cpu_list(void); int cpu_x86_support_mca_broadcast(CPUX86State *env); #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 -#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, gpointer user_data) } /* 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 = CPU_DUMP_FPU | CPU_DUMP_CCOP; cc->class_by_name = x86_cpu_class_by_name; + cc->list_cpus = x86_cpu_list; cc->parse_features = x86_cpu_parse_featurestr; cc->mmu_index = x86_cpu_mmu_index; cc->dump_state = x86_cpu_dump_state; From patchwork Mon Mar 24 18:46:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875775 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2294749wrb; Mon, 24 Mar 2025 11:48:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVVjsHKUDlH6Hsf1Pu7XhmT7WLQMxet2ajU0CvVVeE4eRGbw/0fA2kBFEXwjckdL0m2wBBbBg==@linaro.org X-Google-Smtp-Source: AGHT+IFko8iGb+ebEbiO1Fv1M7rJbBY6vuSDifUNP2XtzP6snSEnCOSimzr7tXIDUEzpRQHJ+YoK X-Received: by 2002:a05:622a:191a:b0:476:aead:8029 with SMTP id d75a77b69052e-47710bfef41mr267103561cf.7.1742842130521; Mon, 24 Mar 2025 11:48:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742842130; cv=none; d=google.com; s=arc-20240605; b=UjPVNx+GCA0MRswZGCB7RUZkVIiSR0m5frBGcfJSdJ2gzyn35pIlTCP1yvnDfHAkZ1 sABEe7b5NYaGwInegsvEtBuoaA3VXZ+62y1s8fXfrO9iqlXgSkgb9u5QmF2zMeuUFAN7 Isu+nDSMrHo8guwVFxaUI1JxvUA+6+bOH8d4vBuhuM9bbU5BChqrjx/q/oVoX4rpQCBw ert5vkTOiZGCMyDnC+MeE2nPEIVYGvDh91YMsNpl4bVRO2OUZqDzYUcV6ZqEofRwmbW7 KAqWmZ6U03ezJRXorJ2m1ZK7QByvWCbG0xk3vsu/0FahXguKQhuddXAVLPr1yTOOtmIf GUew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+ly/YvHnQR5l+vw3Qn+fTS65QZTRPeKhV3q8cV3yjXU=; fh=jn65LpBog/h77pKixoe86z6WrIBQWrzlfmjRxMqbSL8=; b=hSl66mxDRNWT0eNfiY4E6A/xjwEHoUSLT9yqJYXzq3Y5qtbNcDgGexwTZ059hlCVY8 tin5mK1QHcHbFJwabaCqQxirhD82pOWBJ1cgoW841JA1NK0/HL/ACC8Gw1YBHz/BoAJQ v9RmpiUgLPZio2x4kKt4BVRDepiSxDQFsA6zMjccn02Z+4apkBbeZrnCIPjX3dRtPxFh n80eg0mVEV8DIWffS7ehBBMf0LODyqQzpzJ1mrD20YinrxfawDYtBIMWqi7toZ7ZlY4a Mu7y4HJc041gIdTX4vYiqi5D5CXJ7zdok78XlqslZ8oEB+xJWF3cJ5OVmjKDjPpUbZ2N 6D2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="E87ZpA/Z"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d1801c4si81618901cf.199.2025.03.24.11.48.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 11:48:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="E87ZpA/Z"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twmor-0001DA-9K; Mon, 24 Mar 2025 14:46:41 -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 1twmom-00018d-0f for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:36 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twmoj-0008PR-72 for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:35 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3914bc3e01aso2826619f8f.2 for ; Mon, 24 Mar 2025 11:46:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742841991; x=1743446791; 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=+ly/YvHnQR5l+vw3Qn+fTS65QZTRPeKhV3q8cV3yjXU=; b=E87ZpA/ZzOsBvRxL7x9ZfgDYJe6agjxOzxlIjtlkmBXYhNwiHm2dpynszgL4u1ro3M m8BrteeEWF5Oly8tRsYSXH1D+Hap5heDYIDT0Cw6anXf9WR36IP36Ir/clHhp/RtLRSI JNKz5ksOdSQFcPXGSSlNX6H8QFO52f9DtKlyIDR2kNa0O6Vq+UXOJul54rie4uQoTIJD aHaG7xNfu1Jm/fHX4Sw+lJb+xkIC3tcYtrzgLLYdtycUXlhm4IAMuanpi6fb3JlGktct mlYoZv8AkuOCg9m4rPDVdjQI2kxpUuvD+D1TGyWJlnm9qw24joK5kgQTpt7ct5xxEBpl qfkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742841991; x=1743446791; 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=+ly/YvHnQR5l+vw3Qn+fTS65QZTRPeKhV3q8cV3yjXU=; b=PZ2BeFoyyPJDpiUVJ6xMiMjVkZh5QKpqPTMbZBHkLUbrSN9P/zo4B78k/mP5SRPJjo Ee2j6tPzUhzqma4ue1i+MB5ikvKQ1WTv++Za16MUF6QxMM3olOdHLpcIW61nQx7kLZga IOQwR8gqMWw3Vm05zMThV9ewWGpBx+zJX6HOI9QEoX3F4OQLQK2VfjlKtGybifmcRrFr 6W0pd/BqIWlGhCYwRUGRNSqaWqZoKORNwV8PXjOv4H2QTJwO2WMXd2D9XaUoQNM8Dkfw SbuAC6+kf53x4sG9SBWjMQiCHwTFFmgCXbRP8L0cp8Cp3g0NgwMepShTvCjc2rZgc0pt oq8g== X-Gm-Message-State: AOJu0YzOyd0UrrvRoit0l1wYiZNlDjLff3T8GjstiGoOOzNE1IW1rK0u 6Lt1EurBPAePQWb7m2y7Qu4mAxF1YMMBq+KgOrwZuOWxsImU2XDQ+rMLVuXmhQQnA0hNb7vNUCO 2 X-Gm-Gg: ASbGncvNah7kQAN2r6rloaVMlo6czPCC3WiWhtiYWdAbKpObChwxu7HgaEkHVfOFh6d RsSZPePVDP600PPk6iQhkFLLcg1bF+9p7w3sWoQbSED6XncwFC/p3ZugmcE6PTUROzWfHnWMFRo NKSQB9eOVPFcILdH6bHMmFJLChzxT3BfUXET4vrG3w9CrtALBqLU8fV5s5dti6Xs9XWuyzBZN67 /f3yMA05qz28jiUw1KKbnrRxVMoPXidouCjjYHIJRN88l2vyiDRPNHaFk8zAeR4th0hbXJD3cpb 7IdsG8HgKtGA1UjbaFi3y3FvKMl2QOtOCJV7nMrv0Y0VodYdp7ubttqxN+Svz5/LbGX85VvukZF FsUjZ74cwRDj2A8mFM0vhPfSA X-Received: by 2002:a05:6000:1a8a:b0:390:f738:246b with SMTP id ffacd0b85a97d-3997f8fedc1mr13917192f8f.15.1742841990978; Mon, 24 Mar 2025 11:46:30 -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-39abafed528sm8210539f8f.27.2025.03.24.11.46.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Mar 2025 11:46:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , Ilya Leoshkevich , Nicholas Piggin , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Paolo Bonzini , Mark Cave-Ayland , qemu-s390x@nongnu.org, Christian Borntraeger , Daniel Henrique Barboza , Richard Henderson , Thomas Huth , Artyom Tarasenko , Zhao Liu , qemu-ppc@nongnu.org, Pierrick Bouvier , David Hildenbrand , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 3/7] target/ppc: Register CPUClass:list_cpus Date: Mon, 24 Mar 2025 19:46:07 +0100 Message-ID: <20250324184611.44031-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250324184611.44031-1-philmd@linaro.org> References: <20250324184611.44031-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Register ppc_cpu_list() as CPUClass:list_cpus callback. Reduce its scope and remove the cpu_list definition. Signed-off-by: Philippe Mathieu-Daudé 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 value); #endif /* !defined(CONFIG_USER_ONLY) */ void ppc_store_msr(CPUPPCState *env, target_ulong value); -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); -#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 ed79cc1a6b7..4d7c0619739 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, gpointer user_data) g_free(name); } -void ppc_cpu_list(void) +static void ppc_cpu_list(void) { GSList *list; @@ -7528,6 +7528,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) &pcc->parent_phases); cc->class_by_name = ppc_cpu_class_by_name; + cc->list_cpus = ppc_cpu_list; cc->mmu_index = ppc_cpu_mmu_index; cc->dump_state = ppc_cpu_dump_state; cc->set_pc = ppc_cpu_set_pc; From patchwork Mon Mar 24 18:46:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875774 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2294560wrb; Mon, 24 Mar 2025 11:48:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXekaFCJ7EsukLUZyq7z+ndNevOaOPwVd0Hq1QGX65hlGDcHrL7jCEC/hLZ5+a+w5HPAvd02g==@linaro.org X-Google-Smtp-Source: AGHT+IHptQ/wygT2st8D9og+quD//YJWWU9FaksSO5YlbAVlno6Hsebho584HRM8N4uxnW0QqLIh X-Received: by 2002:a05:622a:5c9a:b0:476:ac03:3c2a with SMTP id d75a77b69052e-4771de4d618mr281096691cf.43.1742842101411; Mon, 24 Mar 2025 11:48:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742842101; cv=none; d=google.com; s=arc-20240605; b=IhpYBiiT5e7qKMCep4NtXCcBOgQC7kgJkcwHLNZIPVzPkRqghdvDv2++gwEHw74vyX d61ZDEdRS1UzpoBu5WoIktI/FMyw/MAWq6HJps/fUiYmFBC5RYar1TI6RXafmckawmyI ja7meDulP3CucTAJ2ZBj4hN4eyzGbL/T8AfJvnEkUCJ9UMflTzcRvLfGg6rbvQYanpWj EpvadN9idoy08tNBbEETRkqB4ttdAR0PGJud/AV9Ymg2vfOIgRZZ2HB4XrpBGvKmKTKk NCJII8amTjf61jtuhKpMy8rtlCe3lt6nye4jLAlQR3fCiqZuazFYSahk0+MGH92mttZK JeeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rWkqddQkJvJSnAE7FQ33ooZJv8FPQjkwQkQsfmpvDnM=; fh=jn65LpBog/h77pKixoe86z6WrIBQWrzlfmjRxMqbSL8=; b=ctrEAS/Td9BPbAz/7J5k+EYm9exVEobW0Te8ACyWKQXXnHRXBB1aa9gpn06RW0Ybt9 LB5mqa0ps9kbdEoeqe5YCJO477KrB6ibvatPr3g3ThwJuwPz1s74mTgb6VugAytXV/kN 899FV2INEnXlUUi9mW3mWdo0bznuVLW7qdi5CYVf4j3d1n+l739z/ALRDVz/HhddHGUn eJlG5UM1hsK6p6zmRgXpHEeBq1yr6xAtea17wWoq+hmV8pM2yoP0Th80bOJfOTaGdR7p jvPiCMO55GhiH1+oBHQRdaO0Q75Xos/ofkEhVKnyPJ9k74kwB39JoHDdWXx2vlcsytV3 5sNg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=quuNMyF4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d65a817si78827941cf.666.2025.03.24.11.48.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 11:48:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=quuNMyF4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twmou-0001IR-Is; Mon, 24 Mar 2025 14:46:44 -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 1twmoq-0001DI-TK for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:41 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twmoo-0008Qh-BP for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:40 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3912baafc58so3767706f8f.1 for ; Mon, 24 Mar 2025 11:46:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742841996; x=1743446796; 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=rWkqddQkJvJSnAE7FQ33ooZJv8FPQjkwQkQsfmpvDnM=; b=quuNMyF4AvCKJqA3iMmSzMWmTFOk5ZlA088kSJsxbG1V7TPlh6/rVJTWVAHxqSX4iH 5Zx0MJ5uHEYJLH6JX0cu+scFCooRW2aaC7gfVnt+cCT0BexTp9fE3/9qhBxGEP00UvtV XBHDDMGAhAvc92GgEPci7Y8Qjp5nWtopr+10/wRUSsprQao4JEUClbztunMjm4TwNqL7 zzCGMoK0oG/NtjJiQo6dJfj6+qSA1LX5tUowayPEdWEHkIDQMtJ6o/361LdKcwQundmK 875Qj98i249TLQqSQYVam393mou9cPxURPLShVLw/O9R5s5nxXoaKtJlGIzYP2cqzvC6 wPGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742841996; x=1743446796; 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=rWkqddQkJvJSnAE7FQ33ooZJv8FPQjkwQkQsfmpvDnM=; b=qV3ZLujxq88SsgwlOq3iqQwrQyo+d92cWOi1KjoD8/hohUj1mv6tmH1OpLrszKLQol pcp/6Oy1a7nmMPsKxHVzN59HHNLhvKBvYa7iPRUEkMqgrs3ZWOQ/448n8dqN7tPKyN8G nqxAyhLurshDK10fKM5y+xp+k/eMlqB9akVqvIZyD6hsObe5fv5zsJgMbEfJ1n/NsF9+ VfqBh/z9bYwdAGKOKpWuIQvShgth0RqfJvZ9dIZKnazEjlRkc8xtVaRcDJkOtVFHSOUl 25feoY58iwLFiQPVWp23Qs30GBYnPasAyOImPGrPZbUrHLApr+yr2bWnSibAsXj6ubNE wMZQ== X-Gm-Message-State: AOJu0YzOax7/MeXxksoer17Fpx9QwIpUGmHuGKWh/2cvuY9xvJZqCrGN JQl/O29/i/kB8CgnRTj1P1cR2/v1X+84nsvIn0rJT+5vTvYePhU3bqNQkb70rqRdy6ITw4Q+zob / X-Gm-Gg: ASbGncsoOymSb3I+xqZ9c804Qmw9HxUAC+Sy8IExcxuzqL38LpZVI9KStn3jss2dGoQ udYouu21vg1yWNAbrtV/cuzEPHvoeyOX5DhGkaei83lMo8RIDnC+sRog5AWMenHnm3IivmjXXxb LS+33Ux3bqle746Hu+7e5dSCGz2+AqeN2up8WkPuRvU21Xj+EMsNMfrrynKL01/UJNfDPJxN3Ub PLQU1FjkWcV+Hs8UBJ3PLtV6LwSD5k2Jrc8xXSXs7UohwKtpXL7kGpxMnDx1QkZnb87WytUbO1P Z7NmbYoLqCZ1GzFLpdcVqioDhHdgNbqzGTNpjqOiSKFG/13hKVsuxNOcazsK8Lh5aK3Jd7dDiD4 pa7rQJ5Wa/zq6M42aWZcHCGpT X-Received: by 2002:a5d:5886:0:b0:391:3406:b4e2 with SMTP id ffacd0b85a97d-3997f940d74mr10501148f8f.49.1742841996038; Mon, 24 Mar 2025 11:46:36 -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-3997f9b5536sm12003874f8f.54.2025.03.24.11.46.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Mar 2025 11:46:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , Ilya Leoshkevich , Nicholas Piggin , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Paolo Bonzini , Mark Cave-Ayland , qemu-s390x@nongnu.org, Christian Borntraeger , Daniel Henrique Barboza , Richard Henderson , Thomas Huth , Artyom Tarasenko , Zhao Liu , qemu-ppc@nongnu.org, Pierrick Bouvier , David Hildenbrand , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 4/7] target/sparc: Register CPUClass:list_cpus Date: Mon, 24 Mar 2025 19:46:08 +0100 Message-ID: <20250324184611.44031-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250324184611.44031-1-philmd@linaro.org> References: <20250324184611.44031-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Register sparc_cpu_list() as CPUClass:list_cpus callback. Reduce its scope and remove the cpu_list definition. Signed-off-by: Philippe Mathieu-Daudé 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); /* 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, target_ulong addr, #define CPU_RESOLVING_TYPE TYPE_SPARC_CPU -#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 2ae7173c0bc..6b2288c727d 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -579,7 +579,7 @@ static void print_features(uint32_t features, const char *prefix) } } -void sparc_cpu_list(void) +static void sparc_cpu_list(void) { unsigned int i; @@ -1055,6 +1055,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) &scc->parent_phases); cc->class_by_name = sparc_cpu_class_by_name; + cc->list_cpus = sparc_cpu_list, cc->parse_features = sparc_cpu_parse_features; cc->mmu_index = sparc_cpu_mmu_index; cc->dump_state = sparc_cpu_dump_state; From patchwork Mon Mar 24 18:46:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875772 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2294103wrb; Mon, 24 Mar 2025 11:47:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWIBn3a3/AZQGfVeQjl4xGezFUFlG/lpwAmk0XoJkH3sMzL6/6EMHM5ixGGlzsVBXjkT1AoyA==@linaro.org X-Google-Smtp-Source: AGHT+IHcfDyrX9FSWvBGutVnjxwGuLSBOOwMUUe5Duk7N+VfMcFpCrgn08YKOKZ9iwPRg5UiIkY/ X-Received: by 2002:ad4:4ead:0:b0:6e8:f038:39be with SMTP id 6a1803df08f44-6eb3f2c88a9mr230266526d6.22.1742842024950; Mon, 24 Mar 2025 11:47:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742842024; cv=none; d=google.com; s=arc-20240605; b=ki8vzoNOvQ+fKl/DwWTK9d7aiwOxIeIrtaSm5Gjrp4CYtUIkyTwv9t6iV1Ofse84Mo qLcTH+L6Qic8tvqe5rjOGWMej33C2sC8jHeqN4nL8H+C6iWBbU16plIrsjF/mqgZBlp5 vibgfoJex3b1JIFaaNz7rJlBb8Oycr485RqzVYbXH1hwbPVl2oToGNUkkNRIoPBzake9 xMEOcBgJ1+hyNXxsvdBbZw+nnm4cKuVYcWtjTKJQFXIeYDJfo2YoSOXmuus8FKeZxsAq 704k/rJwebZRGT13OMmlIpi3kVM1CE9CVtbM2dYYXifIGCOdl/WrQ1JpkY/yyME1k/ud x+IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vhAN9Lyj4bqTf4UUrdE+Pmn+JYUm8J4DDJYtyAVBykw=; fh=jn65LpBog/h77pKixoe86z6WrIBQWrzlfmjRxMqbSL8=; b=H2fvHtUV0BL0B9W1LSKUs9eIxPfXkUwraJx95ruAhRc/aVmhxg43Mf2kA/yvaeQRG+ q7Dp8laypdiGcxbGJUKY2CY9zJ5DBiytCjfpZ9ZUjwo1mKJb67nOQHn5jA0TAHOZ2fec LxsmK8uByIhO3+hE8K74IAPxnhtrQac5zIstkF0k2LpBt2ioDKwKbeJ72ywVu+d8kJiP DRDJVHvsMeYUDTYeAOd2WojGEp3LPL5pJThKuPnpeD4oq23opR5jUEOF09MPEsz6ntKo Gzn6PmlrKqPdcfXR2YLbgeZgCPBBOdvZCjibbbxFKPCEi/XBK8K8lhOp1IIHYbT339jQ 8GBQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PQjm1zhd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3eff37e5si76787306d6.268.2025.03.24.11.47.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 11:47:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PQjm1zhd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twmox-0001T7-Vg; Mon, 24 Mar 2025 14:46:48 -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 1twmow-0001Nu-0F for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:46 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twmou-0008Rf-2w for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:45 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3912d2c89ecso4509432f8f.2 for ; Mon, 24 Mar 2025 11:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742842001; x=1743446801; 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=vhAN9Lyj4bqTf4UUrdE+Pmn+JYUm8J4DDJYtyAVBykw=; b=PQjm1zhdzEZI8lOxVMowPz314WIqOqwo0bH1v8NgqUQZoRcrOg+3BmQk0a/F9TP1Sd OhGp6WKNg8Z49vAhtq0VgfOk+XWuYEXEJRVneFqOWPWjRcv09EVJd0bzsPaovMnwoKHD impMbzsegyDhCqEzHr0RbFuuQrQCWJOZ+dDYOG8DCyoWIb+sLy3/nMgrpndNCqT+VBcT sGsyxoNwDyMSiAAPDxEr+pXdApGioNJlXry917JH4iX6eOJGoYM8YubCr1DeQouZryqq sSPJAov/tVeIJhDDfb36lfeLjxBi3oeVX3PHoU8/7D7ihvYcX/BY30JHxf1Gg/Jz6xbn XWfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742842001; x=1743446801; 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=vhAN9Lyj4bqTf4UUrdE+Pmn+JYUm8J4DDJYtyAVBykw=; b=qd4qeNtsxzS6W7GN/02XnUL4F/j8fHKidmFWWSZOau18e+jVBJOCwjgV2+xO0f1e8G 0YQrKsqLjDBQaRCg/7qFkKPevxTXmR/xP70pUGQv1hNcY73t+k/J1OMFyK//+JKTQb2c ZrmyEv9yae7azs9451kLgJw27L/Cqz5BlbIjmB03BRyQJTSNW6AMEZflfMh0XilE9YS3 fwDNDqkmShU/rwFsQk4fih201kAc8qCNcOUiRudh53dlXjB7pPue4xbq9fLVdYInBW6a tcSz6u/dkak/Ef7apb1cEDeKEQQbxBpMhEyk8FsLpRH/ucPHGKiZFar1RJvh9fZF1rHy WTWA== X-Gm-Message-State: AOJu0Yw2r/w2tDuy+rv05ABcsvIE6BS4QqeI4+/db3c3KIlKp6ZVPeKs XFpqLXO0oa+Xzkb3be+ISbohrnzDIEP1LovXibwUgmgWOpYRwrA90iaGaDepDtkCQmRM8HVO5aL + X-Gm-Gg: ASbGncs7aWxnB9Zm+mjMYHSL7rftvu6ojhji6SK0xHfhinbzMUSv8nG8fw6aUHHWpMU FNhg3oFEf7ceQUk/J5Y6E+khEYDJabed5xgm8DmPPniGoGjUlAWqComEMnnpjnELxC956PuQoJQ aoBHiMnqx12zO1ATSh9Ia4OUJV4F7W/xo8GKcGT6mTuu4Um22OThGXe3qX7aZAxluyYXLDwRETk 7+zQy1ftQL09GHA9+WY3jGScXM8JT6PBBju7bDHCXywTTi+rpxiBytyCwjZlSkiDNNnjlZ3l9Zx DtGP+7GiqjlM0NxMAH3b4mbK0rRbtO8I6i6lLNFIO2aPoK2YJ9JlV/z1R4WwvCaki7dXN8Uzz9O tmRQfkRw5ETYYCFR6rUkxFUbF X-Received: by 2002:a5d:5886:0:b0:391:3406:b4e2 with SMTP id ffacd0b85a97d-3997f940d74mr10501324f8f.49.1742842001207; Mon, 24 Mar 2025 11:46:41 -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-43d4fdb03e9sm129423165e9.33.2025.03.24.11.46.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Mar 2025 11:46:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , Ilya Leoshkevich , Nicholas Piggin , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Paolo Bonzini , Mark Cave-Ayland , qemu-s390x@nongnu.org, Christian Borntraeger , Daniel Henrique Barboza , Richard Henderson , Thomas Huth , Artyom Tarasenko , Zhao Liu , qemu-ppc@nongnu.org, Pierrick Bouvier , David Hildenbrand , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 5/7] target/s390x: Declare s390_set_qemu_cpu_model/cpu_list in cpu_models.h Date: Mon, 24 Mar 2025 19:46:09 +0100 Message-ID: <20250324184611.44031-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250324184611.44031-1-philmd@linaro.org> References: <20250324184611.44031-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Both s390_cpu_list() and s390_set_qemu_cpu_model() are defined in cpu_models.c, move their declarations in the related "cpu_models.h" header. Use full path to header in s390-virtio-ccw.c file. Suggested-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- target/s390x/cpu.h | 4 ---- target/s390x/cpu_models.h | 3 +++ hw/s390x/s390-virtio-ccw.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 5b7992deda6..8dd1936e3e2 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -900,11 +900,7 @@ static inline uint8_t s390_cpu_get_state(S390CPU *cpu) } -/* 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); /* helper.c */ diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h index 71d4bc2dd4a..f701bc0b532 100644 --- a/target/s390x/cpu_models.h +++ b/target/s390x/cpu_models.h @@ -113,6 +113,9 @@ static inline uint64_t s390_cpuid_from_cpu_model(const S390CPUModel *model) } S390CPUDef const *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga, S390FeatBitmap features); +void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga, + const S390FeatInit feat_init); +void s390_cpu_list(void); bool kvm_s390_cpu_models_supported(void); bool kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp); diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 75b32182eb0..4f11c75b625 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -35,7 +35,7 @@ #include "hw/s390x/css-bridge.h" #include "hw/s390x/ap-bridge.h" #include "migration/register.h" -#include "cpu_models.h" +#include "target/s390x/cpu_models.h" #include "hw/nmi.h" #include "hw/qdev-properties.h" #include "hw/s390x/tod.h" From patchwork Mon Mar 24 18:46:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875777 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2294966wrb; Mon, 24 Mar 2025 11:49:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXheUY/q3KCV/mTvzMgXT7tlDseEYO3wj5N7CxEZnc6PKdokeS5udNdz+XPrEDloZQF2ds+XA==@linaro.org X-Google-Smtp-Source: AGHT+IENU0Z1MhVy//tHEzAU3vJc4Fug4NunRUY5x6lTXGkPVYRTMuiAYKO0sbooj0if2DBcMch8 X-Received: by 2002:a05:620a:46a1:b0:7c5:5670:bd81 with SMTP id af79cd13be357-7c5ba1deeb7mr2234573785a.35.1742842171230; Mon, 24 Mar 2025 11:49:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742842171; cv=none; d=google.com; s=arc-20240605; b=juzAB41gb1SZtiHCjnv9J5KLRDKvtOw7OIq7jxSeezcFCUbARbvUrBPrPTVeqn1/4O e7U30np3nf/68fQer04Vg7MQYECtEBWzW1EWG8jzLgJI2MDxwP6MKz2B3CnpRqD9qTPo n0dueABESB3u8EbaqUQ7h6w1Utpwlo1m+ksMB3NuPKzhGu94V91wKHad6ZQ/+hEzSbJI SBWzTlHeHVitV2YlBfQNucX5KVUOv2UFYN0jfRWDhFaAryrMN4A4+pkY/eKiD7GRXise 0gV8OgvVBB9S2kLkgEtrSf71LavxNPszQjUTHY/Ou4yK0mcKlPaE/lewBxPVTd6WnntD SMfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=s7H2XHk6YCrzpCT2rz8iyqMZS6d6X/wrnwDCxj4nPhU=; fh=jn65LpBog/h77pKixoe86z6WrIBQWrzlfmjRxMqbSL8=; b=im+ZhtApZN4tG8oQfB8tCxITMW60cntY8TDIgu7CNYEQgp2LkbDOPdeuP+jvaD4YpP m/Sg2aP5vXgd5Y2QGY06h0/tYDDHcb9GtI8sXErwnFYJ62PGocoD6qSI3tV8xWe3OJ7q 9R6knXHgablSIwJf7uCNvxW9iYFtelTgXVzNVS71+Td7rs6nZguOj6QrEylUjOdZCHYb s5A4aTbDHI3uHL9nh6MtV+Tf4rI3m9BR5A6TARq3KRxvRaZsnLPc3rRVBgwd+nWVHrCm E9sDrrYzwUcXfPom60Goi5MUmDgokGhKSm61qnzbY1Q+gt+eh+YSRiRg8IN8oxAcWmLR A16Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O+l0N3ca; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b9367d66si797955285a.569.2025.03.24.11.49.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 11:49:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O+l0N3ca; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twmp4-0001XP-Ep; Mon, 24 Mar 2025 14:46:54 -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 1twmp1-0001Vi-V8 for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46: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 1twmoz-0008Sa-0V for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:51 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43d0359b1fcso30352465e9.0 for ; Mon, 24 Mar 2025 11:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742842006; x=1743446806; 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=s7H2XHk6YCrzpCT2rz8iyqMZS6d6X/wrnwDCxj4nPhU=; b=O+l0N3cae/2IL4RvZTOUa7NkAVi3gBFHzQ7/3UY1tp2I53g4GFOilqeNIGEDAGSVvP MeHnnNi1T+2xC6y6ZxTVsnt4UfaRNtXL880wG5SPDG9YXtrVN078mCl8ohoNXDfeh03+ en1gvLeifUBlZD8jT88c5GrMgAg/sd6abwLEqBQaWlQY1ilO2pLqjqQ15vTkgYJzHcUJ ng10xf/DCZyfXZvio2LUphuQl47aud3Ty5wUK9pkx8PXSMFON9lbycHKWDLx6veECxyF ynrBpetvGJtioQpquA9iYayPTsP7m6fbmayAdPQFAwom58X3CqCRPiLNMAugnWP2OOjx BwqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742842006; x=1743446806; 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=s7H2XHk6YCrzpCT2rz8iyqMZS6d6X/wrnwDCxj4nPhU=; b=I51Uce2jqpHyqJCutKtOMaoH+dfcRKNMD8EbckpbV2qCJgemc6oie9TJIlDCtPKSyv OVh5MHqw7OAqXy5Y6/0bkDnhvtDv2DhBbTaO4vkiX5WCUP8P5niamwBVp2QVQ7cqBW+/ 43tpfVTvV7+KwjBAGZNNAokJzckHotQ4hCXBGZNHklbXIqtecovlOX/DTQRR8b0aaMnu w/dc1M1/wBSV6dTvydPkE3QJ+g78lM5Sdb55sW+C0VdcfWit56VnaQ7OGb2D4jxxaXPm DPxWT1p6+IOCxgFGNKfsQ6NP89TALr/moaVcocavlrQEjxHyo1MMMBVW4Qr6Hmn/1O7p cFhQ== X-Gm-Message-State: AOJu0YxWF6Nn0H2lEskfm2HfPITGj7mLYfuoIl5HmvNOwL6ttMW7QBsH ddhc/xnDIVS97Vb0XYXDBUaCw3dhNVYFksTku76BHVR//F+4eCc1txLr+a7VBiA1x9XMTT/IDG2 H X-Gm-Gg: ASbGncuyxNFjI5RZijJilJZEmHwSd1Q6psK1BD168gSQHiQXMPf37VSYHAN2nauAVae WQ8nyNsMR2oLkcnjnmxiT54QY8Iy8HE+uMVMDCs96gR5JabTDSKjXkEcBWMKG1ouNtKkTPRHxdJ 0mEVMekThPTzBBZJao2fCcOB6u34KvVINsr3VxBFkH0g4mPUUdqfP2vU1i/2wdklJBrWft4RNqO vvSjwhFecBGP3V/8wx6VZCtjoM7dkj/x72JI4svUHec9SRLicPT4Q9BJ5STWLNiTR8uHNB+x8nP VDd5biWPEMheVxXMyNOyTpmb3w9yrMseA6ed9CYSUxrJp0iNVl4HEg0IA3R3UnH36YVMsPwCcdm wlq09VQp3MftMjTRN/0NI1lw6 X-Received: by 2002:a05:600c:3552:b0:43c:f509:2bbf with SMTP id 5b1f17b1804b1-43d491bfe15mr216286005e9.15.1742842006399; Mon, 24 Mar 2025 11:46:46 -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-43d440ed786sm177702985e9.38.2025.03.24.11.46.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Mar 2025 11:46:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , Ilya Leoshkevich , Nicholas Piggin , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Paolo Bonzini , Mark Cave-Ayland , qemu-s390x@nongnu.org, Christian Borntraeger , Daniel Henrique Barboza , Richard Henderson , Thomas Huth , Artyom Tarasenko , Zhao Liu , qemu-ppc@nongnu.org, Pierrick Bouvier , David Hildenbrand , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 6/7] target/s390x: Register CPUClass:list_cpus Date: Mon, 24 Mar 2025 19:46:10 +0100 Message-ID: <20250324184611.44031-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250324184611.44031-1-philmd@linaro.org> References: <20250324184611.44031-1-philmd@linaro.org> MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Register s390_cpu_list() as CPUClass:list_cpus callback and remove the cpu_list definition. Signed-off-by: Philippe Mathieu-Daudé --- target/s390x/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 8449bfee5a9..2876f2c4eb3 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -385,6 +385,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) &scc->parent_phases); cc->class_by_name = s390_cpu_class_by_name; + cc->list_cpus = s390_cpu_list; cc->mmu_index = s390x_cpu_mmu_index; cc->dump_state = s390_cpu_dump_state; cc->query_cpu_fast = s390_query_cpu_fast; From patchwork Mon Mar 24 18:46:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 875776 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2294954wrb; Mon, 24 Mar 2025 11:49:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWo3KIvYTD7UECvWoeSX7UvtY/q+o7ZTHLXCHS6WsmtJvX5guHuOv0TQLasvmQKF2WeLepjmg==@linaro.org X-Google-Smtp-Source: AGHT+IFkp54IsM5AWGGVtALAB9HTpfJjobLp5FWm84sUcd4VRkMnphyhcLwzddI/OFapfLy2TOKy X-Received: by 2002:a05:6214:1c0c:b0:6e6:6252:ad1a with SMTP id 6a1803df08f44-6eb3f33c95dmr219797996d6.28.1742842168903; Mon, 24 Mar 2025 11:49:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742842168; cv=none; d=google.com; s=arc-20240605; b=gCMlEwgR7zrTwfuy1A1R4EOPEJeEtgZJQXkM7+CKKy8qYXprt1FZECwB9O2Ta3naQQ CkwW1JiO7srz8RWvGaaiANA0Qrf7jUkhv1Ts7XuJv0HglCwHXd2l/Ucp5gnY5TxQZZS4 DRH0xl9mEU4N43inOiwi3BVq++GPLvBPBnzA/51iJtBKMczjdDu+YuyocK1ruGJNNQqy D5PgPC7WRRzNPa4ApZ9y1rhgkGjfke5oraj7UsLzdEewOoVlJIopu39xHhYQx0oy8aSc +qVAgZSucutaH59iRWtPckXeeT5sKROYF8a1PQJ//+49ci1J9kUP+3+DoesNlePc0A4n gbmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oN8jfo5grq0MHdHsUE+0JullpCPbAdZoVNQ+DvNKQ/g=; fh=jn65LpBog/h77pKixoe86z6WrIBQWrzlfmjRxMqbSL8=; b=iIhfwaB3ScQoXBrRzEYOK0k099BT3s72IKHIN3UZtr04leAENhyhm9XUKe0wZkgQUw lXaDqhJBv2GGF8oS4kMWtkpYBFa4/lyx7sKgzcjPyrr9Ku/+GW/Pl9tGEACfUOeHbcyH GEQruFpMY2E1IrdO9RR/4hyYk2et9nw70rEOX6fMNf8IbBRqe08e2R/rWkxXWtQ+Jsao 5R+Z3QOwu8y12Gm9i/EgaSNGy1XLSYi/bg3nUcqBi1NNUgHKZ11pOJpOtNvNNg6o7oVB F3iZrURQLujQ02Vt8Fy2KIAEkzMAfxT1mSmQKoW5CJrUcnBG5FmDm2eoKSbiQh8P/OM9 vWDA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SwL4HtrS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3f01a3casi81503546d6.321.2025.03.24.11.49.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 11:49:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SwL4HtrS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twmpj-00025M-Fr; Mon, 24 Mar 2025 14:47:40 -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 1twmp6-0001ZB-IV for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:57 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twmp3-0008TQ-V0 for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:46:56 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-39129fc51f8so3868389f8f.0 for ; Mon, 24 Mar 2025 11:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742842012; x=1743446812; 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=oN8jfo5grq0MHdHsUE+0JullpCPbAdZoVNQ+DvNKQ/g=; b=SwL4HtrSyxfWHvwmA8T3TEsz40qVljp4hjXGYhkgxHiLMGN36eL789Sob1sX75CLor UzaocFxUcv/6m/xd16rNTtmfP1MQvyOnXw8gHPiiQYx41PODtDjZVUSq/91njz1PQqlT a8Nvv5a45iYjSJBEeLoCYhAEeb0ydsyu/PvCgqDMnAT+qHRSwmSATjcBSjqGyj6N7QwQ IvXq+7BndTTFp1w3JtFCzm5E3Fdkpc9bNeLdD9cW+jJ0GEm+/pJt4crDJ3w0qu2HKq4Q z3DRFWChE46tA5Sa4hKAsBJHhUPnGM/SYvo5Y6el4edJVdeUmeqtSp8tkmb0xVML+sWS ZYDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742842012; x=1743446812; 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=oN8jfo5grq0MHdHsUE+0JullpCPbAdZoVNQ+DvNKQ/g=; b=QT+medD2YVFzOnyCuBMdy++kaFFbzNTTNAZ10ZD4TgkwnHG1b4QTfVrs+QLuXPecO0 loSp08uo1RTxFSqzfYqeEYE8e6l7STO5GymqkrhkiubWddLgHNqrpMBx2TEIjRdyKMB7 NfSti89CLG04PIXrA37Trr3AUHjtWLhkwqV+4ityVt7AaSlBxPAM+KREnmH3NNZpfj5i oDaZnWoiEezJCFjz+A5M7ZJUjO8vFuBEXcWqADtTNPPCSjyKRwu6Wsz5SUOrfH5uGTnv RcFGC+gc7uRV7CW9PPX+TdSdLigADxhh5oY/RWpDivU3Nrp1TKMXPonwVfJbrCAvEhM3 DRCQ== X-Gm-Message-State: AOJu0YzpVvz/vSBLMuL2TELL1+hluF4HU6DAjb6tv4YsLnq85tiuzhyj M0IcACux6aKHbG4uZ05hE6I73T4fYEXpupM96tBO6Wnt+MNvGw/7tSkJb2cj2V5KC5Hr8W1M+9C v X-Gm-Gg: ASbGnctXuaCnwUZJE9expFvf0w7zJ3U1MIKUUfHDCFv/E0iBPRJphzP91E+FolJvBfv LBnt3g7zej6LfilkUD09ZnyRTDTN8AdHcnHboxhmvrgt0xuHIiEJadBjrHLxOoWKV8ZsnTLThhF fVdzyJNTzBV3em1Gvq79rw26MgO63qb+Ry1hyOz+xuwiT19L4gIpdJktdqd/OsZSjImQfUEBrcN 0XI282BYNqBhpDLT1SIKFezdcKeSC1TK+EVh9i8zDDRXciWaWckIuy9xO44e44mqQz4FNfeK400 BsVfNbXMb6w7WjT5buzuqiP3tjGAA9DiBL2mYuZWXr5lGHqg13tPRd2kfeACHbBEjWSrGgINi6P h7s04REkLDuAXDq8s+4vMyNqs X-Received: by 2002:a5d:5f42:0:b0:391:2995:5ef2 with SMTP id ffacd0b85a97d-3997f937538mr11141784f8f.37.1742842012150; Mon, 24 Mar 2025 11:46:52 -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-3997f9955c0sm11515751f8f.3.2025.03.24.11.46.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Mar 2025 11:46:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Farman , Ilya Leoshkevich , Nicholas Piggin , Eduardo Habkost , Marcel Apfelbaum , Yanan Wang , Paolo Bonzini , Mark Cave-Ayland , qemu-s390x@nongnu.org, Christian Borntraeger , Daniel Henrique Barboza , Richard Henderson , Thomas Huth , Artyom Tarasenko , Zhao Liu , qemu-ppc@nongnu.org, Pierrick Bouvier , David Hildenbrand , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-10.1 v2 7/7] cpus: Remove #ifdef check on cpu_list definition Date: Mon, 24 Mar 2025 19:46:11 +0100 Message-ID: <20250324184611.44031-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250324184611.44031-1-philmd@linaro.org> References: <20250324184611.44031-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é 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; } -#ifndef cpu_list static void cpu_list_entry(gpointer data, gpointer user_data) { CPUClass *cc = CPU_CLASS(OBJECT_CLASS(data)); @@ -85,17 +84,6 @@ static void cpu_list_entry(gpointer data, gpointer user_data) } } -static void cpu_list(void) -{ - GSList *list; - - list = 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 = 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 = 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); } }