From patchwork Tue Jun 27 11:51:21 2023 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: 696839 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp3724777wrm; Tue, 27 Jun 2023 04:53:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7EJ1KHaRk7OfQm9DAJuTRUa8R8N7HzFDrtcdtOibr5x1eaV6g0hWObN0FDvL9/A0D0b7TZ X-Received: by 2002:a05:620a:2409:b0:765:5ba6:a5c0 with SMTP id d9-20020a05620a240900b007655ba6a5c0mr7710900qkn.14.1687866797067; Tue, 27 Jun 2023 04:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687866797; cv=none; d=google.com; s=arc-20160816; b=l58ju6WaUp4Neu+g9mp6wBAvd8MbPYZb2NZQwHdnxD2fz2nbNGvyNUnLNVm5OhOudw hSrcB/syHawFbnTGaKXMNEmTgZ0MK0IjziiGNip/W6cTlX0ZneL0Valz5wBInnHIdtxr RCN0liGgN36LjYdQ9gLnGwZAf8Vp8KEVU8seXpqAKckyVwThlfOQl/cCl3OeH7MM2iIO PLaTYhqYqZFz7b4/nsMdVo4qmIOuZlHesPhZrEL9tl79/iFW7rlOG/Ctyr9bu80FypsP SbxneGKcC5LIOsA+Uo/WAon3/Nwuh8k3vFVr0/nAXFrNQeNlYJSdDRMXDaqQqWb0QXN8 tX9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=wwRqncGBMw48ZRHZQQygcwpEXInzVqgYCZMTOEm7gro=; fh=HTfWIrJzOLTRsca7VdqVkZSV2mA14Yhlo/G1nQOSMq0=; b=PQkV+vPCPvgRPj+JAvCQ44dNUsExJbOpAPpGFmo3oNQnOhpDR8unGqJ5bGuzR2hcMo j81Q2SJOKLPO+417//GiCyBZm6Rjz4FBv4Y7Pp3p0FDkien/VOvXnc2fpC0+dTnY+teQ tYMmRmRnPA3VcT3u1eP1L2mEI6ZeNTze1SMOhoVrbVNRqpTvLUnC0KKG196fGW8SaZR7 JY3WhkfW0I1IJIR5FXone0+GnGBILt9RTorUNLKHbXs4fpC0oFHxncGazfOmg4u+IJuv kU4uM8qwLVn/SdNJKf0ZnUiC/V+27SX4qyKzv3mfKs6YcQ+91MEz9VBqJrU8IKNegre3 goLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mnixBROM; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l14-20020a05620a28ce00b0076098a19221si375217qkp.356.2023.06.27.04.53.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 27 Jun 2023 04:53:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mnixBROM; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qE7Ef-0001up-4p; Tue, 27 Jun 2023 07:51:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE7Ea-0001tw-Mz for qemu-devel@nongnu.org; Tue, 27 Jun 2023 07:51:48 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qE7EZ-0004kQ-66 for qemu-devel@nongnu.org; Tue, 27 Jun 2023 07:51:48 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-986d8332f50so561017766b.0 for ; Tue, 27 Jun 2023 04:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687866705; x=1690458705; 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=wwRqncGBMw48ZRHZQQygcwpEXInzVqgYCZMTOEm7gro=; b=mnixBROMk4W/E5oZOyhcDKzrHtFUiMXo/SHSOVZCdjVa4W+QHAk1YP6JN0WdriXCRg 7kgoxdRSdpXiXm9/tuZtgVuUAVG4ULDZsoY7BNnEAtsId8Zrgl3kiwhYh8lszegl3BbK eboQUwrTSJ19pIAC5BvplUdAQ5sUlzxk+8+17nFe/f8c02iQ5HztThoAHTWuKxBxryTN vQz3qYE32MLVfAyKfOuC1Jf5fuf2ID3FOaFQZuzkK/hinGVcshX/IMsG6Y03ITu8CKRp tLJv9jBxZg9m/AMaSr9x1W1DFD3qMA1U+SUcDCepP90EDHA7/670RNlWEjyMxhvaXW6J bCDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687866705; x=1690458705; 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=wwRqncGBMw48ZRHZQQygcwpEXInzVqgYCZMTOEm7gro=; b=CT1Z6ZdiqxVsY8ax7EfjPMPXKb2lDH31ImAroP7FI2yM6UbBm4gMl8/h3+pHZVXc1Y hnv+SPhdFXY3N2CqsTmuddBhdsYYFoeBu+thBkFePcOGagUEWVGUj6N51hCHfoEiZUAx 9uu9DMtdYKUGUInsG4HEknHD6OM/kaZpkcfJeBuW6C0N8qTFGNQv2FnFOdKwcDdYvpgQ 8iJ4pMzokj7gHgxyg/52dDtTnHPrSgpVmr5fYuqF/sLj6r4jGzJ3AkkwZTUzhjn1Ko2a sA/aSXUQvvUKL1VG5GcWDbFgZNQL79x9+/OQ5jLh/aN9+d5goWUrezPjFynoXfjFY5ov Kucg== X-Gm-Message-State: AC+VfDyMgv7hGZbZdhAHhiXTvhVB67lP06i5OEgLy8Uf4o/dn1KVj5d0 xtMN1MYFMslkDYPgJVZACpY5UFYxfZQtILkhVL4= X-Received: by 2002:a17:906:6a04:b0:988:a837:327a with SMTP id qw4-20020a1709066a0400b00988a837327amr22018537ejc.44.1687866705562; Tue, 27 Jun 2023 04:51:45 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.204]) by smtp.gmail.com with ESMTPSA id h14-20020a17090634ce00b0098238141deasm4478624ejb.90.2023.06.27.04.51.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 27 Jun 2023 04:51:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: David Gibson , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , qemu-ppc@nongnu.org, Paolo Bonzini , Greg Kurz , kvm@vger.kernel.org, Nicholas Piggin , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/6] target/ppc: Move CPU QOM definitions to cpu-qom.h Date: Tue, 27 Jun 2023 13:51:21 +0200 Message-Id: <20230627115124.19632-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230627115124.19632-1-philmd@linaro.org> References: <20230627115124.19632-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=philmd@linaro.org; helo=mail-ej1-x62c.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater --- target/ppc/cpu-qom.h | 5 +++++ target/ppc/cpu.h | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 9666f54f65..c2bff349cc 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -31,6 +31,11 @@ OBJECT_DECLARE_CPU_TYPE(PowerPCCPU, PowerPCCPUClass, POWERPC_CPU) +#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU +#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU +#define cpu_list ppc_cpu_list + ObjectClass *ppc_cpu_class_by_name(const char *name); typedef struct CPUArchState CPUPPCState; diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index af12c93ebc..e91e1774e5 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1468,12 +1468,6 @@ static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn) int ppc_dcr_read(ppc_dcr_t *dcr_env, int dcrn, uint32_t *valp); int ppc_dcr_write(ppc_dcr_t *dcr_env, int dcrn, uint32_t val); -#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU -#define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX -#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU - -#define cpu_list ppc_cpu_list - /* MMU modes definitions */ #define MMU_USER_IDX 0 static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch)