[PATCH 4/5] target-info: Merge target-info-qapi.h into target-info.h

[Richard Henderson]

Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
 include/qemu/target-info-qapi.h | 29 -----------------------------
 include/qemu/target-info.h      | 14 ++++++++++++++
 hw/core/machine-qmp-cmds.c      |  1 -
 hw/uefi/ovmf-log.c              |  2 +-
 hw/virtio/virtio-mem.c          |  2 +-
 system/arch_init.c              |  2 +-
 target-info.c                   |  1 -
 7 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 include/qemu/target-info-qapi.h

diff --git a/include/qemu/target-info-qapi.h b/include/qemu/target-info-qapi.h
deleted file mode 100644
index d5ce052323..0000000000
--- a/include/qemu/target-info-qapi.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * QEMU target info API (returning QAPI types)
- *
- *  Copyright (c) Linaro
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#ifndef QEMU_TARGET_INFO_EXTRA_H
-#define QEMU_TARGET_INFO_EXTRA_H
-
-#include "qapi/qapi-types-common.h"
-#include "qapi/qapi-types-machine.h"
-
-/**
- * target_arch:
- *
- * Returns: QAPI SysEmuTarget enum (e.g. SYS_EMU_TARGET_X86_64).
- */
-SysEmuTarget target_arch(void);
-
-/**
- * target_endian_mode:
- *
- * Returns: QAPI EndianMode enum (e.g. ENDIAN_MODE_LITTLE).
- */
-EndianMode target_endian_mode(void);
-
-#endif
diff --git a/include/qemu/target-info.h b/include/qemu/target-info.h
index c9f7f2aa26..d8d2194d9b 100644
--- a/include/qemu/target-info.h
+++ b/include/qemu/target-info.h
@@ -69,6 +69,13 @@ const char *target_machine_typename(void);
  */
 const char *target_cpu_type(void);
 
+/**
+ * target_endian_mode:
+ *
+ * Returns: QAPI EndianMode enum (e.g. ENDIAN_MODE_LITTLE).
+ */
+EndianMode target_endian_mode(void);
+
 /**
  * target_big_endian:
  *
@@ -81,6 +88,13 @@ const char *target_cpu_type(void);
  */
 bool target_big_endian(void);
 
+/**
+ * target_arch:
+ *
+ * Returns: QAPI SysEmuTarget enum (e.g. SYS_EMU_TARGET_X86_64).
+ */
+SysEmuTarget target_arch(void);
+
 /**
  * target_base_arm:
  *
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index e62cb4ec88..3583a60ee8 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -21,7 +21,6 @@
 #include "qapi/type-helpers.h"
 #include "qemu/uuid.h"
 #include "qemu/target-info.h"
-#include "qemu/target-info-qapi.h"
 #include "qom/qom-qobject.h"
 #include "system/hostmem.h"
 #include "system/hw_accel.h"
diff --git a/hw/uefi/ovmf-log.c b/hw/uefi/ovmf-log.c
index 3a24afd941..ed351149f1 100644
--- a/hw/uefi/ovmf-log.c
+++ b/hw/uefi/ovmf-log.c
@@ -8,7 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "qemu/target-info-qapi.h"
+#include "qemu/target-info.h"
 #include "hw/core/boards.h"
 #include "hw/i386/x86.h"
 #include "hw/arm/virt.h"
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index a4b71974a1..3d285eaf60 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -15,7 +15,7 @@
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qemu/units.h"
-#include "qemu/target-info-qapi.h"
+#include "qemu/target-info.h"
 #include "system/numa.h"
 #include "system/system.h"
 #include "system/ramblock.h"
diff --git a/system/arch_init.c b/system/arch_init.c
index 1ad2f3d6f7..6fa5ae2160 100644
--- a/system/arch_init.c
+++ b/system/arch_init.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qemu/base-arch-defs.h"
 #include "qemu/bitops.h"
-#include "qemu/target-info-qapi.h"
+#include "qemu/target-info.h"
 
 bool qemu_arch_available(uint32_t arch_bitmask)
 {
diff --git a/target-info.c b/target-info.c
index 3679e3ddd6..f02a033584 100644
--- a/target-info.c
+++ b/target-info.c
@@ -8,7 +8,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/target-info.h"
-#include "qemu/target-info-qapi.h"
 #include "qapi/error.h"
 
 const char *target_name(void)
-- 
2.43.0