From patchwork Wed Mar 5 00:52:15 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: 870500 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp541069wrg; Tue, 4 Mar 2025 16:54:40 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXUwqZGeK9AXdwFIRImsyDkXRarfutFPIxSIR4UweeEBUZteZryk8ueUc3P2kXJuK+y6jehAg==@linaro.org X-Google-Smtp-Source: AGHT+IFdHN6aUkv8A+EFTtStqPn5Yxba+9gWyI197t/buDYToakg68sXSKLd8h7vCrneZWIxwm8r X-Received: by 2002:a05:622a:590:b0:471:f447:3b62 with SMTP id d75a77b69052e-4750b23c584mr17971831cf.6.1741136080666; Tue, 04 Mar 2025 16:54:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136080; cv=none; d=google.com; s=arc-20240605; b=fUbXLSHVo31iW/hK2iJor6eK+MnXNs8OeVlrLLclMH4J8rlnuXTUse06qA0giWgSR2 geWSRCkV6N2aZdkMAgUEOpun3ml1z2pyWCdsuq7gk/tHXLru2gibHoyP+MSIXl6WXZnk Rxg7Tre1ptCWuF2kL974hnCKBDS7slZcal7Vzwy27d74X6aYi7lL6XhZ43/Himjx/jFt qM+UOvirYPlmDIWVIqO56SsMGnyVtOa2wiWXDG2U+jv0NIgbwkI5aYollyqm56iQryBm CcOP5vK1Tlinjmoppj+Mmip/7G/bKGy7o/YVE0OYZKfpsGuOMN0ICpXm/cOr0p59rdIm MqzA== 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=lk9TI+rSZkzKv7Njal1Wbs7A5Y+36v2tj7kLtziVEzo=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=fZJuiYDmi4RdVrooMLEpD+oa4OV7XWfDoCQTnFdPxZytfNJ8tNQvO1kmQAI5nfTatr XP0srH3OdaqjdJth4c6DQZqh8Q/n6v53Ae1v3bBrcONNoWsJVf5NyTpvLtgro/dt5xBW 7d/ot2q8jvh7XUIg9LcLDa2WJx6vvPFPmwgfw4y8mpWFkF/bNgHyxyOP9muEVcopt9pq shJa+Jpa+5oC+yAQ0fhSN7zcEEbY4j5j8GM6i+3ZfGv2BwhOp8HYzoO72W9NMKoldYAW khs2MBN6zfIqCgQtWDRyRyPaAXcaQx7h/ApssOA1Vho7zT3jH4qNTDqZEnROIIYItx7k K7lA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ipNReLJR; 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-474e637229bsi52969591cf.671.2025.03.04.16.54.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:54:40 -0800 (PST) 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=ipNReLJR; 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 1tpd02-0001yX-GS; Tue, 04 Mar 2025 19:52:38 -0500 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 1tpd01-0001yH-08 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:37 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpczz-0007R8-5a for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:36 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso66759665e9.1 for ; Tue, 04 Mar 2025 16:52:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741135953; x=1741740753; 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=lk9TI+rSZkzKv7Njal1Wbs7A5Y+36v2tj7kLtziVEzo=; b=ipNReLJRXOHXo+sPkQyGh2PL2R5IRoL8f9X+40CuLYGSMVZ8sGcpAzscO3OlB3lyxZ 6gH9naTiheXA4UariubfBippcI2RbfVY/Hk1b2SB7rJmJPAnzfsG8xrXRPUjHUXY6QKf JiIbq7/qWy06hPRRfnmf5frQrBhIFoyB9hFU6WaAh3uLuwPtoUcL+fVfrpbBuR6rwhQQ fbvppcBlyECVEiIMphAc60pCbACb5HJQTZplfWAwSD+7PsKQalubTEJziNSJqKv/C5V3 O8fjL81Y2KR2dASpy3es8oM0BXzhVenGmzB4P4oEU14FxJ618c804jeAikzc9UZhO1fR k5aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741135953; x=1741740753; 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=lk9TI+rSZkzKv7Njal1Wbs7A5Y+36v2tj7kLtziVEzo=; b=IWKt6Myqkkdh5yOhDbBGz1XUP9slqNeypBvjN2XqChTAib+FIil97LYAETKKiiaxzn iwDRkoPdcXTutT3M1P6ThFc+zooW50MRKxXkFMmYBCvKbtJ43QYUIvkUi7avRwRXzneQ RnRYGo8n4jN9XzgTulVTorNNY1M+qZEnXVHhkH5JpY+pWsGabKg41olVwFsSFln3F3dc hs6UbKzPEv5pnoEzqotwuQKDJePU1FfLUZD3ky+Wm3ENQnStVB0ATVqWKL5ttzci9/cD LoiFOutfSTkb9prx0oKTFT+SlY4rVRtskaXGItHx06vrHnEFXocLskokzKi6jUFUsUrV O18w== X-Gm-Message-State: AOJu0YyM41Cxy/iumxVkHpscy3fGf4fG1wGK0H394YPgkLtN57dA1u66 DfiZV0+HV3Z4a+GjTg+ccPVxceM78zsP9q6NrD3r4vdjfmmN+cugfFvA7gFf8SbIDCVPgqsXHcy YNGc= X-Gm-Gg: ASbGncv4+pQccMKCRfVsqKc5Ucs+dNQ1D7niFWmvV5aNf08Q7917NgdHcxgkS03qLVD Mf6WQAUylVOFrXJp47Nnal4+CB1Diz6QhB1AjnbRDrJ+WWqubkJFGJ2pw/EsESmHVBCywKEL11q gYa76MvHj2v/YME07nR5rB9KyO/m9L2cvCQslpCgvVYE0//QBg1nRBYlPVqcwN4OUN4bBRmMAry hkCgMuH0ocFYTiAdTYFMVMXX/5aNi1peRO7j5KHZ11JOuq4jnzPuaqnlC0zfDdo/XSpv/LNNpVQ y7nqDED9VCywINmVWgEZb8hwj/sTrFveVg+icv3hUGzo30ls4LhNKvbB/sN7wqPZm8Qie/0Wod6 Cx0s0M+uMYFjc/fPuCFY= X-Received: by 2002:a05:600c:5493:b0:439:9106:c09 with SMTP id 5b1f17b1804b1-43bd29d0497mr5548175e9.26.1741135953104; Tue, 04 Mar 2025 16:52:33 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bcc13b23asm21499725e9.1.2025.03.04.16.52.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:52:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 01/11] system: Extract target-specific globals to their own compilation unit Date: Wed, 5 Mar 2025 01:52:15 +0100 Message-ID: <20250305005225.95051-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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=ham 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 We shouldn't use target specific globals for machine properties. These ones could be desugarized, as explained in [*]. While certainly doable, not trivial nor my priority for now. Just move them to a different file to clarify they are *globals*, like the generic globals residing in system/globals.c. [*] https://lore.kernel.org/qemu-devel/e514d6db-781d-4afe-b057-9046c70044dc@redhat.com/ Signed-off-by: Philippe Mathieu-Daudé --- system/arch_init.c | 14 -------------- system/globals-target.c | 24 ++++++++++++++++++++++++ system/meson.build | 1 + 3 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 system/globals-target.c diff --git a/system/arch_init.c b/system/arch_init.c index d2c32f84887..ea0842b7410 100644 --- a/system/arch_init.c +++ b/system/arch_init.c @@ -25,20 +25,6 @@ #include "qemu/module.h" #include "system/arch_init.h" -#ifdef TARGET_SPARC -int graphic_width = 1024; -int graphic_height = 768; -int graphic_depth = 8; -#elif defined(TARGET_M68K) -int graphic_width = 800; -int graphic_height = 600; -int graphic_depth = 8; -#else -int graphic_width = 800; -int graphic_height = 600; -int graphic_depth = 32; -#endif - const uint32_t arch_type = QEMU_ARCH; void qemu_init_arch_modules(void) diff --git a/system/globals-target.c b/system/globals-target.c new file mode 100644 index 00000000000..989720591e7 --- /dev/null +++ b/system/globals-target.c @@ -0,0 +1,24 @@ +/* + * Global variables that should not exist (target specific) + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * SPDX-License-Identifier: MIT + */ + +#include "qemu/osdep.h" +#include "system/system.h" + +#ifdef TARGET_SPARC +int graphic_width = 1024; +int graphic_height = 768; +int graphic_depth = 8; +#elif defined(TARGET_M68K) +int graphic_width = 800; +int graphic_height = 600; +int graphic_depth = 8; +#else +int graphic_width = 800; +int graphic_height = 600; +int graphic_depth = 32; +#endif diff --git a/system/meson.build b/system/meson.build index 4952f4b2c7d..181195410fb 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,7 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', + 'globals-target.c', 'memory.c', 'physmem.c', 'watchpoint.c', From patchwork Wed Mar 5 00:52:16 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: 870504 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp541207wrg; Tue, 4 Mar 2025 16:55:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVNhlos80YFPMo6oOFAHA1BIgPTXVGeD/JvqRk7KOYQEbD67gNYuylRFVUt/zuQSvfJwPY1LA==@linaro.org X-Google-Smtp-Source: AGHT+IHRm2rkbZ84eIU4eGoflc4xJHTSY0wPbNSDOCwWPXIdqC+p9u1iiXCsS48FxTJL2/+MJsYs X-Received: by 2002:a05:622a:355:b0:472:447:ad6a with SMTP id d75a77b69052e-4750b4c8f5bmr13433281cf.36.1741136111756; Tue, 04 Mar 2025 16:55:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136111; cv=none; d=google.com; s=arc-20240605; b=VO2uK1FJvK8fTP3CMu+NGbzMmghDdLw76Y4Gy8Zy6E7ipJbvzjVmnHGGVO+o/hDApR i6EPvrVu7BlBBtDDq5c+BNw3D/uvceBrxSwE+36dh9pMxVi5qkebCdNp5qF/Ep37cYEP mcBbi2m4gsZjiZO8KzejwON9q8OwuX5EQXura02QykpzfW4/45x9Rik/d6a2gm4jsneB jUk0a0aaJE/OOC9yUayD6TxUOvxLCivnixRGzX6sF1ndjja3bD9noFaEk+3WfqLs+JlQ ProEUUPiGGCKc33Gc6QRUK794sVVIasXLwYZF5UkakoorcGwxnvCj0sVJCAV8H6M6yTP d7CQ== 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=u+9rUxQ7+saDFqF8IM1RLmO8AxUwJBcx8QYoMNWV/dk=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=QVy3N8fq9nRJKTbxC49hvPKRi8VfZ/1Kk61f/3X9kbnl7xWhOu3ne39WnEMS4j58I1 Z7usOPhkd7zkAAO8hIH+z8ToWec+E5dqiX80HL3nC8yMnwE7AHTfgg65Fg4O/9IwVv3e BkcRVhWlZBt0OIusLzwVNpLBYKtTDINZjWTiOgzk51YfCmiVwKET6f4Ibhp9TzxEpF5z YzuWXwFkOHzdP6hiGx1Qujrk1FrLIVvkB1ZceoHZQ6jt8i49caw+WvXkq9LW81AgZXil kHFtlsbwgWihTp+9EN8/m2f9Qt9FBQ17xgWJiOJuHhHrZeRcuz0rdL4suRSUBF/Aed5K 46bg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JvJ2wlYC; 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-474fef859casi21476131cf.513.2025.03.04.16.55.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:55:11 -0800 (PST) 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=JvJ2wlYC; 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 1tpd06-0001z9-49; Tue, 04 Mar 2025 19:52:42 -0500 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 1tpd05-0001yv-Cv for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:41 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpd03-0007Rs-LH for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:41 -0500 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-390f5556579so2602337f8f.1 for ; Tue, 04 Mar 2025 16:52:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741135958; x=1741740758; 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=u+9rUxQ7+saDFqF8IM1RLmO8AxUwJBcx8QYoMNWV/dk=; b=JvJ2wlYCr5ctaiGriYQ1VvCpgdH5y9F1Rnx0NiSj/wU09QkszKpDpsEHT1ICv0dA22 PzING1Pt5bgLn5aBphaLJpbr0+i0mFxk03PCgcxzvcmX0EOtByM60gIM2eeiQBsGg4Zg /Bk8kMk07nR+NRWaiu7PZkuXXW1ehDLZ6PBTvKXaVJYh1NVCp3yZjTo49iTUXAPVajHc tEzpqJzO9u1go6t31P+DfnzgRjcl05tMgvOrIv4/4nQfNJYV/U8uKegrn56cl6EAG621 ZeYt7N+Dk1MclggNK+zNVa1vJpkdPPRHAo7tUUIdC9iBrQKiZA0yio+b4oZ/B/izHXBd to3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741135958; x=1741740758; 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=u+9rUxQ7+saDFqF8IM1RLmO8AxUwJBcx8QYoMNWV/dk=; b=hpaZ81/WHmTe8rHTblqZvwX4zvmneIDvcjnMAGDPmoJfYWbQIUH+UWZKGFMEy2fdv4 cau9Rgeza1+8sCl0N648JeEIihB+KskErslACO+BuuhoyDytdRAVCELzBfCux/Yay5ME 68sx00MOPgHae7GM2DUVdHQvS7V11iMBKh/6hTAJuKqrEae7jixclXS3AarkdEQsSGw6 kOi7RNabvxpPrjVxlCnIPF3V35fI4+9zFDD06BD9dxDBShxQobUtBlY0nl1Sv8R2Afu2 Pmzi7/UW5+0FMKUoFfciHPxWn0SV5ytz4Wk7X8WNhzQaXjbvlyYJjapwfoxtFDsFy3d8 Vuuw== X-Gm-Message-State: AOJu0Yx5h4QJln6mo/fow9DoJhxL1f4DhiDxt3GNdw3SiKffKfgS3MHQ 4eyu7g04jHn/6bhoYg8CRKwcQD/nKgUDJWcynTDEepIBK/1Bwzd3n8VDMWe7SWYgJFsWLWhwJix BTFA= X-Gm-Gg: ASbGnct4WAAU1RcO5qRiRShvXlT1yVd4t6a1sOMAF2XR/YgAiUoFigWIO+fTIvweedv 4O8Buh9ztpl7I/iVLpcepzzsaElSHjL5P3RtGoExu7kiQDBddqDjdJfwGm+BWw8EWpDtZCnEHxl jNfLkQw7EVcPpvXPK/IADn02GuvJpSzmQCfMZYDeDsKJaLXW+xzSryzvtHiLe5cnaK3idmHP3po l/ldCX8zuSDC2td6HD/TD4dYVZZcaBtP7ftSC+Tt646QvwZBVHKgIIILH0HVc1Fi7Xs7kwXlcs/ QEbtIg59Aq8V+OLvuxVuIlCA6I2L0vtN2YFhuQfy+qojyerFgxVKt3cM8jd7ImEfjGn9rVUdXJv cNr+M3RdRVXsMAiWykOg= X-Received: by 2002:a5d:5849:0:b0:390:fdba:ac7 with SMTP id ffacd0b85a97d-3911f7c8629mr557172f8f.51.1741135957753; Tue, 04 Mar 2025 16:52:37 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e485dba4sm19547475f8f.92.2025.03.04.16.52.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:52:37 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 02/11] system: Open-code qemu_init_arch_modules() using target_name() Date: Wed, 5 Mar 2025 01:52:16 +0100 Message-ID: <20250305005225.95051-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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=ham 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 Mostly revert commit c80cafa0c73 ("system: Add qemu_init_arch_modules") but using target_name() instead of the target specific 'TARGET_NAME' definition. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/system/arch_init.h | 2 -- system/arch_init.c | 9 --------- system/vl.c | 7 ++++++- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/include/system/arch_init.h b/include/system/arch_init.h index 5b1c1026f3a..d8b77440487 100644 --- a/include/system/arch_init.h +++ b/include/system/arch_init.h @@ -27,6 +27,4 @@ enum { extern const uint32_t arch_type; -void qemu_init_arch_modules(void); - #endif diff --git a/system/arch_init.c b/system/arch_init.c index ea0842b7410..b9147af93cb 100644 --- a/system/arch_init.c +++ b/system/arch_init.c @@ -22,15 +22,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "qemu/module.h" #include "system/arch_init.h" const uint32_t arch_type = QEMU_ARCH; - -void qemu_init_arch_modules(void) -{ -#ifdef CONFIG_MODULES - module_init_info(qemu_modinfo); - module_allow_arch(TARGET_NAME); -#endif -} diff --git a/system/vl.c b/system/vl.c index 8f776684ec8..04f78466c41 100644 --- a/system/vl.c +++ b/system/vl.c @@ -26,6 +26,7 @@ #include "qemu/help-texts.h" #include "qemu/datadir.h" #include "qemu/units.h" +#include "qemu/module.h" #include "exec/cpu-common.h" #include "exec/page-vary.h" #include "hw/qdev-properties.h" @@ -78,6 +79,7 @@ #include "hw/block/block.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" +#include "hw/core/cpu.h" #include "migration/cpr.h" #include "migration/misc.h" #include "migration/snapshot.h" @@ -2885,7 +2887,10 @@ void qemu_init(int argc, char **argv) os_setup_limits(); - qemu_init_arch_modules(); +#ifdef CONFIG_MODULES + module_init_info(qemu_modinfo); + module_allow_arch(target_name()); +#endif qemu_init_subsystems(); From patchwork Wed Mar 5 00:52:17 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: 870494 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp540709wrg; Tue, 4 Mar 2025 16:53:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVZ8TU+fpSQEAipQ/LcqR86CfyiKMW767Pngyp8W9qX/QtxMscaDjzPwSdMr21GSzzViiVYyA==@linaro.org X-Google-Smtp-Source: AGHT+IEtz6Ul46UNxUqxbAtrIFFcmMIRS8b+44Iy1zSmO/JestOJa0zKovk9GzMkRyxBGp91NcOy X-Received: by 2002:a05:620a:8011:b0:7c3:c33f:df33 with SMTP id af79cd13be357-7c3d8e8c052mr219802585a.50.1741135992588; Tue, 04 Mar 2025 16:53:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741135992; cv=none; d=google.com; s=arc-20240605; b=Dleki9bCipmGeeFQeXGq2UCY4RwL5gQ8Mt/Yl1eDkB06s1rxu/r7iZMRBlxy5kUwR2 M5Gh5lYLliWYwzU6yyF2vL+4dOfiv/IfDgHwsnf0OtUkqZrU3DySnyoLPD2ULqIXZwJt IjBRKkgpMTFyqlXaaFbyCFrRVYt5nOvpnjwArEz0JfL+04cv7p/rFfz3Zha1X+GgYy1d z4cFe1uCjb66ZmHwykiPM2kIkbf14LZdConX8H3keWbTEdv5H30QMJq91BGkVk7j1/PU NQ6uCwIOfHXEHWWintdvAihHPzwpMd4jU37OW4KD4DRr+pPQWqLhwnU6y2apiA0yNaqM abFw== 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=Gvg7bjz4W+7lzF+vO3juWf59GOeb1i4zphl0KgEd4ko=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=VkzLTmG4JqIURu/KFApj5P+BM/5n14+1zflLr3nzoifmxcRUvibD/YGOMzE4nEmDJ4 +OeM3C/8qG0l+1COWzWSFMkNjYQ22XOeSrFp3EhTzDJwi7bxQ6iYpravUPttbfGWVjuB 8JrvaNMDGZBSLIjwjbqHB4jJmjRaXs0/f9zsqZD4Qy2vwafGL27c6s5hUD05+lIzcJsB KAsEpXboDh/0ZzCiNPGXRRVUL2rgfUATvgfSrguOd0CGmleGqmVMlRf/ttiC+IS51x0P SHG98G25gIJ55iXEx7ZswfsD/EloWYEPu0S4A3xj1r7kXYtuiOaEY99HL9I3iHvYLhNe +Uxg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=msBVr5SB; 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-7c36fee88a3si1200057685a.80.2025.03.04.16.53.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:53:12 -0800 (PST) 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=msBVr5SB; 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 1tpd0C-000206-Ri; Tue, 04 Mar 2025 19:52:48 -0500 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 1tpd0B-0001zg-8T for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:47 -0500 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 1tpd09-0007SU-4X for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:46 -0500 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-390dd3403fdso5286861f8f.0 for ; Tue, 04 Mar 2025 16:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741135963; x=1741740763; 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=Gvg7bjz4W+7lzF+vO3juWf59GOeb1i4zphl0KgEd4ko=; b=msBVr5SB/ThYOS4z8boJRdNwBJaqE1SAnyDfcPoW9L2VYNLup0uVjupRsPKtUqfZCS pQ7EichT67ISxtQis61YNg0/MmUcvDzqHQAmw8xTrCVMVxjqKEJZDXhsD7gcF0DzJKOL Xx9E/Zoi2bC64PD/n//1G+xdJ1ABnMeCnyeNl4NCXDsSEFjrJVU28emWGWkODNoWVPZR 3ZXUW7BzNAa83tAtrMhdSJzyCpE8R5l0XFjonOsp6kDDz6EEQi25Cj6TlcqJ9CCtHBF1 kZYBOWw6SCjWF5V1/MJVxJxvYm4Q1h6vP//jrW4sNPCVYLRqq+c2CjA+pjUIG3HmC8d1 Osvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741135963; x=1741740763; 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=Gvg7bjz4W+7lzF+vO3juWf59GOeb1i4zphl0KgEd4ko=; b=YGD85/yiymqJphlNRYYUJ9Yd3tnbfFTqbiqH11cVWefaZom4B6xTtGgJjhQ/CW7U7L d4fMHBAFtzNL93iV8YzoEv0p8FMadcmx7ee3KGIg1v+MCBjxeEEteUDKyGNXlIVoLDvH E1qjVberorwA8ms+kFtSNY2ifvn8yRnfLa1i9YM10ZAHwqZ5ujdQ6EhHn37KNcLfRapQ mJ5zZK7Sv4Q16HjpLEQMLC504AOVWtx7NmloOKzJpS49A4K3e7djCtW+X9t9ic5lCESe H/HRl6iuU7n/ixtqrg0cH6papJsN0ReuRIXqCv6g++VJjUmaHQlROD1SaJUCBmEFAdw5 od0A== X-Gm-Message-State: AOJu0YxLQx7fkKP7I3ZOEZeveQ+/Ps/5Tns7rp88XUagy1jMHKy9WjEL qLmWAa98q3zSg7+EYom33vWsxX5U6bnT/OqnSqTKNfSmhoNmLFj3pprP74YJZZuqjJKu31uekmM gBPM= X-Gm-Gg: ASbGncvSlq6jIzAd3QySub0uBrIH/t8mDMPnd/k32vXQxtgwgBddc15mGMn/nqiW5Ca aHLoQeS5KsbXHILTXgua9pdsgz3y8z2UvaI3cm70Kr2SucDiY4n3DvWRYIKPR4QIN8sjr/DRShG eeRIyas7b6m4bmlrp3g4eIJVorbIZnRaaT59pSDvOgsonss85zoxOvvUQnxQV/d6pyMSiVs/uyG f9DC61Jz2szdrtFqWKzL2zDbYTaRAZB+j993jBaUQ8GinNXanhkhd4IT3UMspUCWdh6e0quuAUc T8w6Uj3z2mZNqBS68P21bjqi8ZHtzNw1h/lUoj9S+cpp7ZwMiDYsCBDCPF8awBDufRlIr36rdHq qODfLt0wIZFqDMUJCLQY= X-Received: by 2002:a5d:5886:0:b0:38f:2ddd:a1bb with SMTP id ffacd0b85a97d-3911f727557mr607055f8f.8.1741135963191; Tue, 04 Mar 2025 16:52:43 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39122da6cb4sm37957f8f.72.2025.03.04.16.52.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:52:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 03/11] system: Introduce QemuArchBit enum Date: Wed, 5 Mar 2025 01:52:17 +0100 Message-ID: <20250305005225.95051-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-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, UPPERCASE_50_75=0.008 autolearn=no 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 Declare QEMU_ARCH_BIT_$target as QemuArchBit enum. Use them to declare QEMU_ARCH_$target bitmasks. Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 4 +-- include/system/arch_init.h | 65 +++++++++++++++++++++++++------------- system/arch_init.c | 2 +- 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/meson.build b/meson.build index 0a2c61d2bfa..1ab02a5d48d 100644 --- a/meson.build +++ b/meson.build @@ -3357,8 +3357,8 @@ foreach target : target_dirs config_target_data.set(k, v) endif endforeach - config_target_data.set('QEMU_ARCH', - 'QEMU_ARCH_' + config_target['TARGET_BASE_ARCH'].to_upper()) + config_target_data.set('QEMU_ARCH_BIT', + 'QEMU_ARCH_BIT_' + config_target['TARGET_BASE_ARCH'].to_upper()) config_target_h += {target: configure_file(output: target + '-config-target.h', configuration: config_target_data)} diff --git a/include/system/arch_init.h b/include/system/arch_init.h index d8b77440487..06e5527ec88 100644 --- a/include/system/arch_init.h +++ b/include/system/arch_init.h @@ -1,29 +1,50 @@ #ifndef QEMU_ARCH_INIT_H #define QEMU_ARCH_INIT_H +#include "qemu/bitops.h" -enum { - QEMU_ARCH_ALL = -1, - QEMU_ARCH_ALPHA = (1 << 0), - QEMU_ARCH_ARM = (1 << 1), - QEMU_ARCH_I386 = (1 << 3), - QEMU_ARCH_M68K = (1 << 4), - QEMU_ARCH_MICROBLAZE = (1 << 6), - QEMU_ARCH_MIPS = (1 << 7), - QEMU_ARCH_PPC = (1 << 8), - QEMU_ARCH_S390X = (1 << 9), - QEMU_ARCH_SH4 = (1 << 10), - QEMU_ARCH_SPARC = (1 << 11), - QEMU_ARCH_XTENSA = (1 << 12), - QEMU_ARCH_OPENRISC = (1 << 13), - QEMU_ARCH_TRICORE = (1 << 16), - QEMU_ARCH_HPPA = (1 << 18), - QEMU_ARCH_RISCV = (1 << 19), - QEMU_ARCH_RX = (1 << 20), - QEMU_ARCH_AVR = (1 << 21), - QEMU_ARCH_HEXAGON = (1 << 22), - QEMU_ARCH_LOONGARCH = (1 << 23), -}; +typedef enum QemuArchBit { + QEMU_ARCH_BIT_ALPHA = 0, + QEMU_ARCH_BIT_ARM = 1, + QEMU_ARCH_BIT_I386 = 3, + QEMU_ARCH_BIT_M68K = 4, + QEMU_ARCH_BIT_MICROBLAZE = 6, + QEMU_ARCH_BIT_MIPS = 7, + QEMU_ARCH_BIT_PPC = 8, + QEMU_ARCH_BIT_S390X = 9, + QEMU_ARCH_BIT_SH4 = 10, + QEMU_ARCH_BIT_SPARC = 11, + QEMU_ARCH_BIT_XTENSA = 12, + QEMU_ARCH_BIT_OPENRISC = 13, + QEMU_ARCH_BIT_TRICORE = 16, + QEMU_ARCH_BIT_HPPA = 18, + QEMU_ARCH_BIT_RISCV = 19, + QEMU_ARCH_BIT_RX = 20, + QEMU_ARCH_BIT_AVR = 21, + QEMU_ARCH_BIT_HEXAGON = 22, + QEMU_ARCH_BIT_LOONGARCH = 23, +} QemuArchBit; + +#define QEMU_ARCH_ALPHA BIT(QEMU_ARCH_BIT_ALPHA) +#define QEMU_ARCH_ARM BIT(QEMU_ARCH_BIT_ARM) +#define QEMU_ARCH_I386 BIT(QEMU_ARCH_BIT_I386) +#define QEMU_ARCH_M68K BIT(QEMU_ARCH_BIT_M68K) +#define QEMU_ARCH_MICROBLAZE BIT(QEMU_ARCH_BIT_MICROBLAZE) +#define QEMU_ARCH_MIPS BIT(QEMU_ARCH_BIT_MIPS) +#define QEMU_ARCH_PPC BIT(QEMU_ARCH_BIT_PPC) +#define QEMU_ARCH_S390X BIT(QEMU_ARCH_BIT_S390X) +#define QEMU_ARCH_SH4 BIT(QEMU_ARCH_BIT_SH4) +#define QEMU_ARCH_SPARC BIT(QEMU_ARCH_BIT_SPARC) +#define QEMU_ARCH_XTENSA BIT(QEMU_ARCH_BIT_XTENSA) +#define QEMU_ARCH_OPENRISC BIT(QEMU_ARCH_BIT_OPENRISC) +#define QEMU_ARCH_TRICORE BIT(QEMU_ARCH_BIT_TRICORE) +#define QEMU_ARCH_HPPA BIT(QEMU_ARCH_BIT_HPPA) +#define QEMU_ARCH_RISCV BIT(QEMU_ARCH_BIT_RISCV) +#define QEMU_ARCH_RX BIT(QEMU_ARCH_BIT_RX) +#define QEMU_ARCH_AVR BIT(QEMU_ARCH_BIT_AVR) +#define QEMU_ARCH_HEXAGON BIT(QEMU_ARCH_BIT_HEXAGON) +#define QEMU_ARCH_LOONGARCH BIT(QEMU_ARCH_BIT_LOONGARCH) +#define QEMU_ARCH_ALL -1 extern const uint32_t arch_type; diff --git a/system/arch_init.c b/system/arch_init.c index b9147af93cb..fedbb18e2cc 100644 --- a/system/arch_init.c +++ b/system/arch_init.c @@ -24,4 +24,4 @@ #include "qemu/osdep.h" #include "system/arch_init.h" -const uint32_t arch_type = QEMU_ARCH; +const uint32_t arch_type = BIT(QEMU_ARCH_BIT); From patchwork Wed Mar 5 00:52:18 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: 870499 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp541044wrg; Tue, 4 Mar 2025 16:54:34 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUqJe1r7ngsg6A87h040rzN88s2FE4RXEoAL6TGZrlnHC9p+lJAM6Y1qVQQHNjeRG+DVkMXUQ==@linaro.org X-Google-Smtp-Source: AGHT+IH3TQk3PZejufSCBNO0NrxUw9KvtJOu6qdSZiigrafjFEst75SXBp4nZAskrOWH+MMmPBxE X-Received: by 2002:a05:622a:346:b0:471:c03d:cd6c with SMTP id d75a77b69052e-4750b43c4ebmr17079471cf.19.1741136074490; Tue, 04 Mar 2025 16:54:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136074; cv=none; d=google.com; s=arc-20240605; b=CVPKPU2wHNRrI99kjWnuuOTL1VkOpsBuuHJCVY98xiSV6oo1n0+pa2GJ06U6Sl0fhG IVYvIQ/7ViInLEgZwVuwT6dzMHrIrdTdM0344Af6UiNiQ3iBDLa8gcfpZ6PM3K40ed+Y HQQCHGuSHguNFp66J0Z11BB9bJ4ESG/R4/0dbbnwU9Lkkj/7ig4OqIhSu9efmGEfQJ5n yHxRZe/lRP2EDweD6aYfeQWd6YWxDNGzoFIiQdFKV+U1Mob9hvxqCp8O6xpNlvv6g84m nKWmKFdS2V/bvdeJrqVF9lBr1cxEJud3klp1QzlgSwKplmfruRhZEGqIpYw3Tx+cONLG oW/w== 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=IqxIPPwTTylIALJZg+yGEIl/36eft918YUUplk+Ib0s=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=L025V1B0xJLmJhvSCcN9NNVyvlqpNKijJzZfE7Dg1RMUz8lWfclI1Z1ipAGMLdwXEB 0jId9J5z0vaH32x86LACSAMx3lGrrx8SU/nM2k21uSZ9tLQR2EqX1cdZbzZMXzqxZ7WL tkBbf5X4+FKkqPtQluu1FnUcx8jPZKcUeKBbCbJplGvNzdCiO7ZkSDLpPaK/w6mXbA+x sfOx9x2Z8xkmoFKANPFe5DkM/557fdU1bpO6wPjiRTYIs5G39zqcJKhIx88tkHQvGARg UGqHgsYTQOYniWuACiQFNTM8BDRjJ/LvKR9fqIZ8Gs4WFPJaQZAHCzeKYbLMnqGTsb5K GgZw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vMfyQlwW; 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-474e260d42asi54265001cf.333.2025.03.04.16.54.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:54:34 -0800 (PST) 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=vMfyQlwW; 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 1tpd0I-00020r-Tu; Tue, 04 Mar 2025 19:52:54 -0500 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 1tpd0H-00020c-5z for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:53 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpd0F-0007Tb-7K for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:52 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4398ec2abc2so55758515e9.1 for ; Tue, 04 Mar 2025 16:52:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741135969; x=1741740769; 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=IqxIPPwTTylIALJZg+yGEIl/36eft918YUUplk+Ib0s=; b=vMfyQlwW3ifHEUez9rMcU15yy3BugspweUKQKayjIpu5JwrHfCAxtruDw8F8M7gvxn S4Xe4+XKEpRMhahyr9uVA54EPr/KAZRWbOZwuVd4KjFL1mNy4CQe2wf+nGs88gyDrfIP +ZuHYI4Knf05+tPSHA8dD08daBwXF+LjmAdWR7wbS9caow2HGdBnWzdhg3CIIh4oP7aM tfIJQcl9CoHnD+30Q7I4x1kJM8iDVdvcDoAfSh/smfchEtdwLHH4+8tPohVVdPf3PXoC 8jTUA4q1a7T1TdmW7Uaf7J0BZXCUk3R57vxby+QweYnyQokwg9YnzgNlKM+6VY8ESKss WxFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741135969; x=1741740769; 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=IqxIPPwTTylIALJZg+yGEIl/36eft918YUUplk+Ib0s=; b=DFCETfR+449XRXOKXuheUPDIi+9daZtuFhZbV27IM+MCDg8MHfEOm+XGxBw9ZDlYeB O/mLK/aNKMdvS9O6KVkrlOVp/Y6oC1tdRxe+t9WbjF1GyRllafL86HwXGBteSBjW090E eTZWLk82TmAyAbCTfmoyMnwLWECWG/Uc+9hUL+ZPfTt9xOBWpdT78SU6iARcQWgL6OqC REp93azp46hgkf1yL9VhIWQG4nvTSy9UiMAqFi9xtja3dy8oYVCn+n0Fnn/jekKoR0I6 9C28+qjcQSw+c0HN5/iTjSxWp0xabvYwlBYcjExFFkbhVyOg67FKXfHljbBocxSejLYu yLHA== X-Gm-Message-State: AOJu0Yy7nEJ1rBMNN+arMYByqb1HtM5CzrR3MkmoNdmwWj5wOuA2jbLW zLblAvAtcT/ZruJeb9c/T7AlOlQq1kb48pNH7qMlvamAm8pciuoRYbgzsKQ6NpB04qrgJAZ6zB8 8yO4= X-Gm-Gg: ASbGncvEmJT37yCSWJpsxXJyGI+rDuyQ5RKxDJ0FjngIwP+hGyXuhx6UdGIr5l9KZor gt2fOCW9Xp7m9cisif/7FgJpW0Zb9hUaaKXEzHI/qKsghuQWkLk44GBEL+0k45pKcQFXL5hgu1l T44Ym+9dn1IU1cWxtwPWUVuvYc8xlYIf3Ggk4wVwS2QEwGEuCBSprxOT1G+a8qGEsFladNRgMlj LzaLgln8R58fj8ZK2qWvf5dZYPQ4TdUguGEFGNCBykoNlKl+OYDmVhPhqCItSXwuSvp7EI7Suta BHTsp7LoJX6tMno/pELNT10Lf1pj/pRlcWmY9xj26Tbi3jvCFousqVDI4Fc8u44y08sQG6/LOPp /iL1tORcvKoQDAI2M9fs= X-Received: by 2002:a05:600c:3b87:b0:439:6101:5440 with SMTP id 5b1f17b1804b1-43bd296abc2mr5697225e9.8.1741135968698; Tue, 04 Mar 2025 16:52:48 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e485e61csm19488252f8f.98.2025.03.04.16.52.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:52:47 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 04/11] system: Replace arch_type global by qemu_arch_available() helper Date: Wed, 5 Mar 2025 01:52:18 +0100 Message-ID: <20250305005225.95051-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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=ham 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 qemu_arch_available() is a bit simpler to understand while reviewing than the undocumented arch_type variable. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/system/arch_init.h | 2 +- hw/scsi/scsi-disk.c | 2 +- system/arch_init.c | 5 ++++- system/qdev-monitor.c | 4 ++-- system/vl.c | 6 +++--- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/system/arch_init.h b/include/system/arch_init.h index 06e5527ec88..023d27d5bd7 100644 --- a/include/system/arch_init.h +++ b/include/system/arch_init.h @@ -46,6 +46,6 @@ typedef enum QemuArchBit { #define QEMU_ARCH_LOONGARCH BIT(QEMU_ARCH_BIT_LOONGARCH) #define QEMU_ARCH_ALL -1 -extern const uint32_t arch_type; +bool qemu_arch_available(unsigned qemu_arch_mask); #endif diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index e7f738b4841..7c87b20e694 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -3165,7 +3165,7 @@ static void scsi_property_add_specifics(DeviceClass *dc) ObjectClass *oc = OBJECT_CLASS(dc); /* The loadparm property is only supported on s390x */ - if (arch_type & QEMU_ARCH_S390X) { + if (qemu_arch_available(QEMU_ARCH_S390X)) { object_class_property_add_str(oc, "loadparm", scsi_property_get_loadparm, scsi_property_set_loadparm); diff --git a/system/arch_init.c b/system/arch_init.c index fedbb18e2cc..0fec0cd416b 100644 --- a/system/arch_init.c +++ b/system/arch_init.c @@ -24,4 +24,7 @@ #include "qemu/osdep.h" #include "system/arch_init.h" -const uint32_t arch_type = BIT(QEMU_ARCH_BIT); +bool qemu_arch_available(unsigned qemu_arch_mask) +{ + return qemu_arch_mask & BIT(QEMU_ARCH_BIT); +} diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 856c9e8c32e..5588ed2047d 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -132,7 +132,7 @@ static const char *qdev_class_get_alias(DeviceClass *dc) for (i = 0; qdev_alias_table[i].typename; i++) { if (qdev_alias_table[i].arch_mask && - !(qdev_alias_table[i].arch_mask & arch_type)) { + !qemu_arch_available(qdev_alias_table[i].arch_mask)) { continue; } @@ -218,7 +218,7 @@ static const char *find_typename_by_alias(const char *alias) for (i = 0; qdev_alias_table[i].alias; i++) { if (qdev_alias_table[i].arch_mask && - !(qdev_alias_table[i].arch_mask & arch_type)) { + !qemu_arch_available(qdev_alias_table[i].arch_mask)) { continue; } diff --git a/system/vl.c b/system/vl.c index 04f78466c41..ec93988a03a 100644 --- a/system/vl.c +++ b/system/vl.c @@ -878,11 +878,11 @@ static void help(int exitcode) g_get_prgname()); #define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ - if ((arch_mask) & arch_type) \ + if (qemu_arch_available(arch_mask)) \ fputs(opt_help, stdout); #define ARCHHEADING(text, arch_mask) \ - if ((arch_mask) & arch_type) \ + if (qemu_arch_available(arch_mask)) \ puts(stringify(text)); #define DEFHEADING(text) ARCHHEADING(text, QEMU_ARCH_ALL) @@ -2929,7 +2929,7 @@ void qemu_init(int argc, char **argv) const QEMUOption *popt; popt = lookup_opt(argc, argv, &optarg, &optind); - if (!(popt->arch_mask & arch_type)) { + if (!qemu_arch_available(popt->arch_mask)) { error_report("Option not supported for this target"); exit(1); } From patchwork Wed Mar 5 00:52:19 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: 870496 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp540857wrg; Tue, 4 Mar 2025 16:53:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWZIkZuso1T3T42+0AseDDL/HPdL/0vZtHh7EZvJ6k2FMa9+bHsDWT4j8ELFnC4DmgWjXRKOQ==@linaro.org X-Google-Smtp-Source: AGHT+IHrslCbzXYaJXrisSK1Srj51b3ROSP2RErU0C8s5LE8bFslCkO3GPnYJ3QCGtkppSaymZmR X-Received: by 2002:a05:622a:590:b0:471:b0c0:82b0 with SMTP id d75a77b69052e-4750b23c36fmr17291971cf.4.1741136024126; Tue, 04 Mar 2025 16:53:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136024; cv=none; d=google.com; s=arc-20240605; b=Xlg4ZfDQnjuxfPTfwEI5EPXz0eiPfV3imK2joGF6z+fJbTiquhfoyMwqKTSTZ8wkzU TnkQy1JzjmQfZ3Jl7sLtgTXS3A30EJTNjCHRDIyjprS7zkgkOkFEJQuB/YimaQgCLXXA ovHFfAKklEgQT9MgBwCZaNExqJbetFwCltAv1dXj7eB0sjptD5QbDAq35MEuan+AH9KI RAiNubx1Ridb8AySTuseqdEgpa2oON1zZjpNz4es29o7+7Trd4kxqJ8+lkfrt9LXl2lp B3juUBZkgfovDhsa2Sm6zQM6WRPdMvWc8VJOxfWnG2n0Qp2NenthLM/OPXpOjwuw6Yac BlCg== 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=TUuRn4CzCPoO/VAnx0IGvC9GeVl9hidcvGsy50QPlH8=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=QXgXH7R3qOpwhxJiRLEPD0gbInLDvHasUV7jFY+OwbsHVSBrlNtMtBU37qV27ffawA on90IlLTKCUig2c0pDeraUCUdyE1MQxySc3g6lZIxnvtOBSfUhOsoWv4eEt+oxqpHS7Y ZURktoRVPpTV7/OUfYG8JlUHR57JULlYComegYbWDWyNcki7E/vLwMF6HlMZOGC1OWp+ s6tTFVysUCroABil4lO8vwVHO5AUAHOGO09KyDlGEu79Hr0F9jUSfk8VjW+MZfptImjB g+ITVb9twAtp8EL3csiAATLhuXJT7/Z2T5Lbw8PDgNHW5r3ysM9BGVTHQwusnj8QqWkh qMKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tc6373Cc; 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-474f84616f0si35079291cf.87.2025.03.04.16.53.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:53:44 -0800 (PST) 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=tc6373Cc; 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 1tpd0O-00021z-LI; Tue, 04 Mar 2025 19:53:00 -0500 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 1tpd0N-00021a-Oe for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:59 -0500 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 1tpd0J-0007U3-8Y for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:52:59 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43bcc85ba13so10279135e9.0 for ; Tue, 04 Mar 2025 16:52:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741135973; x=1741740773; 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=TUuRn4CzCPoO/VAnx0IGvC9GeVl9hidcvGsy50QPlH8=; b=tc6373CcIS6dpBTOy9WZ7ZHQigFCE0fEXIH1V4nODo0Z1rD7z1n36TSMcbpTk9grhq e6WoGFXSOzMHg0jr7kfVfgkuhy6MTEmUDfMtwZLS2rY9zCpMOlshEPuHdnhH5rLVfX/I Heg2OMFBUMIJ1f0BiY+fkkyDc5OVX6T0V0PWrYmP9NusI80n9KJCgO2zsm9ytvNblppa 9lsUu50YH782MtVQ0FJf62N57eFVvbd/j6BEslcgau6N7FtEDXRW8E8mXdInYi1Y943s TESbbEmCZIuTHAlGiEaBfiw4BuMbQp7rGokQju78JQju9AbMfNsf5a3G5X/NHTNDffRi UlZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741135973; x=1741740773; 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=TUuRn4CzCPoO/VAnx0IGvC9GeVl9hidcvGsy50QPlH8=; b=NC4S8/7AFFjFJuU3OvO4Ozu/GaTtq+chfD0fuqTQa/O9qfu5FSzPFtQfVkiZHdFtBS UdVHpZjrGbsJe4xXoZXHPrzx4lNvX/4UA7htJi6oPHKAR1NPRphLAOGi3R+3CWkoqVef sx0/KrZfGl4/bJz+BywREszXXppJgCw2EFjSv/BUaC4trLt0R5I8GL9X+b8A3HNKnjx4 TvLGUqpuIt0V1UwIElFqNyjqVHC2jSNIsaSthDXFz0rkz7HSzKyGkcXdc71hWpJuhkdE Y9cGKKXET62W+7kGhaPderEHGUVmsD74d+lA8R2tbb87m626ywHltzZ9/IYG4uvBhVP9 Z7UQ== X-Gm-Message-State: AOJu0YyfmKyPFqKKz/hGsxnW2wGhXo2R1MzJVbghDn4J2XGoC1uKRi+u 1ZhOX1pC+w5/K5F6LQIsTfaCUj+hVf0fxoHKYxHO9LfYUAql168WEJfld9hDpxwGMUR9VIYO3OO UuJU= X-Gm-Gg: ASbGncvrDxOhF7nHgiddxNHHWmhbelcdM5lSzO/Ynmza14e497jJa38WoCCuofvhWZv 19y1ap8wsEdPfbbxstJpN/hmuQ+8QSSn8xr+1Rja4SwfFLtPWf76gJuzn0Ee3ZsexCw9dhpFqEO YeYLMrK248rfBMRJ7Ncn9rqe50V36Nr5WOcOrcjX/jOzRnjeyYvJZFYc9x21My6LjPbuRXHMq3o m9XvOi3RDzGZ9F6PSLAOZEpi2evZhMsAYL713X2Ku7qknyQv/cwNTnVKS92crGmRUbK+6UxL5qR fHovZ9XH9dUizENtrevhIGV2brVCnNDyoG3uyB/fhYp89NzWOb4Mtsz0Qq0h64u2cUZ/bIJ/Ko4 m+Ie7nOj281mz4TewZEQ= X-Received: by 2002:a05:600c:45c9:b0:439:8185:4ad4 with SMTP id 5b1f17b1804b1-43bd2ae6055mr5100495e9.27.1741135973366; Tue, 04 Mar 2025 16:52:53 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd4352ed7sm1356915e9.26.2025.03.04.16.52.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:52:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 05/11] include: Expose QemuArchBit enum to user emulation Date: Wed, 5 Mar 2025 01:52:19 +0100 Message-ID: <20250305005225.95051-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 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=ham 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 QemuArchBit isn't really specific to system emulation, move the "system/arch_init.h" header to "qemu/arch_info.h", a more generic include path. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Richard Henderson --- meson.build | 2 +- include/{system/arch_init.h => qemu/arch_info.h} | 4 ++-- system/arch_init.c => arch_info-target.c | 2 +- hw/scsi/scsi-disk.c | 2 +- system/qdev-monitor.c | 2 +- system/vl.c | 2 +- system/meson.build | 1 - 7 files changed, 7 insertions(+), 8 deletions(-) rename include/{system/arch_init.h => qemu/arch_info.h} (97%) rename system/arch_init.c => arch_info-target.c (97%) diff --git a/meson.build b/meson.build index 1ab02a5d48d..04d8c477644 100644 --- a/meson.build +++ b/meson.build @@ -3766,7 +3766,7 @@ if have_block endif common_ss.add(files('cpu-common.c')) -specific_ss.add(files('cpu-target.c')) +specific_ss.add(files('cpu-target.c', 'arch_info-target.c')) subdir('system') diff --git a/include/system/arch_init.h b/include/qemu/arch_info.h similarity index 97% rename from include/system/arch_init.h rename to include/qemu/arch_info.h index 023d27d5bd7..3cb95926e27 100644 --- a/include/system/arch_init.h +++ b/include/qemu/arch_info.h @@ -1,5 +1,5 @@ -#ifndef QEMU_ARCH_INIT_H -#define QEMU_ARCH_INIT_H +#ifndef QEMU_ARCH_INFO_H +#define QEMU_ARCH_INFO_H #include "qemu/bitops.h" diff --git a/system/arch_init.c b/arch_info-target.c similarity index 97% rename from system/arch_init.c rename to arch_info-target.c index 0fec0cd416b..6c11c73feb9 100644 --- a/system/arch_init.c +++ b/arch_info-target.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "system/arch_init.h" +#include "qemu/arch_info.h" bool qemu_arch_available(unsigned qemu_arch_mask) { diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 7c87b20e694..bafa9f39497 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -27,12 +27,12 @@ #include "qemu/module.h" #include "qemu/hw-version.h" #include "qemu/memalign.h" +#include "qemu/arch_info.h" #include "hw/scsi/scsi.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "hw/scsi/emulation.h" #include "scsi/constants.h" -#include "system/arch_init.h" #include "system/block-backend.h" #include "system/blockdev.h" #include "hw/block/block.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 5588ed2047d..b88e6e83512 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -22,7 +22,6 @@ #include "monitor/hmp.h" #include "monitor/monitor.h" #include "monitor/qdev.h" -#include "system/arch_init.h" #include "system/runstate.h" #include "qapi/error.h" #include "qapi/qapi-commands-qdev.h" @@ -37,6 +36,7 @@ #include "qemu/option.h" #include "qemu/qemu-print.h" #include "qemu/option_int.h" +#include "qemu/arch_info.h" #include "system/block-backend.h" #include "migration/misc.h" #include "qemu/cutils.h" diff --git a/system/vl.c b/system/vl.c index ec93988a03a..e96c72e5400 100644 --- a/system/vl.c +++ b/system/vl.c @@ -27,6 +27,7 @@ #include "qemu/datadir.h" #include "qemu/units.h" #include "qemu/module.h" +#include "qemu/arch_info.h" #include "exec/cpu-common.h" #include "exec/page-vary.h" #include "hw/qdev-properties.h" @@ -110,7 +111,6 @@ #include "trace/control.h" #include "qemu/plugin.h" #include "qemu/queue.h" -#include "system/arch_init.h" #include "system/confidential-guest-support.h" #include "ui/qemu-spice.h" diff --git a/system/meson.build b/system/meson.build index 181195410fb..900c5d52ee4 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,5 +1,4 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( - 'arch_init.c', 'ioport.c', 'globals-target.c', 'memory.c', From patchwork Wed Mar 5 00:52:20 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: 870495 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp540761wrg; Tue, 4 Mar 2025 16:53:21 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXjRQZaJ6DwOxTfdksHikeTK+mj2rqmsORXpihrpfrlS32R7Vbo4hKNFyIVXPoI1YjKr+JDnQ==@linaro.org X-Google-Smtp-Source: AGHT+IHjyamTtdtTf5isbJB1RvIzH25zn2xwX1xu4W4Igga+Vxk08h2u4LuCOE2OYoO6LbQVz219 X-Received: by 2002:a05:622a:24d:b0:474:fb73:6987 with SMTP id d75a77b69052e-4750b4d82bfmr16225861cf.50.1741136001206; Tue, 04 Mar 2025 16:53:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136001; cv=none; d=google.com; s=arc-20240605; b=cgrLPc5wVqR4c3ZEWMVY+O3mOrQhA2uINbjkQ263lRMcuTjAUPJwYhyv8IIzqhN/Dp B1meTDJjEEAyYxz2BRNC+EbnAi14OWEd4e16VibQP95jUA572bXD99s3hdPgsQ80MXpQ 1sP/w7e0bS1pgNstcRRJdU4QgHx5Y5AH07/8VoMv9d+erHjfPWdJtnt/lDJYmvVzO7UY OwEW0CXZL5KTtxiQBxiPK5SY8d/w10bGhp6PPjjfpig7PLslKanQf2OpkH5J9fvoByjU FqPKqh7AEaWrcN1TECH/hy37J+UAgrHdhUyRQ7p6Hogo1wpEnDPDnRz74KnUK5vXkbI/ WXxQ== 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=aI7bGdusWwalQtQ/oihM/Pr8zgv/ivF1OVwRKsBRxKw=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=c2WNuJaQQoP0nHFvYG6IfSdSJrqsIlBy0Ji8GqlEtRLHDxVe3aHzwQjukEmIO4iGbu BEu6RYxmgcYwGvFNi1Lv9e3XVWux/4IpmZD/Ux+5z9P/cq4p4HLSxb8YXPzv9pOHYf2H jIEFrb327zNLUgm+21svWBd6HiJ8EnzzMto4sdxWd6ADz91XlWwaNxLcNfdKWJo3BXCW mpm4y7j+kLMvaw2SDNCTEKdFxO32zAknsXAPKaSRSmNrYze48LxK1MK3q/ZjYWk+2J1w lJwA6gytSnNWqLIRdLCvcTFkX/5y+IOsf/Iz8kizNB47NKvOVgQ0HxHyYu13d7Vp4sbk NkOw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g3whpSgM; 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-474fee72f43si22141331cf.363.2025.03.04.16.53.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:53:21 -0800 (PST) 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=g3whpSgM; 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 1tpd0S-00022M-J7; Tue, 04 Mar 2025 19:53:04 -0500 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 1tpd0Q-00022A-Ux for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:02 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpd0O-0007Uh-Us for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:02 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-390eebcc371so2710193f8f.0 for ; Tue, 04 Mar 2025 16:53:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741135979; x=1741740779; 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=aI7bGdusWwalQtQ/oihM/Pr8zgv/ivF1OVwRKsBRxKw=; b=g3whpSgMsjfDpFlmtAsVyRlysniRThxnmibzudnqjCWKjl1E5iFCW/ty37mXHiiXol hu6vog9URuJA8U6KdqasYWEET7zCsSRf6pUKFT3LnCBXI0OvoEJuMEvlhi3F6tt6Gsu9 KuJiC0fV5q3Q0u2vhvFV0fJpJ2ZtE9nSaQfEXlpWvgohOXTnJqzbMs0PXkWUNXLj/VbC /6vGf1q8r/trHZ94M1N50UgiIuPd7u95alxDWeBXJ6tWazTGnFMYJcTdZwG22Y3AZ14L IJ5n+QkTk+Cz360OAOUCKa50IyC+CBzWSMZ+IXaet/FayLsbs5N1SvX6Lhmf2k2+ti1Q K5nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741135979; x=1741740779; 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=aI7bGdusWwalQtQ/oihM/Pr8zgv/ivF1OVwRKsBRxKw=; b=EJsxJpqeMiQT2q3oBkXOm41d3ZI0iu6PFY6Nao/Vrx8x7Wa6LNGSSB/VF6uCch4Ryq epfpDMFyK1KU7JWP8a4FW/PEF0CoPTWxG4HfDQBP8Eq1Q3YlUX0vJBUe1iw2H3u0l9jK ExXbvNKdQ8Auchmj3/zdAWw1fS6QaY/LrqLjEZ97GzVhhF8xUQOHeySQTXrCm9KmyRFR YDdKEajX2jV3IDadaJpG5JpdBxiHecBJ/7hhpuZmS08TAMkpHV9blJ3+/L0eAUkiUpZt CSLn4rtxmVkgfnxgEoh3Ok4SyWI3P6eE4r0YVkrwVf2DH0tZzLEePc5kULkTd9nN8jtC eT6w== X-Gm-Message-State: AOJu0Ywg8w1n2Cimo61fYQ6qZ3cukyH6Lcfg0SXXuzSIsCdcfiQ70Wid UDDyThebxodO5T62a4zTr40kxCn6uJoqVSHNrbL5zH7hueS/weIznbCY3u6xwGkq1CCojqvY9bc dp1k= X-Gm-Gg: ASbGnctMbkMx++0DE3RLniqMCE8UsbSPnubqso9jN3By6qb2aylaJpzHhJi5aBigCyq VTsFpZvo4uZZwFGv5synPaI/QwSkMxJlHH92/pIls6gs0sdMerlsNS6uAQe5QvN9zbUqEjJzhn7 OqaKzx6VCAeS6AduaRA7vsQeYAHSOney2eOYdoqV6gTbACG/bzPirq7Av9yW80bdSWNARQW5aHW DlcMLVjc/e5kxLjX8EtF994EREKh3CJl4Xhk4c2zl/gdPtbCYfq1G14Vv4YSpv0gMwe5Cq2fu3w 6TUVnINT0VfwAKAQ7O1SryaC/RaSWt5/4arJzTAAsufe1ftij690lUi4w4oQ0vB9eviuyIMlsn8 IHatGGKkx0lfTrYPKNhg= X-Received: by 2002:a05:6000:18a7:b0:38f:483f:8319 with SMTP id ffacd0b85a97d-3911f7c17f2mr662075f8f.51.1741135978743; Tue, 04 Mar 2025 16:52:58 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42b7478sm1496035e9.17.2025.03.04.16.52.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:52:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 06/11] include: Declare target_name() in common "qemu/arch_info.h" Date: Wed, 5 Mar 2025 01:52:20 +0100 Message-ID: <20250305005225.95051-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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=ham 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 No need to include the huge "hw/core/cpu.h" header to get a simple prototype declaration such target_name(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/hw/core/cpu.h | 2 -- include/qemu/arch_info.h | 2 ++ arch_info-target.c | 5 +++++ cpu-target.c | 5 ----- hw/core/machine-qmp-cmds.c | 1 + system/vl.c | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 5d11d26556a..4f538a8f96d 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -1162,8 +1162,6 @@ bool cpu_exec_realizefn(CPUState *cpu, Error **errp); void cpu_exec_unrealizefn(CPUState *cpu); void cpu_exec_reset_hold(CPUState *cpu); -const char *target_name(void); - #ifdef COMPILING_PER_TARGET #ifndef CONFIG_USER_ONLY diff --git a/include/qemu/arch_info.h b/include/qemu/arch_info.h index 3cb95926e27..613dc2037db 100644 --- a/include/qemu/arch_info.h +++ b/include/qemu/arch_info.h @@ -46,6 +46,8 @@ typedef enum QemuArchBit { #define QEMU_ARCH_LOONGARCH BIT(QEMU_ARCH_BIT_LOONGARCH) #define QEMU_ARCH_ALL -1 +const char *target_name(void); + bool qemu_arch_available(unsigned qemu_arch_mask); #endif diff --git a/arch_info-target.c b/arch_info-target.c index 6c11c73feb9..61007415b30 100644 --- a/arch_info-target.c +++ b/arch_info-target.c @@ -24,6 +24,11 @@ #include "qemu/osdep.h" #include "qemu/arch_info.h" +const char *target_name(void) +{ + return TARGET_NAME; +} + bool qemu_arch_available(unsigned qemu_arch_mask) { return qemu_arch_mask & BIT(QEMU_ARCH_BIT); diff --git a/cpu-target.c b/cpu-target.c index f7e17a650c0..1177e93c444 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -158,8 +158,3 @@ bool target_words_bigendian(void) { return TARGET_BIG_ENDIAN; } - -const char *target_name(void) -{ - return TARGET_NAME; -} diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c index 3130c5cd456..3bf280cef16 100644 --- a/hw/core/machine-qmp-cmds.c +++ b/hw/core/machine-qmp-cmds.c @@ -19,6 +19,7 @@ #include "qapi/qobject-input-visitor.h" #include "qapi/type-helpers.h" #include "qemu/uuid.h" +#include "qemu/arch_info.h" #include "qom/qom-qobject.h" #include "system/hostmem.h" #include "system/hw_accel.h" diff --git a/system/vl.c b/system/vl.c index e96c72e5400..a41ba4a2d5f 100644 --- a/system/vl.c +++ b/system/vl.c @@ -80,7 +80,6 @@ #include "hw/block/block.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" -#include "hw/core/cpu.h" #include "migration/cpr.h" #include "migration/misc.h" #include "migration/snapshot.h" From patchwork Wed Mar 5 00:52:21 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: 870501 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp541091wrg; Tue, 4 Mar 2025 16:54:44 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUJJ9IdgHMUt6e5dTOPqvlT/CS0mjhVnQEq1FfUY/J7wctFgnNwl+7Db4REfui9xzj7EtsS8g==@linaro.org X-Google-Smtp-Source: AGHT+IEnW18IKwMj9RsT/84fUYjOJISI3E9sALD90d7JkuwOQ8SqDxxaeenLIZwT6j7r2lksUyzK X-Received: by 2002:a05:620a:2606:b0:7c3:ceeb:7d4f with SMTP id af79cd13be357-7c3d8ef3759mr223528385a.51.1741136084167; Tue, 04 Mar 2025 16:54:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136084; cv=none; d=google.com; s=arc-20240605; b=PqcyuE5fgsriAJNxQIpuAfdRiqHl5S6RmHRZhgFRD876OtFVwICrsbfU7jDk6xoVLf 5X4GVtw645sPFJmkixBDAJt1tLqA3+deA73GOaxjHj4BsStzE/Wlau3vplACOtQz5Th5 F/8GYLFkZPaeOM3yYmI3HfAFmBVTZL/m20qWYCd5lA+MvN/AUlrLIG3oh5xF3i1SJ2Gf YpGxHZyfP4tCkDa5+b4vwofFbFc4XNDYlbAGwIiIaGU8h180n4nH+5qHGyq/3tk7H8A8 4LD+J06LimOY710GHiNM0Dp/S3rcYEH56sFjI5VXYfO3bmToroihGXvZXpAeEom/DBGH X0sw== 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=Y4ACuYCqam8wBvbr9CPnjgFj0qVd0d3ZVp9SVoo31vs=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=aPDdJDn4Ly4sf7QrXlYtioGgPOWHWWwJUpGsK7rHpkXXjvcPfaptWDnVTGE98zBEcN /WnkW4dJZxNFnuKfpRlVz7MJ95KHTtnRTj5tJH/j2kuKbHkR6tWu8bfsoO5soMqK4Io3 m9aDRnz4l/OspDDo/DbljKfbvdRuyKdvegTKKVpIa/C4S3VWmXpxu6+49X584slS6V5o CCYsT2lyYedHf587ElLHnxLQpJ2cOwrIDEPg2BrAPZ8XwTcoIwXLfADA7Qt2lIgeynoT niRd/VCWyUceu17Lt87ARrLzB4xkJaJiglV431UPtUd/UePj24op6PkAFdcxD2G3mQax 2jEQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bfvpaNxg; 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-7c3c23df8bdsi431406885a.139.2025.03.04.16.54.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:54:44 -0800 (PST) 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=bfvpaNxg; 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 1tpd0Y-00023C-7O; Tue, 04 Mar 2025 19:53:10 -0500 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 1tpd0W-00022i-H8 for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:08 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpd0U-0007V6-PR for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:08 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43996e95114so42360525e9.3 for ; Tue, 04 Mar 2025 16:53:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741135985; x=1741740785; 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=Y4ACuYCqam8wBvbr9CPnjgFj0qVd0d3ZVp9SVoo31vs=; b=bfvpaNxgnzoXimRNGYRK/jwmFb1W+Zw8Zncq1IvUILgLcpc+WOxWX0ch5BZa8ScIU7 q6fD6ZZwqY/7zM6oFh0adsJpNIjkGGtjuhtrm2RKR+H5OCm6MWRmT6dx+BdCX85nOzz3 Fv+LEc6lBwYEGJN1Nf+MakqcX0ZQln2r7NvO/GuMt1DlcvIRvI8gjArEyfSa9CU+XoWQ 9RDSh+XLlrXGvjX8NAS5Dvo988yx7NjHqADI9LkjeEP+Wjo3r30978f6APr1vkYCbExm SutTPxDspJFcBd2e9OcninKs0ZoK+yZ5Z57qLtSR5lgwlivEigWCGkcINdOO6gX0V4Tc N3ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741135985; x=1741740785; 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=Y4ACuYCqam8wBvbr9CPnjgFj0qVd0d3ZVp9SVoo31vs=; b=hE2gegXHrTybNPgyrpr8BFFCTYp5UkNd9BlsxaxGmHMD/hP8SPQLjxqrVS2EW7izan ohFZDR1GlcNrz5F362jCz0ol45lzo+Nzm8/h3k7GTDVPNi1sG57qaog6G2/vU0Qkr9MX VdXlZok7XRUz2IouOkrO2c2Cg0DAeeq6nAcAdC57Nd3SSSuothaP31+VJEbO3Zct1F6Y rLrZz8GqF4oO7okQy1FVNIG/wP1Wz2gAAsn+FENVZz6dzarMWVMYIH0jutlQJKXIAE/K Gi0BM2KardK/tVJxRxhT0LxlpINThsj9bq8R9C1SA+lWAGpxuargB5nzpq/Blmm4f1wU wa2w== X-Gm-Message-State: AOJu0YzXhQYKaP/7umdrjzXsn9k13wNReGAdG7FvMyAXZ7JnCjY22dWr E9hkodSUTbaS/1XVQoU0Ntfw2QWrDJ/RCCmVGBRG+Bz87cb6vEmmevhPD2ffctK9FS52y/sGUVX W71s= X-Gm-Gg: ASbGncvIGpp4ajjx1FWQqHbcMs7uv6+T8ZwJOoiNmiDTpvgUj1Pu7gcyo/uPJ/QcqMq shuGmhnjKIGUsjvh9iqCGP2DC5Y7Tn8vnoNG+XwDh6Ng1gbsz98bU/2hjQgXcQij/ibtAgqhc1H 7vtyuR4nJ/dqvJCk3mNAxh53IIl6cdruTPlQVJcvI0591B7lefEPOnbe04jtiY1Isrf2nddFAg+ 9UqxPf4rETB2j09c5dhDIKsgK3nVaaG0ZBgGtKSKlShGtgLxGLH49OAlrJMHkWG/MejIgAo6iTg /blSL9TACXxpU74qes6eXWnXzzwJP9HBsNKJfz4DXi8NYBSJKALobwIO9ALNoUKcibaxAKVUWfC yyVWhF5pgKXOyGaoP9lc= X-Received: by 2002:a05:600c:4e8b:b0:43b:c0fa:f9ce with SMTP id 5b1f17b1804b1-43bd2955621mr5504105e9.14.1741135984903; Tue, 04 Mar 2025 16:53:04 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd4292af0sm1523095e9.12.2025.03.04.16.53.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:53:03 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 07/11] plugins/loader: populate target_name with target_name() Date: Wed, 5 Mar 2025 01:52:21 +0100 Message-ID: <20250305005225.95051-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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=ham 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 From: Alex Bennée We have a function we can call for this, lets not rely on macros that stop us building once. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé --- plugins/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/loader.c b/plugins/loader.c index 99686b54666..e56c1003c27 100644 --- a/plugins/loader.c +++ b/plugins/loader.c @@ -29,6 +29,7 @@ #include "qemu/xxhash.h" #include "qemu/plugin.h" #include "qemu/memalign.h" +#include "qemu/arch_info.h" #include "hw/core/cpu.h" #include "exec/tb-flush.h" #ifndef CONFIG_USER_ONLY @@ -297,7 +298,7 @@ int qemu_plugin_load_list(QemuPluginList *head, Error **errp) struct qemu_plugin_desc *desc, *next; g_autofree qemu_info_t *info = g_new0(qemu_info_t, 1); - info->target_name = TARGET_NAME; + info->target_name = target_name(); info->version.min = QEMU_PLUGIN_MIN_VERSION; info->version.cur = QEMU_PLUGIN_VERSION; #ifndef CONFIG_USER_ONLY From patchwork Wed Mar 5 00:52:22 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: 870503 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp541198wrg; Tue, 4 Mar 2025 16:55:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV/F0mC3XJb6NXGXTI8dcZnyefCkvsa8k0GQNQKfSBefEC/LN02m4TFXhSST2x8SOUNq4XjuQ==@linaro.org X-Google-Smtp-Source: AGHT+IGHeGi3zJJMpdVo6JXiITxNtm0366dRxsMSOIv99E0C+m5k248HO7cnJKYHP0LimlhpCYjQ X-Received: by 2002:a05:620a:8524:b0:7c3:d86d:940 with SMTP id af79cd13be357-7c3d8ef9bf7mr235663385a.54.1741136108806; Tue, 04 Mar 2025 16:55:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136108; cv=none; d=google.com; s=arc-20240605; b=EkhcSqROVhdYFdEDQwpuGqOlyuttfYU5PjgK6wfRPV0YgwMTOiQbNbCHhRynJB3Oyl scHKwJaYhDD7gNpIuR9meoTwi/SHoGMiPyljMS3RPW8WQIbbDcf7nuKaO2C7JWoM2Xx5 KGOH7lkuxPCZbidxo64b6gHm3w7+w+YEsH9AvIx4dALOxRFio14UJk1OqgYPG94+v+6C Jqc1+NcFJUa1pi9gCj4j4WiFJyTKjnqoo0GT39/9lb0skYffml4vXkK9ajYmT0f6oHOB Lo9cIIe6lFGEctt4YUi5aiY9OIbqXaacLAPI9xHfUd7wHsoCffB3HvqdrLpGxEwoMzqX IEGw== 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=istWwK/PBp4qWDVkDVm5a+mDjkZK9769dQ3JC5v2GBw=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=B4aqljQzaJDeIz75JEhKlr+SEC8vyfs3A8MsopxbwKwu1/pcwnq8aGmokNXsd6gCbS /TJzwpmos35R/D8r7viiu5nKLMpzu3i7ysnaZIyczcvjDbicEGqyOAkc3ZguPVYa24xj ILoNrSVLgeGH9EJvVlBWr730nyuFlN8FaiWY0q1niN3RcIABfQqqYd4RgO7vL5RUHqdZ fZVZOzBq1u4Mw3f9QRRQWkoAEndMsGypmd7v1fYyIAtwgtwwZXycB2dYHYFf5daNtUny HcsRx/A93mGEc+csWbAgoaU5fbHrxUtdyzAo/OvAGQRIjzyfiBYvux0gQ0IYDFrrPNdE nMLQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uApn1ED5; 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-474efe20aacsi43120251cf.385.2025.03.04.16.55.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:55:08 -0800 (PST) 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=uApn1ED5; 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 1tpd0e-00029p-0S; Tue, 04 Mar 2025 19:53:16 -0500 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 1tpd0c-00028h-1U for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:14 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpd0a-0007WO-5a for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:13 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-390dd362848so4824127f8f.3 for ; Tue, 04 Mar 2025 16:53:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741135990; x=1741740790; 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=istWwK/PBp4qWDVkDVm5a+mDjkZK9769dQ3JC5v2GBw=; b=uApn1ED5G2512UO648I1nJbFSsxYDir0b7FNJUG3qpA6vhZ74PJQTZWN33Fm093Ew2 SzybHv5swcnyhY9bGWC0iH6A4aiZYTKE2WQvCP55S641s4s46TPDNxHszv2T+2RXHDgr 04PPKkQActqAp5dEWKSQqnvdNuX8Bjv8o0ottk1IpGz4VHGZyoW8x85hfKDVtW9hhJxu S8j2z3UPpfO8aAHsZCBDT99tblEoZf6SZMEKyatLtgxud3OEamqytz/hq3P//TtmyN2j RZ3NdbJG8qf6cUbEORlDRZIB6kTxRiBUspUVcUfc/+s6g1i6vE1IyvicMGdWbvc2pdWS zLqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741135990; x=1741740790; 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=istWwK/PBp4qWDVkDVm5a+mDjkZK9769dQ3JC5v2GBw=; b=IZSsrT2BnqvZhkp2i4V5r9y5W0AxOkUAEFBLsknkjy5rYGYyPSSLGFWrrGRVHLOS8u qn1WjoYftzfNxFe+PLid0X5jnggktn6fT0xzxEZLHSxppGf5pGbQ0CaD6VZOkwWZQKhZ GFYwCdrCaRrzNpOheUPaFm39fSdkEz4bU+UIztLthJHAI4U4m11QUbri75qiohyMq1ec vy2UbowJtzDR8cTAXPrdxgj3zKpH9PiMvhlR3rlT7IQ1CUR+C9Wm6uIy3/UFBRpLl1n6 fH0fHcxcTHtkCHApfMq+KvDywgbYRoNbcpHgdCYyqSLIxhhO1iLjDv9KbsOcZtDiotPE 0wNg== X-Gm-Message-State: AOJu0Yxd5NTwHgXD6B8JJ6z85JX5BdB8Ld1vBN2fLwu2yE6jXGx37pmT euAFGqH+AbY8FSSQZwvu3c5jiJtPV8X/mQgDpyXSnSRHpWBMyYn8OJjKSKLF6P+bM2JtXAbvIU6 oais= X-Gm-Gg: ASbGncvQY3zGzvPZQgp1DmDUdHN8aCYaj2ITnqb1px+By1J6eI3uUc9BdyIBPWD8gBf PAODNAW9AYfBrUwyPFT8IVZNWz5IyxW7N1N/SzDk9acTxahUioDg4ZRIqnt8Fud2DEOafe5OvFx 6m1BBoC0BQ0bpzrm5K1otT6AvCK9ef/9fxKR/0e+VyXtPap2SMNk5YoxJy94olmoKbXhqadnOuG EruRVaUU535+trktbsR+ZhLxpmHUCcbdiw/105xi1EhL+8PWXkx051SHBin/Yo/g3lLzxzoMoh1 qIW46QEiqZ6WVEF55uV+yaArKaH0OLYt1BM9zphXyEGYK7iIexyuu2uZH52R5Ubnh66G9yThVsS 8GTbX1ip2oUed2JDifX8= X-Received: by 2002:a05:6000:2a8:b0:390:f0ff:2c11 with SMTP id ffacd0b85a97d-3911f714a20mr510534f8f.2.1741135990272; Tue, 04 Mar 2025 16:53:10 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd435c836sm1323485e9.37.2025.03.04.16.53.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:53:09 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 08/11] tests/qtest: Replace TARGET_NAME -> target_name() Date: Wed, 5 Mar 2025 01:52:22 +0100 Message-ID: <20250305005225.95051-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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=ham 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 In order to avoid the target-specific TARGET_NAME definition, replace it by the generic target_name() helper. Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/fuzz/fuzz.c | 5 ++--- tests/qtest/fuzz/generic_fuzz.c | 4 ++-- tests/qtest/fuzz/i440fx_fuzz.c | 5 +++-- tests/qtest/fuzz/qos_fuzz.c | 5 +++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c index ca248a51a6c..84cef4907f9 100644 --- a/tests/qtest/fuzz/fuzz.c +++ b/tests/qtest/fuzz/fuzz.c @@ -17,6 +17,7 @@ #include "qemu/cutils.h" #include "qemu/datadir.h" +#include "qemu/arch_info.h" #include "system/system.h" #include "system/qtest.h" #include "system/runstate.h" @@ -35,8 +36,6 @@ typedef struct FuzzTargetState { typedef QSLIST_HEAD(, FuzzTargetState) FuzzTargetList; -static const char *fuzz_arch = TARGET_NAME; - static FuzzTargetList *fuzz_target_list; static FuzzTarget *fuzz_target; static QTestState *fuzz_qts; @@ -61,7 +60,7 @@ void fuzz_reset(QTestState *s) static QTestState *qtest_setup(void) { qtest_server_set_send_handler(&qtest_client_inproc_recv, &fuzz_qts); - return qtest_inproc_init(&fuzz_qts, false, fuzz_arch, + return qtest_inproc_init(&fuzz_qts, false, target_name(), &qtest_server_inproc_recv); } diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index d107a496da6..89a9c16ce1f 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -12,10 +12,10 @@ #include "qemu/osdep.h" #include "qemu/range.h" +#include "qemu/arch_info.h" #include -#include "hw/core/cpu.h" #include "tests/qtest/libqtest.h" #include "tests/qtest/libqos/pci-pc.h" #include "fuzz.h" @@ -914,7 +914,7 @@ static size_t generic_fuzz_crossover(const uint8_t *data1, size_t size1, const static GString *generic_fuzz_cmdline(FuzzTarget *t) { - GString *cmd_line = g_string_new(TARGET_NAME); + GString *cmd_line = g_string_new(target_name()); if (!getenv("QEMU_FUZZ_ARGS")) { usage(); } diff --git a/tests/qtest/fuzz/i440fx_fuzz.c b/tests/qtest/fuzz/i440fx_fuzz.c index 155fe018f80..7b39a2ad085 100644 --- a/tests/qtest/fuzz/i440fx_fuzz.c +++ b/tests/qtest/fuzz/i440fx_fuzz.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qemu/arch_info.h" #include "tests/qtest/libqtest.h" #include "tests/qtest/libqos/pci.h" #include "tests/qtest/libqos/pci-pc.h" @@ -145,11 +146,11 @@ static void i440fx_fuzz_qos(QTestState *s, pciconfig_fuzz_qos(s, bus, Data, Size); } -static const char *i440fx_qtest_argv = TARGET_NAME " -machine accel=qtest" +static const char *i440fx_qtest_argv = " -machine accel=qtest" " -m 0 -display none"; static GString *i440fx_argv(FuzzTarget *t) { - return g_string_new(i440fx_qtest_argv); + return g_string_append(g_string_new(target_name()), i440fx_qtest_argv); } diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c index d3839bf9994..fd93c405f2f 100644 --- a/tests/qtest/fuzz/qos_fuzz.c +++ b/tests/qtest/fuzz/qos_fuzz.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/arch_info.h" #include "qapi/error.h" #include "exec/memory.h" #include "qemu/main-loop.h" @@ -83,8 +84,8 @@ static GString *qos_build_main_args(void) test_arg = test_node->u.test.before(cmd_line, test_arg); } /* Prepend the arguments that we need */ - g_string_prepend(cmd_line, - TARGET_NAME " -display none -machine accel=qtest -m 64 "); + g_string_prepend(cmd_line, target_name()); + g_string_prepend(cmd_line, " -display none -machine accel=qtest -m 64 "); return cmd_line; } From patchwork Wed Mar 5 00:52:23 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: 870497 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp540928wrg; Tue, 4 Mar 2025 16:54:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXLiQaYkAWKFbcoY2BgqZs5Yu2A2cbYaSRAZMTsEq7mWTeO53XdEKjSdVwQZHd65yrYUfl7Ig==@linaro.org X-Google-Smtp-Source: AGHT+IEGpNbjLuXW/8hQ0Jf73/KRcSyDzB7GJH119eMzW1U8SmjNfDpBr9P62UWIsq22q5tR5ang X-Received: by 2002:ad4:5cc4:0:b0:6e6:61a5:aa4c with SMTP id 6a1803df08f44-6e8e6dd1937mr23747016d6.31.1741136043393; Tue, 04 Mar 2025 16:54:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136043; cv=none; d=google.com; s=arc-20240605; b=NdlzDPzMTn9CB903hjUpaxesrAq9Snp356Q7Ogs2ve87WDWskuYIkM2LZE2AENoBP9 r2kIbcbjmvZKWvX8FoXXLu23TKLEC5QnFseGUU9lNiYGIGsYUJIeJ5g/6fmbPaGdGNe8 WRcxRsfkOFtotgBz3/cc+tv1GNpJhJRDvmPLiIziyqx7aS8nTN/Z9N7pzusT2ELSi3UA YVCXUt8BZpgKQglm1cScHCAXD7E0z17bs5MWwu4so57CLfjDZqbKjQSBiTS2Om6VuhES wKwcZk488AJ9HWGSL1DVm/U6iEgA+UCDT0kdsu5bCh1h5XeR+7uii24aqTrvjM9Lc94F v9Tw== 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=DSiKYdB6630hg7am6WhMyssXSt9ts03i324UUBol9bo=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=RO3zhtlKSyc8jqsKABuwMS99UZxZGSsASy6aWIuikJFNg88Z9D0KM4jclqwzkKMRPi LBeQ/vocuO+XZONI5Idz2/9IuOiL8ETZV/3CAg64Kk587YuX+EgQIRiHkVTZbDwQP0dg 4aLvyRkxcwMvwIrS5TTyNz9QR/LuE0gqPXSh4R1ibLvCLW3f/wZQy1tCUq7aDEJ8wvRr zKmwHt+yrpZVRRgHJr+cGVFexhQqEBY3WzVao3Mds4zyyhfFZv6J+JD8EAoHajV38i3v ml94JzQ/sy9KjhcepI+8r2iXl7CK8EQMR/6o2ry6XPlLn5iB45Ghw+3FEkoIfhjIdf+k 8GeA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=n1msjOdG; 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-6e8976e3a36si121838986d6.396.2025.03.04.16.54.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:54:03 -0800 (PST) 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=n1msjOdG; 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 1tpd0y-0002Qp-Ns; Tue, 04 Mar 2025 19:53:36 -0500 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 1tpd0k-0002Dk-2C for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:22 -0500 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 1tpd0i-0007XM-AG for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:21 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-390fb1b987fso4249449f8f.1 for ; Tue, 04 Mar 2025 16:53:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741135997; x=1741740797; 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=DSiKYdB6630hg7am6WhMyssXSt9ts03i324UUBol9bo=; b=n1msjOdGswzmLJirKE03HDTmsAVFoPfesF7pqbfv5BfGq0e15DVV9kmxZ43kEGl331 52O8eLJebc8sbif/beLrz+t3H85NYw6cfxV4LvUwyuO8rOWBs9gosdsKpZFINqNgr1xA 4BjhMquQpl5ff+EO2Ex+Efi0yQxWXJo+giu6Z/mikCsxJlHZsX6lHgMS/arsWVcXA8BO v9fjKIvGy9+U+vkCuQrLEmnjsvYk6Q1a89/AVgHohLVfrwRnHyGUboxGieKXRbbSpS1L P8MHFn/X7B3gZZ5ggbj2EKPwC48j+eSHV05waDJPRo8ih3bsYgw1cLYZ5SKnUbmZZmFr ls1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741135997; x=1741740797; 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=DSiKYdB6630hg7am6WhMyssXSt9ts03i324UUBol9bo=; b=WAQSxvec4132eD0/lIObiKbIJ4azjIVI5KquW71itzGrBhk78PVHj4racQd4N02Hdo amFL3/zuegmlRUkgjHS3HUqTORRFs6oO/5W8HxfLMbzcDEEuhcQCJfJNFL988F4qyV2U SjimwrbpbHDROulo6rbPebKJjcIeLUdw3ICg70NrlsgD5RXVqrY7NkirkL719RPONtCF scXA1Rx5DyK70KcdtUsqCXTvpkwkdxUH1a7yZ4rYFuJCQM8ZRH8D+mZk1RuvTB/MCy+x NPvr1YBijrG7O5aR/6aHWSUodvdYYqmdTe3aulvnQOOJQ173n96ujFKH8nWv8bfKZDLW oDJQ== X-Gm-Message-State: AOJu0Yw9dINjIWeRvjZTla6DYv63aXVtkB9FetXYMzhLXrN1gIpz2j5k 5IUCYt+QP3QrJLhevHl/O21YnD6UJvgWKHVceQVapIs2wv5Gjm4khNYhBUbJHH+8rerYfU7ujXD 2bLw= X-Gm-Gg: ASbGnctqGEYMWGMk9qE8M6FUrzxNRL9WwSjEQi7HzXln7C1W5DprDw1j4ieZNw1Uvae t75iYu4CsJWySyTVJByfr1r2mlOeFdON80lpBmLJ1R9PofQKV08YHAH3OW21F+2CRTLg+TERlui GG7DJ12wFK7aRh57gF6a4+nUvtVx0sQO3jhPJJeG6dFZccUF23N6wBgx885HyIKJn4xfcrLcbqJ 752BTLUj8bck76/FaINXnVM3X5uNWEnza4IVoKxDsfnuUtxN2laVq9wFbOj+DjsE2GVZah9ObJm pcAOsk6JAGXLm3wCu/8hSG/dT1vqAbnDoQI5jXILGzSuPuFVxcHZwmv7AbU+JKYZgRzgb8KVolA GPYDkbRySANn5ZGyNybw= X-Received: by 2002:a5d:64c5:0:b0:391:1218:d5f7 with SMTP id ffacd0b85a97d-3911f7bb7a9mr582723f8f.40.1741135996445; Tue, 04 Mar 2025 16:53:16 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e46f580bsm18957749f8f.0.2025.03.04.16.53.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:53:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 09/11] user: Replace TARGET_NAME -> target_name() Date: Wed, 5 Mar 2025 01:52:23 +0100 Message-ID: <20250305005225.95051-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 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=ham 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 In order to avoid the target-specific TARGET_NAME definition, replace it by the generic target_name() helper. Signed-off-by: Philippe Mathieu-Daudé --- bsd-user/main.c | 9 ++++++--- linux-user/main.c | 12 +++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index fdb160bed0f..683003c2d52 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -25,6 +25,7 @@ #include "qemu/help-texts.h" #include "qemu/units.h" #include "qemu/accel.h" +#include "qemu/arch_info.h" #include "qemu-version.h" #include @@ -150,9 +151,11 @@ void cpu_loop(CPUArchState *env) static void usage(void) { - printf("qemu-" TARGET_NAME " version " QEMU_FULL_VERSION + const char *target = target_name(); + + printf("qemu-%s version " QEMU_FULL_VERSION "\n" QEMU_COPYRIGHT "\n" - "usage: qemu-" TARGET_NAME " [options] program [arguments...]\n" + "usage: qemu-%s [options] program [arguments...]\n" "BSD CPU emulator (compiled for %s emulation)\n" "\n" "Standard options:\n" @@ -188,7 +191,7 @@ static void usage(void) "\n" QEMU_HELP_BOTTOM "\n" , - TARGET_NAME, + target, target, target, interp_prefix, target_dflssiz); exit(1); diff --git a/linux-user/main.c b/linux-user/main.c index 5c74c52cc52..0e4722ea273 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -21,6 +21,7 @@ #include "qemu/help-texts.h" #include "qemu/units.h" #include "qemu/accel.h" +#include "qemu/arch_info.h" #include "qemu-version.h" #include #include @@ -432,8 +433,8 @@ static void handle_arg_strace(const char *arg) static void handle_arg_version(const char *arg) { - printf("qemu-" TARGET_NAME " version " QEMU_FULL_VERSION - "\n" QEMU_COPYRIGHT "\n"); + printf("qemu-%s version " QEMU_FULL_VERSION + "\n" QEMU_COPYRIGHT "\n", target_name()); exit(EXIT_SUCCESS); } @@ -543,14 +544,15 @@ static const struct qemu_argument arg_table[] = { static void usage(int exitcode) { const struct qemu_argument *arginfo; + const char *target = target_name(); int maxarglen; int maxenvlen; - printf("usage: qemu-" TARGET_NAME " [options] program [arguments...]\n" - "Linux CPU emulator (compiled for " TARGET_NAME " emulation)\n" + printf("usage: qemu-%s [options] program [arguments...]\n" + "Linux CPU emulator (compiled for %s emulation)\n" "\n" "Options and associated environment variables:\n" - "\n"); + "\n", target, target); /* Calculate column widths. We must always have at least enough space * for the column header. From patchwork Wed Mar 5 00:52:24 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: 870498 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp540980wrg; Tue, 4 Mar 2025 16:54:21 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXMC68gF95PbIZTYuk60Y5dMRQw3TDp5jTrV+lEl7RjhUbHv5Et2RYc0LVpDZ9WQHrR42XJZw==@linaro.org X-Google-Smtp-Source: AGHT+IGfk6aAcLj6JPwLl2cbsUtc00Hv5OIemzxAOMSb0oj96jjBPginTdTO2LVlitTDfBBLM8G5 X-Received: by 2002:a05:6214:5287:b0:6e6:683c:1e32 with SMTP id 6a1803df08f44-6e8e6cfe364mr21922116d6.8.1741136061469; Tue, 04 Mar 2025 16:54:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136061; cv=none; d=google.com; s=arc-20240605; b=YTOVM2stjwzgB36FL0s/qjHatuBJYCHKiBmEeSyb/C4fre9CWZwV4ecrmje9p9wI9A BjYa5tYo46m5ZrEAz4/ca7jSwPPUlGK7XXWyUoeZO7/WmbtDnlYPH1hdff5VeNPYweZw LcgqUinj4NyW5Z95Z2DbkkxLNJ9qjyBqubg3gHgPHyAF7voE45AW2icFh0EIGvpm78Ml B/oRWyS2DTKfpXTd2E/3K+Jq57TI/RemrmgC4T6PMNmfbCO5zdGo2hpthIWFtPX+aSrs o4+2CbadzFm+Exy8cRwT9fXdOyz/Q+EWfoFA8S2sy1oj3dyllT/ObKw47riMH39SrBm3 GTYw== 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=b6A3P5mAjc99C3XOMrVg6RA3bQK/YWQGC1ZLsd/UtMk=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=Re3l9hS2W8Wz6qm/iKpBoUXq8iOPgAQHF/wE7LKDrqmqS0YMVTeLDXDCvJV02/GR69 JsDg44azTN7EfzG76a8zYpM4ZixXCcH1dS+9smbakMiUaQA0+f7btk62kjYXoCUuvcdL oy7LtnTySYTHRgj+UHfTRXDm5sEv4gRNMWGlhDWCypdCoXoUFuceowirPjTMJvgfwnyW 6KDg2VlCRMXPMX5CpjJ4jTu3b8mIHQqrIOPBt3p4exwhFvNAjxxi5FuyWG0F9QMe33n+ PzSFoZcxSuSiLmSgDvV68tea+SFTENoQa3pteYHfSEb5iIkXag3qcH/XURhFjDZK9D/+ SZAg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qsrNGILj; 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-6e8976cf95asi120376076d6.289.2025.03.04.16.54.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:54:21 -0800 (PST) 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=qsrNGILj; 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 1tpd1B-0002Xk-B0; Tue, 04 Mar 2025 19:53:49 -0500 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 1tpd0o-0002Q8-GF for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:28 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpd0m-0007YB-LV for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:26 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-38f403edb4eso3747175f8f.3 for ; Tue, 04 Mar 2025 16:53:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741136002; x=1741740802; 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=b6A3P5mAjc99C3XOMrVg6RA3bQK/YWQGC1ZLsd/UtMk=; b=qsrNGILjoGFXNGR7uMjKc8RMCBX5SXbc8YZDIVxR1wucxksnAF2Y1tQUc7SnXX5UU4 GxV4pWDjPNPhRCWhHYYqHFfzaUgo0NTjwDitrUdkLvV7GNYwgMDiftwlzNMqZZic03dl XhFECDHmWqCthMygakDqVD4Mr4VBiHYIrKi13zuuTfDuYUWMfN2cojcp7ozQE20mGN7s W5YuahhGRDD1YLvcGEof+duMA9aR8lLAGXpBEvKVSoa3eYGAdV3PuNVLO5UkfLVmQHRO QN5kMUIz4v97hIJog6hKtNpB8h8Re9dNsskpFUl52ClZehWTZMkbTcVN5Z6/Sc2ki0FA 8k2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741136002; x=1741740802; 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=b6A3P5mAjc99C3XOMrVg6RA3bQK/YWQGC1ZLsd/UtMk=; b=ug68RWa5pcR3nfDSQ9jCLkslxhb3lF+uXJzwLihtEhQwTGexhGGxOKY3DaaaHSiA9N bpod9zJJjfJh6fAYmavj1NzNEIymyCPX76+Vd4ZfyqLkXyx1Z3FZkIYAzrRwQrTHcqXQ TAD+zw2FmoX6ZLcuOq4uzXtTW6KymkyaEY6jKqvABEHeyEKL2o5wMe1sXmwS5pnvveAG KcXoF5DOhCcFddwF+FYqEaIu3UAGqXDLj12ou0BgEuYVZIbAa/SH7WFG5NNrzuTcMgwJ M8wdLyfAb1S9YchqW8LYKs7DQrG2pdhvMaoBCgyJn22F5VAVeKwsNLQhZxcKn+ub9Krd rFgw== X-Gm-Message-State: AOJu0YxgZIimYuLBLOK0xjBms8qsd5+o/CClxuz8eLLZ3364mGMqQ0sq MYxSa1iec92GTmcp+ja+uv7VVuD9JPw8fM/agaM4Sm2hYnXnuhF1ExuyuaG/WI/sLDaA/nR/h16 FE+I= X-Gm-Gg: ASbGncv9ATtGBalF88/1ega1KUCpMnaAvWPiR6v1zp+nzxNS0xlwIflSggTJE8o6sM1 KYGfR+ceUHYrE5Z53qcCrbeH5HDnvfT216L4Rx/2NsJ8IxG6ROMgyN4180pXtvZqFAohH+CJQcm eD74DxPUdg+j79DcYDZqkLsjyF1eZfUzTUjUrF8VQYKkVxPi0u9GotLXCzALqg0B5/4rFCO0A5p RSIBSc6GpW9GKvZ9V07huzho76Yo/te/R3K48VTttJHiqV7lKpsuZVDjxRznMqRsh9r1OuS/fxC QrjBIdUEeMRkgAlP2thMfOPlAAL9AlbO44W1pYST9eEwiW/9WPEnRAdu9idqG+qe01a1zfYTKnT wbh/LgXg097eTvmQAmKQ= X-Received: by 2002:a5d:6c65:0:b0:391:d52:d042 with SMTP id ffacd0b85a97d-3911f76ee72mr620459f8f.32.1741136002313; Tue, 04 Mar 2025 16:53:22 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e4844c0dsm18818713f8f.80.2025.03.04.16.53.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:53:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 10/11] qemu: Introduce qemu_arch_name() helper Date: Wed, 5 Mar 2025 01:52:24 +0100 Message-ID: <20250305005225.95051-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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=ham 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 Introduce a generic helper to get the target name of a QemuArchBit. (This will be used for single / heterogeneous binaries). Use it in target_name(), removing the last use of the TARGET_NAME definition. Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/arch_info.h | 2 ++ arch_info-target.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/include/qemu/arch_info.h b/include/qemu/arch_info.h index 613dc2037db..7e3192f590f 100644 --- a/include/qemu/arch_info.h +++ b/include/qemu/arch_info.h @@ -46,6 +46,8 @@ typedef enum QemuArchBit { #define QEMU_ARCH_LOONGARCH BIT(QEMU_ARCH_BIT_LOONGARCH) #define QEMU_ARCH_ALL -1 +const char *qemu_arch_name(QemuArchBit qemu_arch_bit); + const char *target_name(void); bool qemu_arch_available(unsigned qemu_arch_mask); diff --git a/arch_info-target.c b/arch_info-target.c index 61007415b30..9b19fe8d56d 100644 --- a/arch_info-target.c +++ b/arch_info-target.c @@ -24,9 +24,41 @@ #include "qemu/osdep.h" #include "qemu/arch_info.h" +const char *qemu_arch_name(QemuArchBit qemu_arch_bit) +{ + static const char *legacy_target_names[] = { + [QEMU_ARCH_ALPHA] = "alpha", + [QEMU_ARCH_BIT_ARM] = TARGET_LONG_BITS == 32 ? "arm" : "aarch64", + [QEMU_ARCH_BIT_AVR] = "avr", + [QEMU_ARCH_BIT_HEXAGON] = "hexagon", + [QEMU_ARCH_BIT_HPPA] = "hppa", + [QEMU_ARCH_BIT_I386] = TARGET_LONG_BITS == 32 ? "i386" : "x86_64", + [QEMU_ARCH_BIT_LOONGARCH] = "loongarch64", + [QEMU_ARCH_BIT_M68K] = "m68k", + [QEMU_ARCH_BIT_MICROBLAZE] = TARGET_BIG_ENDIAN ? "microblaze" + : "microblazeel", + [QEMU_ARCH_BIT_MIPS] = TARGET_BIG_ENDIAN + ? (TARGET_LONG_BITS == 32 ? "mips" : "mips64") + : (TARGET_LONG_BITS == 32 ? "mipsel" : "mips64el"), + [QEMU_ARCH_BIT_OPENRISC] = "or1k", + [QEMU_ARCH_BIT_PPC] = TARGET_LONG_BITS == 32 ? "ppc" : "ppc64", + [QEMU_ARCH_BIT_RISCV] = TARGET_LONG_BITS == 32 ? "riscv32" : "riscv64", + [QEMU_ARCH_BIT_RX] = "rx", + [QEMU_ARCH_BIT_S390X] = "s390x", + [QEMU_ARCH_BIT_SH4] = TARGET_BIG_ENDIAN ? "sh4eb" : "sh4", + [QEMU_ARCH_BIT_SPARC] = TARGET_LONG_BITS == 32 ? "sparc" : "sparc64", + [QEMU_ARCH_BIT_TRICORE] = "tricore", + [QEMU_ARCH_BIT_XTENSA] = TARGET_BIG_ENDIAN ? "xtensaeb" : "xtensa", + }; + + assert(qemu_arch_bit < ARRAY_SIZE(legacy_target_names)); + assert(legacy_target_names[qemu_arch_bit]); + return legacy_target_names[qemu_arch_bit]; +} + const char *target_name(void) { - return TARGET_NAME; + return qemu_arch_name(QEMU_ARCH_BIT); } bool qemu_arch_available(unsigned qemu_arch_mask) From patchwork Wed Mar 5 00:52:25 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: 870502 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp541123wrg; Tue, 4 Mar 2025 16:54:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX4x5iec62Hgxe3L56c6AZw4tvdz/TSP+Y79f3Weolyl4ARPISfeWGm8xm8j5rMdri/RtR3+g==@linaro.org X-Google-Smtp-Source: AGHT+IGfRR9gKz0FP2XRPFtCh9SMGFOsrFe/sEzxN4x6Fe69HzpVClO7N4zFgAfVuJj4ay9EMd9b X-Received: by 2002:a05:620a:268b:b0:7c0:a594:d788 with SMTP id af79cd13be357-7c3d8ef46a2mr174283585a.39.1741136089755; Tue, 04 Mar 2025 16:54:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136089; cv=none; d=google.com; s=arc-20240605; b=ls38euKwbnnBOFOjrVANQLWDcXhDLuhkMpVwJ0KorFCkLXxciNJvHm5oT9F2f1lOn4 BmdQijjyx6EUJ8e9T4VugDKrN+v9w2ZcAtwnoAzQ4SvTtbNLVyaidB3xt/MDbagH/w8y oXW3bfLikkCyZlTSbwXFcUaz9CretBcm0HxvhpB2bzia1UHhmw/XNMbTYLm2K4phJ/ik OFUh2u5WUhdbJqxJmPmu360vYwBXy4RY71f9Hqx1LGsWudoVrrWIWLmvcpo6+su51tZR GdOsIOIfS9UNxVsD7iZPF9/E4EDcRPI5Ku7QxYJSHrlDy0HeJAnhjbBqsmkwJuVFMfw8 QkOA== 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=SzOKHZRFCe8gSsyMmCbgGLcMBcX5RnVMQQNugexIWns=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=XdCELj89aWK+ZcG4bmGWb1JO/fBqJZFpmSnVZAyqWpEchzCNIxbLMJh2zGr0C//65h IG/gDvphk2PaXq2mTHUJ5pJIqYbPbb9+2Ar4rZyTPsB/nEEpoK8QXLsbdUwKirJpq+e7 6RIU+aMvZVj2ot6B+yRYQmPeFYzR8bKBD8Je72jAKGJDgbgllAL9/d98SHLT/qIS2J17 Gc4wKhicEUcGa4OMzQrSM+UYANktg7OhtuRS14fdWCkubrHIq4g7EG2Szs/nDU3CyXqQ e5UFrhh4pMhP5rkImFMgrrjcMAKFenguEYGRoEhp6eYFSSsigrtb2SoT58GvrwI75Ksp ry+Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZV+JpKfZ; 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-7c3d6560c77si129344285a.284.2025.03.04.16.54.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:54:49 -0800 (PST) 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=ZV+JpKfZ; 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 1tpd1R-00035V-2l; Tue, 04 Mar 2025 19:54:05 -0500 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 1tpd0u-0002UD-5x for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:36 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpd0q-0007YW-Kw for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:30 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-38a8b17d7a7so3682142f8f.2 for ; Tue, 04 Mar 2025 16:53:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741136007; x=1741740807; 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=SzOKHZRFCe8gSsyMmCbgGLcMBcX5RnVMQQNugexIWns=; b=ZV+JpKfZ0Jw5FRV4T4jbnSvF6MZMn7S97k3SUVkqmCzEE8LA2gbyVAlM1xWbSYr1Oh 5hufbHB6NI/1jlAIU2NLc+t/EkFadGMmPNzuZdrDWlRNu2Om7AHbRIORFEKo7awPd/1k YiN4cZvriWcNSUAH6Ez3F6gD03UIwR7HAxaFPW/Hs3lu0h/vZVMdrnCgzHvY3xlVtUNV JKwEpqvXgCKD2deolia1v7MUUFJkupdmTfWt+XF7WWwnN0aNE9OLOZsRcu4/XGDJy1az wqIC0581qPdwpo+MSyiVhcICayzvPqbm8FrO/5xsIzNxrs8Mu7MnEjfjHIYXl4lzGae0 0jsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741136007; x=1741740807; 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=SzOKHZRFCe8gSsyMmCbgGLcMBcX5RnVMQQNugexIWns=; b=kGBJHJOfKpX5LoBXh8Z4uUay36pWw68jsx++mBvRdBcfRq93cEuNo8XFF58UJawBp/ 667bo7y9fVQuHmWXIXiRcvpsEVSRip8EkPMqCarQS0k0MiMkGD1DWR6OcSIDE73JFFRT X8uvYZdu/CNU/wDo/RSGlGjM3gB8dbJsWkIMpsdE060LC0rjKNNU/jSi5JAH/iu+NfQ3 PrM+zlvEbU9HZTGcsR2E8EHdtRqyZLQQpd6/xHBV5+3L78F1CLa0JubckoZJLdp99NCy 3HuVHEEAmy0g0zsZZpc23aKwCHDsiaAYrUjxcKO5ghy85c658/sWRGUbt4CWUxdcG7Uz 4CIA== X-Gm-Message-State: AOJu0Ywqn7rDfFEkA6+CxHOnpatGHW8Sv49sHGg8iApEIq6AqI+7VrI4 3fRG0cXQwss9p5COhcGUkIRpA8TcJl8aZT3/LFYbKHMl2IpBuMus7kqH5d84/Rw5VAjR+X2n0BW l5d4= X-Gm-Gg: ASbGncsHtA837A5/vD//IPpSsBs2wO2lCyGoEWy51cgzXa6iWjJeSq1Q8tVp11oBR8W gIvwOA+ixs6FaWWm3IjrdeaG4TbMswEPalfXYvVtTW+1nNtXZQNBr9lxf2SyaevJXPbVfR1Rs8v nGqj3wfT1r8sywf/n4l5wkzB8QZd2mA1jxKGZTX2eapt8c3Xo/zaBfyy2r2IZMuVOoY9F2bZtJK RSDEIiAjkcE6PBlJV4DVWpOfKAcEz6OkMu6z3lJfekf+qfy54GyUdFO1Aa1JX521xvKlUnIo5Mc FXS1SPvwp/y9qk4uLFLSPJ05UVGOBuP/hLwrK3mtLnQAuZkw7o9BlBeySv/egOQblKgSITcuGPB D30OUreaxQnGlUJTLgQo= X-Received: by 2002:a05:6000:184c:b0:391:2163:dd67 with SMTP id ffacd0b85a97d-3912163dfe0mr147689f8f.6.1741136006937; Tue, 04 Mar 2025 16:53:26 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e4847fe5sm19327264f8f.73.2025.03.04.16.53.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:53:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 11/11] qemu: Remove C definitions of TARGET_NAME Date: Wed, 5 Mar 2025 01:52:25 +0100 Message-ID: <20250305005225.95051-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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=ham 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 We don't use TARGET_NAME anymore, remove and poison it globally. The symbol is still defined in Makefiles by the configure script (it is required by tests/tcg/). Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 4 +++- include/exec/poison.h | 1 - include/qemu/osdep.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 04d8c477644..eaae1da2e92 100644 --- a/meson.build +++ b/meson.build @@ -3347,7 +3347,9 @@ foreach target : target_dirs # Note that TARGET_BASE_ARCH ends up in config-target.h but it is # not used to select files from sourcesets. config_target_data.set('TARGET_' + v.to_upper(), 1) - elif k == 'TARGET_NAME' or k == 'CONFIG_QEMU_INTERP_PREFIX' + elif k == 'TARGET_NAME' + # do nothing + elif k == 'CONFIG_QEMU_INTERP_PREFIX' config_target_data.set_quoted(k, v) elif v == 'y' config_target_data.set(k, 1) diff --git a/include/exec/poison.h b/include/exec/poison.h index f4283f693af..0c4ad04eb97 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -34,7 +34,6 @@ #pragma GCC poison TARGET_XTENSA #pragma GCC poison TARGET_HAS_BFLT -#pragma GCC poison TARGET_NAME #pragma GCC poison TARGET_SUPPORTS_MTTCG #pragma GCC poison TARGET_BIG_ENDIAN #pragma GCC poison BSWAP_NEEDED diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 4397a906807..3167fda68e4 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -50,6 +50,8 @@ */ #pragma GCC poison TARGET_WORDS_BIGENDIAN +#pragma GCC poison TARGET_NAME + #include "qemu/compiler.h" /* Older versions of C++ don't get definitions of various macros from