Signed-off-by: Richard Henderson <[email protected]>
---
include/qemu/target-info-impl.h | 43 -------------------------------
include/qemu/target-info-qom.h | 2 +-
include/qemu/target-info.h | 31 ++++++++++++++++++++++
configs/targets/aarch64-softmmu.c | 2 +-
configs/targets/arm-softmmu.c | 2 +-
page-vary-common.c | 2 +-
page-vary-system.c | 2 +-
target-info-qom.c | 2 +-
target-info-stub.c | 1 -
target-info.c | 1 -
10 files changed, 37 insertions(+), 51 deletions(-)
delete mode 100644 include/qemu/target-info-impl.h
diff --git a/include/qemu/target-info-impl.h b/include/qemu/target-info-impl.h
deleted file mode 100644
index df94af4ef3..0000000000
--- a/include/qemu/target-info-impl.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * QEMU TargetInfo structure definition
- *
- * Copyright (c) Linaro
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#ifndef QEMU_TARGET_INFO_IMPL_H
-#define QEMU_TARGET_INFO_IMPL_H
-
-#include "qapi/qapi-types-common.h"
-#include "qapi/qapi-types-machine.h"
-
-typedef struct TargetInfo {
- /* runtime equivalent of TARGET_NAME definition */
- const char *target_name;
- /* related to TARGET_ARCH definition */
- SysEmuTarget target_arch;
- /* runtime equivalent of TARGET_LONG_BITS definition */
- unsigned long_bits;
- /* runtime equivalent of CPU_RESOLVING_TYPE definition */
- const char *cpu_type;
- /* QOM typename machines for this binary must implement */
- const char *machine_typename;
- /* related to TARGET_BIG_ENDIAN definition */
- EndianMode endianness;
- /*
- * runtime equivalent of
- * TARGET_PAGE_BITS_VARY ? TARGET_PAGE_BITS_LEGACY : TARGET_PAGE_BITS
- */
- unsigned page_bits_init;
- /* runtime equivalent of TARGET_PAGE_BITS_VARY definition */
- bool page_bits_vary;
-} TargetInfo;
-
-extern
-#ifndef NONCONST_TARGET_INFO
-const
-#endif
-TargetInfo target_info;
-
-#endif
diff --git a/include/qemu/target-info-qom.h b/include/qemu/target-info-qom.h
index 91be415ed3..fedb1a2914 100644
--- a/include/qemu/target-info-qom.h
+++ b/include/qemu/target-info-qom.h
@@ -9,7 +9,7 @@
#ifndef QEMU_TARGET_INFO_QOM_H
#define QEMU_TARGET_INFO_QOM_H
-#include "qemu/target-info-impl.h"
+#include "qemu/target-info.h"
#include "qom/object.h"
#define TYPE_TARGET_INFO "target-info"
diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h
index 23c997de54..c9f7f2aa26 100644
--- a/include/qemu/target-info.h
+++ b/include/qemu/target-info.h
@@ -9,6 +9,37 @@
#ifndef QEMU_TARGET_INFO_H
#define QEMU_TARGET_INFO_H
+#include "qapi/qapi-types-common.h"
+#include "qapi/qapi-types-machine.h"
+
+typedef struct TargetInfo {
+ /* runtime equivalent of TARGET_NAME definition */
+ const char *target_name;
+ /* related to TARGET_ARCH definition */
+ SysEmuTarget target_arch;
+ /* runtime equivalent of TARGET_LONG_BITS definition */
+ unsigned long_bits;
+ /* runtime equivalent of CPU_RESOLVING_TYPE definition */
+ const char *cpu_type;
+ /* QOM typename machines for this binary must implement */
+ const char *machine_typename;
+ /* related to TARGET_BIG_ENDIAN definition */
+ EndianMode endianness;
+ /*
+ * runtime equivalent of
+ * TARGET_PAGE_BITS_VARY ? TARGET_PAGE_BITS_LEGACY : TARGET_PAGE_BITS
+ */
+ unsigned page_bits_init;
+ /* runtime equivalent of TARGET_PAGE_BITS_VARY definition */
+ bool page_bits_vary;
+} TargetInfo;
+
+extern
+#ifndef NONCONST_TARGET_INFO
+const
+#endif
+TargetInfo target_info;
+
/**
* target_name:
*
diff --git a/configs/targets/aarch64-softmmu.c
b/configs/targets/aarch64-softmmu.c
index 4f43f3e89a..f0631353ee 100644
--- a/configs/targets/aarch64-softmmu.c
+++ b/configs/targets/aarch64-softmmu.c
@@ -10,7 +10,7 @@
#include "hw/arm/machines-qom.h"
#include "target/arm/cpu-qom.h"
#include "target/arm/cpu-param.h"
-#include "qemu/target-info-impl.h"
+#include "qemu/target-info.h"
#include "qemu/target-info-init.h"
DEF_TARGET_INFO(target_info_aarch64_system,
diff --git a/configs/targets/arm-softmmu.c b/configs/targets/arm-softmmu.c
index 8272ce58fd..606b42befa 100644
--- a/configs/targets/arm-softmmu.c
+++ b/configs/targets/arm-softmmu.c
@@ -10,7 +10,7 @@
#include "hw/arm/machines-qom.h"
#include "target/arm/cpu-qom.h"
#include "target/arm/cpu-param.h"
-#include "qemu/target-info-impl.h"
+#include "qemu/target-info.h"
#include "qemu/target-info-init.h"
DEF_TARGET_INFO(target_info_arm_system,
diff --git a/page-vary-common.c b/page-vary-common.c
index b4e8cdf405..ec07b91d96 100644
--- a/page-vary-common.c
+++ b/page-vary-common.c
@@ -20,7 +20,7 @@
#define IN_PAGE_VARY 1
#include "qemu/osdep.h"
-#include "qemu/target-info-impl.h"
+#include "qemu/target-info.h"
#include "exec/page-vary.h"
/* WARNING: This file must *not* be complied with -flto. */
diff --git a/page-vary-system.c b/page-vary-system.c
index b2a1c45deb..ccc242b498 100644
--- a/page-vary-system.c
+++ b/page-vary-system.c
@@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "exec/page-vary.h"
#include "exec/tlb-flags.h"
-#include "qemu/target-info-impl.h"
+#include "qemu/target-info.h"
QEMU_BUILD_BUG_ON(TLB_FLAGS_MASK & ((1u < TARGET_PAGE_BITS_MIN) - 1));
diff --git a/target-info-qom.c b/target-info-qom.c
index abaf7507a0..f7a03d78d4 100644
--- a/target-info-qom.c
+++ b/target-info-qom.c
@@ -11,7 +11,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qom/object.h"
-#include "qemu/target-info-impl.h"
+#include "qemu/target-info.h"
#include "qemu/target-info-init.h"
#include "qemu/target-info-qom.h"
#include "hw/arm/machines-qom.h"
diff --git a/target-info-stub.c b/target-info-stub.c
index 813d562058..edd4b78aa2 100644
--- a/target-info-stub.c
+++ b/target-info-stub.c
@@ -12,7 +12,6 @@
#include "exec/cpu-defs.h"
#include "exec/page-vary.h"
#include "qemu/target-info.h"
-#include "qemu/target-info-impl.h"
#include "qemu/target-info-init.h"
/* Validate correct placement of CPUArchState. */
diff --git a/target-info.c b/target-info.c
index 6bd3f9485f..3679e3ddd6 100644
--- a/target-info.c
+++ b/target-info.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qemu/target-info.h"
#include "qemu/target-info-qapi.h"
-#include "qemu/target-info-impl.h"
#include "qapi/error.h"
const char *target_name(void)
--
2.43.0
