[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 41/75] target/ppc: Move powerpc_input_t definition to 'cpu.h'
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 41/75] target/ppc: Move powerpc_input_t definition to 'cpu.h' |
Date: |
Tue, 7 Nov 2023 13:24:31 +0100 |
The powerpc_input_t definition is only used by target/ppc/, no need
to expose it. Restrict it by moving it to "target/ppc/cpu.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20231013125630.95116-8-philmd@linaro.org>
---
target/ppc/cpu-qom.h | 21 ---------------------
target/ppc/cpu.h | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h
index c35374e15f..0241609efe 100644
--- a/target/ppc/cpu-qom.h
+++ b/target/ppc/cpu-qom.h
@@ -35,27 +35,6 @@ OBJECT_DECLARE_CPU_TYPE(PowerPCCPU, PowerPCCPUClass,
POWERPC_CPU)
#define TYPE_HOST_POWERPC_CPU POWERPC_CPU_TYPE_NAME("host")
-/*****************************************************************************/
-/* Input pins model */
-typedef enum powerpc_input_t powerpc_input_t;
-enum powerpc_input_t {
- PPC_FLAGS_INPUT_UNKNOWN = 0,
- /* PowerPC 6xx bus */
- PPC_FLAGS_INPUT_6xx,
- /* BookE bus */
- PPC_FLAGS_INPUT_BookE,
- /* PowerPC 405 bus */
- PPC_FLAGS_INPUT_405,
- /* PowerPC 970 bus */
- PPC_FLAGS_INPUT_970,
- /* PowerPC POWER7 bus */
- PPC_FLAGS_INPUT_POWER7,
- /* PowerPC POWER9 bus */
- PPC_FLAGS_INPUT_POWER9,
- /* Freescale RCPU bus */
- PPC_FLAGS_INPUT_RCPU,
-};
-
#ifndef CONFIG_USER_ONLY
typedef struct PPCTimebase {
uint64_t guest_timebase;
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index d859c45a2e..f8101ffa29 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -261,6 +261,26 @@ static inline bool mmu_is_64bit(powerpc_mmu_t mmu_model)
return mmu_model & POWERPC_MMU_64;
}
+/*****************************************************************************/
+/* Input pins model */
+typedef enum powerpc_input_t {
+ PPC_FLAGS_INPUT_UNKNOWN = 0,
+ /* PowerPC 6xx bus */
+ PPC_FLAGS_INPUT_6xx,
+ /* BookE bus */
+ PPC_FLAGS_INPUT_BookE,
+ /* PowerPC 405 bus */
+ PPC_FLAGS_INPUT_405,
+ /* PowerPC 970 bus */
+ PPC_FLAGS_INPUT_970,
+ /* PowerPC POWER7 bus */
+ PPC_FLAGS_INPUT_POWER7,
+ /* PowerPC POWER9 bus */
+ PPC_FLAGS_INPUT_POWER9,
+ /* Freescale RCPU bus */
+ PPC_FLAGS_INPUT_RCPU,
+} powerpc_input_t;
+
#define PPC_INPUT(env) ((env)->bus_model)
/*****************************************************************************/
--
2.41.0
- [PULL 00/75] Misc HW/UI patches for 2023-11-07, Philippe Mathieu-Daudé, 2023/11/07
- [PULL 37/75] target/ppc: Move ppc_cpu_class_by_name() declaration to 'cpu.h', Philippe Mathieu-Daudé, 2023/11/07
- [PULL 36/75] target/ppc: Define powerpc_pm_insn_t in 'internal.h', Philippe Mathieu-Daudé, 2023/11/07
- [PULL 38/75] target/ppc: Move PowerPCCPUClass definition to 'cpu.h', Philippe Mathieu-Daudé, 2023/11/07
- [PULL 40/75] target/ppc: Move powerpc_mmu_t definition to 'cpu.h', Philippe Mathieu-Daudé, 2023/11/07
- [PULL 39/75] target/ppc: Move powerpc_excp_t definition to 'cpu.h', Philippe Mathieu-Daudé, 2023/11/07
- [PULL 41/75] target/ppc: Move powerpc_input_t definition to 'cpu.h',
Philippe Mathieu-Daudé <=
- [PULL 45/75] target/s390x/cpu: Restrict CPUS390XState declaration to 'cpu.h', Philippe Mathieu-Daudé, 2023/11/07
- [PULL 43/75] hw/s390x/sclp: Have sclp_service_call[_protected]() take S390CPU*, Philippe Mathieu-Daudé, 2023/11/07
- [PULL 42/75] hw/s390x/css: Have css_do_sic() take S390CPU instead of CPUS390XState, Philippe Mathieu-Daudé, 2023/11/07
- [PULL 44/75] target/s390x/cpu: Restrict cpu_get_tb_cpu_state() definition to TCG, Philippe Mathieu-Daudé, 2023/11/07
- [PULL 51/75] hw/cpu: Clean up global variable shadowing, Philippe Mathieu-Daudé, 2023/11/07
- [PULL 47/75] target: Move ArchCPUClass definition to 'cpu.h', Philippe Mathieu-Daudé, 2023/11/07
- [PULL 72/75] MAINTAINERS: Add include/hw/xtensa/mx_pic.h to the XTFPGA machine section, Philippe Mathieu-Daudé, 2023/11/07
- [PULL 68/75] hw/sd: Declare QOM types using DEFINE_TYPES() macro, Philippe Mathieu-Daudé, 2023/11/07
- [PULL 73/75] MAINTAINERS: Add more guest-agent related files to the corresponding section, Philippe Mathieu-Daudé, 2023/11/07
- [PULL 75/75] dump: Add close fd on error return to avoid resource leak, Philippe Mathieu-Daudé, 2023/11/07