From patchwork Mon Mar 24 18:58:37 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: 875785 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2300237wrb; Mon, 24 Mar 2025 12:03:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWGssEdDx+bdDHoO27xneWxLGKaDkfoMCrTwK5YPV76MKDoUtlAgDGfZrK6bCtwMSJdoeo6dQ==@linaro.org X-Google-Smtp-Source: AGHT+IEpI6qPFCpU2nd9G1HH+q5VhQOfwNy952ysA+x8MiWhprJi4hiNn2GfHJV2ehLl9Y2zqWaZ X-Received: by 2002:a05:620a:4556:b0:7c5:4738:8a11 with SMTP id af79cd13be357-7c5ba18feafmr1781525785a.27.1742842983552; Mon, 24 Mar 2025 12:03:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742842983; cv=none; d=google.com; s=arc-20240605; b=ftI9SyZhv1oz9fqtGCEfkYT3UsbgpznX2xZM5l50kdlj+K8RaTMofco5ONBeWJdde6 kvJ7MBxOaovrGj8bgR7azhWCxCNoaoc9DEFXEp9Rk0slMG6CgTKd5ZFD2ucOlquyzn0t 2hHUZyxqnW2SecYsj2IxcsEFIfyrvxh1FusahX5d7p/Tz7sN1dGR/PalbhBCIlSFncWr EnykKW6ITh5zdrUNKZiUURd2ngmMmw6ZU6K6aKbotn09At8ZmxfUbiveEO8+M0BuxDEU 0iOK2wb02Q6t+GOfGUGKjjuHLEeFAN/jjBU3axSmriOs6gE6XwpR4zMKwNXJI0BXlVqk atAA== 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=8MoNEz0fSiYs6s5Ieob4OaWyw4h8Wjxiwtk24X27qIo=; fh=5r5SmC1LiMx1zQnZIEbJrBEhy4OEKpCVEjDd1+1UapA=; b=aDhDOLyPrBV4yKAzk9HPOpWON6IPawKFyNFIiO9LMma128BA1UX6b2rHSrOuauyZgL zVDOGJBs37kQR+9uQ93aUH0YH+XIMmgMZkazG8sYiqd1vEpo8L81yp3e3SvovjneM+5N zgpgkXVbsAb44zZB72z5KGeHa007UBmnG+5+YEM6MwqseNeKNbZnmg0t5hBOwapt7yGz E6fFjiPnvegcp7RkkiVZoJPJz6yYO4+iVkybC25s0+f6ouDpfZN/gHvJFr3upw7S2o3q PyItadwAlPefAxy3r0gZ50jfYo0joXyKGtEn4ZVL99fmyzACJ2776l/hjNa6CSjVfyZV RT2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qXfXSdsc; 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-7c5b9362150si808014785a.533.2025.03.24.12.03.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 12:03:03 -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=qXfXSdsc; 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 1twn1V-0001TZ-9k; Mon, 24 Mar 2025 14:59:45 -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 1twn1E-0001HH-0y for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:59:32 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twn16-0001SK-JI for qemu-devel@nongnu.org; Mon, 24 Mar 2025 14:59:27 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-391342fc148so3311169f8f.2 for ; Mon, 24 Mar 2025 11:59:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742842759; x=1743447559; 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=8MoNEz0fSiYs6s5Ieob4OaWyw4h8Wjxiwtk24X27qIo=; b=qXfXSdscP27fQ6aRFQNL7k8DZGedGVA4XB32M3YC1rcFD20QMaygRCyAxbkDWucORA CkB+RfOiJgLbvvYW4ljKXatCE5fCmXenD3AR2Trxy/wBMiYKGjqDd/qCCd0zNp78eh92 gRVSmApeZs3YvqWKuDwpwkBS0vxVCsEMXZqeFiY+TlTk7zDar4PaeFn2GxDYU7br2lJP BkLFU8RFYnQlbQGcpghmd+jgXZcquroFywbW723nt+FT1C8X9230jeJx8S2Yd042GpqR JcX2YX9eFE0ejF82b2h1jWx8TbCM1CZf+h4yzsPIkZLJsSfC1jg0qqThEmntQDOICUOM UJLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742842759; x=1743447559; 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=8MoNEz0fSiYs6s5Ieob4OaWyw4h8Wjxiwtk24X27qIo=; b=oYhTYgkWCltGImny8Fl+yUrE7i6Yxd4cRhT6OOaBjuMeI47csCf/Q9jkJPC0bzbQNP rTaVtETNCt4yysVRBWt9HXu9sBwOYfmld3qRKvrZDoSJVZDzG1nSRcHURUO47k/dSyJH j/2ag7FE6R1ySYtG9KLBRPL9fVmCyxGlYuzz8u9Xxp1U8h4rAZo2NyDmaJekCQ+qsd+i FVl60URCYXktwzO2uNZsUWZfVcmHTuP/YdgOhXlVr/j8tkf8TGiESLIHpGIr8pKaldcC E7nPQ30O63IqGKxbtydW3SaRH16NrOSJUl1ytOQt4QBSJ1mIuqpy+oPvtY4r95qdo4SK /K5w== X-Gm-Message-State: AOJu0YxuHZPAVTXFD537Wsq1rOljH0vZKotwTPUVOPkTe7ThrTpWeaIF ZBSMNgqzGLMMT9O0zbbnnK/G1WpeV23hEMVyjI+0CYP/Buq+HwZK/j/0jhvHyGs5wHy/hWsdkAh u X-Gm-Gg: ASbGnctvbzkVm8R5n10Ghuz8XAJsjc6oeUAHUeYF5Cn1CutTCWtFo/RS2WxeXUUIBRn ItzjFsz+lkJQK7JYDeTr2Ucj02h5Jl7B73tV/KOoc2XWgI15qWcCltXUyDv3datE9vCrMxgVUG9 Sp5ph1OMp1ea5a4eztcTSpzH4vjdPaDZzBdr8gFiglWc7vWcGvH6YlpblY51FxB/0bvDiKaWt15 Tr14IUsK1X1zxyVcnIcLHtdMjGpOb6GX3jx2Lw4vwkIwucKzpat2Z8RxRkDHZ047hPNkv0A57rc FHTKWrIDCsSuc4Vg6tCjKop/AzCNyZG+c1sm1IBCDbVMm+V/bZlpG5wwIN4l3vvMbdDNpYqt7l6 /w+xQ3yY5ljs4f4EcIkfifwC1 X-Received: by 2002:a05:6000:1fa5:b0:391:3b1b:f3b7 with SMTP id ffacd0b85a97d-3997f90ddb7mr14616046f8f.28.1742842758740; Mon, 24 Mar 2025 11:59:18 -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-3997f9efe61sm11889476f8f.97.2025.03.24.11.59.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Mar 2025 11:59:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , qemu-s390x@nongnu.org, Daniel Henrique Barboza , David Hildenbrand , Christian Borntraeger , Artyom Tarasenko , Eric Farman , Paolo Bonzini , Halil Pasic , Zhao Liu , Eduardo Habkost , Yanan Wang , Richard Henderson , qemu-ppc@nongnu.org, Nicholas Piggin , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Marcel Apfelbaum Subject: [PATCH v3 7/7] cpus: Remove #ifdef check on cpu_list definition Date: Mon, 24 Mar 2025 19:58:37 +0100 Message-ID: <20250324185837.46506-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250324185837.46506-1-philmd@linaro.org> References: <20250324185837.46506-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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 Reviewed-by: Richard Henderson Reviewed-by: Zhao Liu --- 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); } }