In preparation for moving some of the qemu-version.sh logic to meson and the preprocessor, create a wrapper header for the generated qemu-version.h.
Signed-off-by: Paolo Bonzini <[email protected]> --- include/qemu/version.h | 12 ++++++++++++ bsd-user/main.c | 2 +- linux-user/main.c | 2 +- monitor/qmp-cmds-control.c | 2 +- qemu-img.c | 2 +- qemu-io.c | 2 +- qemu-nbd.c | 2 +- qga/main.c | 2 +- scsi/qemu-pr-helper.c | 2 +- storage-daemon/qemu-storage-daemon.c | 2 +- system/vl.c | 2 +- tools/i386/qemu-vmsr-helper.c | 3 +-- tools/qemu-vnc/qemu-vnc.c | 2 +- util/module.c | 2 +- 14 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 include/qemu/version.h diff --git a/include/qemu/version.h b/include/qemu/version.h new file mode 100644 index 00000000000..38405495c0e --- /dev/null +++ b/include/qemu/version.h @@ -0,0 +1,12 @@ +/* + * QEMU version strings + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QEMU_VERSION_H +#define QEMU_VERSION_H + +#include "qemu-version.h" + +#endif diff --git a/bsd-user/main.c b/bsd-user/main.c index 29ee59de2cf..6720dbde6f8 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -25,7 +25,7 @@ #include "qemu/help-texts.h" #include "qemu/units.h" #include "qemu/accel.h" -#include "qemu-version.h" +#include "qemu/version.h" #include <machine/trap.h> #include "qapi/error.h" diff --git a/linux-user/main.c b/linux-user/main.c index 60a695b7ca3..2f0c0a50c8a 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -21,7 +21,7 @@ #include "qemu/help-texts.h" #include "qemu/units.h" #include "qemu/accel.h" -#include "qemu-version.h" +#include "qemu/version.h" #include <sys/syscall.h> #include <sys/resource.h> #include <sys/shm.h> diff --git a/monitor/qmp-cmds-control.c b/monitor/qmp-cmds-control.c index 8fe0876a3da..bc938712f3d 100644 --- a/monitor/qmp-cmds-control.c +++ b/monitor/qmp-cmds-control.c @@ -25,7 +25,7 @@ #include "qemu/osdep.h" #include "monitor-internal.h" -#include "qemu-version.h" +#include "qemu/version.h" #include "qapi/compat-policy.h" #include "qapi/error.h" #include "qapi/qapi-commands-control.h" diff --git a/qemu-img.c b/qemu-img.c index edf75e43aba..766d8540bfe 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -27,7 +27,7 @@ #include "qemu/help-texts.h" #include "qemu/qemu-progress.h" -#include "qemu-version.h" +#include "qemu/version.h" #include "qapi/error.h" #include "qapi/qapi-commands-block-core.h" #include "qapi/qapi-visit-block-core.h" diff --git a/qemu-io.c b/qemu-io.c index 598d5b1c9ca..b5f2ae631a4 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -34,7 +34,7 @@ #include "block/block_int.h" #include "trace/control.h" #include "crypto/init.h" -#include "qemu-version.h" +#include "qemu/version.h" #define CMD_NOFILE_OK 0x01 diff --git a/qemu-nbd.c b/qemu-nbd.c index fcca88932a3..a9c75bffa9c 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -45,7 +45,7 @@ #include "crypto/init.h" #include "crypto/tlscreds.h" #include "trace/control.h" -#include "qemu-version.h" +#include "qemu/version.h" #ifdef CONFIG_SELINUX #include <selinux/selinux.h> diff --git a/qga/main.c b/qga/main.c index fd19c7037db..06358cb213c 100644 --- a/qga/main.c +++ b/qga/main.c @@ -30,7 +30,7 @@ #include "qemu/help_option.h" #include "qemu/sockets.h" #include "qemu/systemd.h" -#include "qemu-version.h" +#include "qemu/version.h" #ifdef _WIN32 #include <windows.h> #include <objbase.h> diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c index 54d196a503f..5f4e7ab4b79 100644 --- a/scsi/qemu-pr-helper.c +++ b/scsi/qemu-pr-helper.c @@ -50,7 +50,7 @@ #include "qobject/qstring.h" #include "io/channel-socket.h" #include "trace/control.h" -#include "qemu-version.h" +#include "qemu/version.h" #include "block/thread-pool.h" diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c index 50dbfbd97ae..b2e29f00054 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -43,7 +43,7 @@ #include "qapi/qobject-input-visitor.h" #include "qemu/help-texts.h" -#include "qemu-version.h" +#include "qemu/version.h" #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/error-report.h" diff --git a/system/vl.c b/system/vl.c index fbe580746d3..22f07d4753e 100644 --- a/system/vl.c +++ b/system/vl.c @@ -37,7 +37,7 @@ #include "qobject/qdict.h" #include "qobject/qstring.h" #include "qobject/qjson.h" -#include "qemu-version.h" +#include "qemu/version.h" #include "qemu/cutils.h" #include "qemu/help_option.h" #include "qemu/hw-version.h" diff --git a/tools/i386/qemu-vmsr-helper.c b/tools/i386/qemu-vmsr-helper.c index f12fd3c3e81..fac7fbe6b61 100644 --- a/tools/i386/qemu-vmsr-helper.c +++ b/tools/i386/qemu-vmsr-helper.c @@ -34,7 +34,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "qemu/config-file.h" -#include "qemu-version.h" +#include "qemu/version.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" @@ -42,7 +42,6 @@ #include "io/channel.h" #include "io/channel-socket.h" #include "trace/control.h" -#include "qemu-version.h" #include "rapl-msr-index.h" #define MSR_PATH_TEMPLATE "/dev/cpu/%u/msr" diff --git a/tools/qemu-vnc/qemu-vnc.c b/tools/qemu-vnc/qemu-vnc.c index 5c2ba3b7a56..2b7cac34fab 100644 --- a/tools/qemu-vnc/qemu-vnc.c +++ b/tools/qemu-vnc/qemu-vnc.c @@ -15,7 +15,7 @@ #include "qemu/option.h" #include "qemu/log.h" #include "qemu/main-loop.h" -#include "qemu-version.h" +#include "qemu/version.h" #include "ui/vnc.h" #include "crypto/secret.h" #include "crypto/tlscredsx509.h" diff --git a/util/module.c b/util/module.c index 8f8e6994f11..6de9ff2e411 100644 --- a/util/module.c +++ b/util/module.c @@ -23,7 +23,7 @@ #include "qemu/config-file.h" #include "qapi/error.h" #ifdef CONFIG_MODULE_UPGRADES -#include "qemu-version.h" +#include "qemu/version.h" #endif #include "trace.h" -- 2.56.0
