We already have a file unit outside of the local system' folder which include "system/arch_init.h". We want more files to use it, so make it official it is a generic header by moving it under include. Rename as "qemu/base-arch-defs.h" which is more descriptive.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Message-Id: <[email protected]> --- system/arch_init.h => include/qemu/base-arch-defs.h | 10 ++++++++-- hw/pci/pci.c | 2 +- system/arch_init.c | 2 +- system/qdev-monitor.c | 2 +- system/vl.c | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) rename system/arch_init.h => include/qemu/base-arch-defs.h (92%) diff --git a/system/arch_init.h b/include/qemu/base-arch-defs.h similarity index 92% rename from system/arch_init.h rename to include/qemu/base-arch-defs.h index 0c2b1f3a5d0..f33465738c9 100644 --- a/system/arch_init.h +++ b/include/qemu/base-arch-defs.h @@ -1,5 +1,11 @@ -#ifndef QEMU_ARCH_INIT_H -#define QEMU_ARCH_INIT_H +/* + * QEMU base architecture bit definitions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QEMU_BASE_ARCH_DEFS_H +#define QEMU_BASE_ARCH_DEFS_H #include "qapi/qapi-types-machine.h" diff --git a/hw/pci/pci.c b/hw/pci/pci.c index a0dbb81fd90..4298adf5a0a 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -36,7 +36,7 @@ #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "net/net.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "system/numa.h" #include "system/runstate.h" #include "system/system.h" diff --git a/system/arch_init.c b/system/arch_init.c index 604d5909ed0..1ad2f3d6f78 100644 --- a/system/arch_init.c +++ b/system/arch_init.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "qemu/bitops.h" #include "qemu/target-info-qapi.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index e90eb6247ea..e5b55e3004c 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -23,7 +23,7 @@ #include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "monitor/qdev.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "system/runstate.h" #include "qapi/error.h" #include "qapi/qapi-commands-qdev.h" diff --git a/system/vl.c b/system/vl.c index 516ed7890b4..705f0d3a4a9 100644 --- a/system/vl.c +++ b/system/vl.c @@ -112,7 +112,7 @@ #include "trace/control.h" #include "qemu/plugin.h" #include "qemu/queue.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "system/confidential-guest-support.h" #include "ui/qemu-spice.h" -- 2.53.0
