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é <phi...@linaro.org>
---
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',
--
2.47.1
