* [PATCH 01/32] meson: use chardev_ss dependencies
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 02/32] meson: add util dependency for oslib-posix on freebsd marcandre.lureau
` (31 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
chardev subsystem/library doesn't use gnutls. Use the dedicated
chardev_ss.dependencies() instead.
Looking at history, it was added in commit 3eacf70bb5a83e ("meson:
Propagate gnutls dependency") because crypto/tlscreds.h included
GnuTLS. This was cleaned-up later by commit 678bcc3c2cf222 ("crypto:
Make QCryptoTLSCreds* structures private").
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index aef724ad3c0e..dc17d37e461b 100644
--- a/meson.build
+++ b/meson.build
@@ -3091,7 +3091,7 @@ qmp = declare_dependency(link_whole: [libqmp])
libchardev = static_library('chardev', chardev_ss.sources() + genh,
name_suffix: 'fa',
- dependencies: [gnutls],
+ dependencies: chardev_ss.dependencies(),
build_by_default: false)
chardev = declare_dependency(link_whole: libchardev)
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 02/32] meson: add util dependency for oslib-posix on freebsd
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
2022-03-23 15:57 ` [PATCH 01/32] meson: use chardev_ss dependencies marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 03/32] meson: remove unneeded py3 marcandre.lureau
` (30 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
kinfo_getproc() requires it.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
util/meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/util/meson.build b/util/meson.build
index f6ee74ad0c85..bb0b010662d7 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -11,7 +11,11 @@ util_ss.add(when: linux_io_uring, if_true: files('fdmon-io_uring.c'))
util_ss.add(when: 'CONFIG_POSIX', if_true: files('compatfd.c'))
util_ss.add(when: 'CONFIG_POSIX', if_true: files('event_notifier-posix.c'))
util_ss.add(when: 'CONFIG_POSIX', if_true: files('mmap-alloc.c'))
-util_ss.add(when: 'CONFIG_POSIX', if_true: files('oslib-posix.c'))
+freebsd_dep = []
+if targetos == 'freebsd'
+ freebsd_dep = util
+endif
+util_ss.add(when: 'CONFIG_POSIX', if_true: [files('oslib-posix.c'), freebsd_dep])
util_ss.add(when: 'CONFIG_POSIX', if_true: [files('qemu-openpty.c'), util])
util_ss.add(when: 'CONFIG_POSIX', if_true: files('qemu-thread-posix.c'))
util_ss.add(when: 'CONFIG_POSIX', if_true: files('memfd.c'))
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 03/32] meson: remove unneeded py3
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
2022-03-23 15:57 ` [PATCH 01/32] meson: use chardev_ss dependencies marcandre.lureau
2022-03-23 15:57 ` [PATCH 02/32] meson: add util dependency for oslib-posix on freebsd marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 04/32] meson: remove test-qdev-global-props dependency on testqapi marcandre.lureau
` (29 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/tests/meson.build b/tests/meson.build
index 1d05109eb43c..4f691e84655a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,5 +1,3 @@
-py3 = import('python').find_installation()
-
subdir('bench')
subdir('qemu-iotests')
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 04/32] meson: remove test-qdev-global-props dependency on testqapi
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (2 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 03/32] meson: remove unneeded py3 marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 05/32] char: move qemu_openpty_raw from util/ to char/ marcandre.lureau
` (28 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/unit/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index 96b295263ea9..026e39f52025 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -148,7 +148,7 @@ if have_system
endif
tests += {
- 'test-qdev-global-props': [qom, hwcore, testqapi]
+ 'test-qdev-global-props': [qom, hwcore]
}
endif
endif
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 05/32] char: move qemu_openpty_raw from util/ to char/
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (3 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 04/32] meson: remove test-qdev-global-props dependency on testqapi marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` marcandre.lureau
` (27 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Paolo Bonzini
From: Marc-André Lureau <marcandre.lureau@redhat.com>
It is only needed by char-pty.
Fix the code style while at it.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 2 -
chardev/char-pty.c | 111 +++++++++++++++++++++++++++++++++
util/qemu-openpty.c | 139 ------------------------------------------
chardev/meson.build | 4 +-
util/meson.build | 1 -
5 files changed, 113 insertions(+), 144 deletions(-)
delete mode 100644 util/qemu-openpty.c
diff --git a/include/qemu-common.h b/include/qemu-common.h
index f0fe07cd74c3..f9b3f85b8124 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -31,8 +31,6 @@ ssize_t qemu_write_full(int fd, const void *buf, size_t count)
#ifndef _WIN32
int qemu_pipe(int pipefd[2]);
-/* like openpty() but also makes it raw; return master fd */
-int qemu_openpty_raw(int *aslave, char *pty_name);
#endif
void cpu_exec_init_all(void);
diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index a2d1e7c985bc..d73d8b23903d 100644
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -197,6 +197,117 @@ static void char_pty_finalize(Object *obj)
qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
}
+#if defined HAVE_PTY_H
+# include <pty.h>
+#elif defined CONFIG_BSD
+# include <termios.h>
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+# include <libutil.h>
+# else
+# include <util.h>
+# endif
+#elif defined CONFIG_SOLARIS
+# include <termios.h>
+# include <stropts.h>
+#else
+# include <termios.h>
+#endif
+
+#ifdef __sun__
+
+#if !defined(HAVE_OPENPTY)
+/* Once illumos has openpty(), this is going to be removed. */
+static int openpty(int *amaster, int *aslave, char *name,
+ struct termios *termp, struct winsize *winp)
+{
+ const char *slave;
+ int mfd = -1, sfd = -1;
+
+ *amaster = *aslave = -1;
+
+ mfd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
+ if (mfd < 0) {
+ goto err;
+ }
+
+ if (grantpt(mfd) == -1 || unlockpt(mfd) == -1) {
+ goto err;
+ }
+
+ if ((slave = ptsname(mfd)) == NULL) {
+ goto err;
+ }
+
+ if ((sfd = open(slave, O_RDONLY | O_NOCTTY)) == -1) {
+ goto err;
+ }
+
+ if (ioctl(sfd, I_PUSH, "ptem") == -1 ||
+ (termp != NULL && tcgetattr(sfd, termp) < 0)) {
+ goto err;
+ }
+
+ *amaster = mfd;
+ *aslave = sfd;
+
+ if (winp) {
+ ioctl(sfd, TIOCSWINSZ, winp);
+ }
+
+ return 0;
+
+err:
+ if (sfd != -1) {
+ close(sfd);
+ }
+ close(mfd);
+ return -1;
+}
+#endif
+
+static void cfmakeraw (struct termios *termios_p)
+{
+ termios_p->c_iflag &=
+ ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
+ termios_p->c_oflag &= ~OPOST;
+ termios_p->c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+ termios_p->c_cflag &= ~(CSIZE | PARENB);
+ termios_p->c_cflag |= CS8;
+
+ termios_p->c_cc[VMIN] = 0;
+ termios_p->c_cc[VTIME] = 0;
+}
+#endif
+
+/* like openpty() but also makes it raw; return master fd */
+static int qemu_openpty_raw(int *aslave, char *pty_name)
+{
+ int amaster;
+ struct termios tty;
+#if defined(__OpenBSD__) || defined(__DragonFly__)
+ char pty_buf[PATH_MAX];
+#define q_ptsname(x) pty_buf
+#else
+ char *pty_buf = NULL;
+#define q_ptsname(x) ptsname(x)
+#endif
+
+ if (openpty(&amaster, aslave, pty_buf, NULL, NULL) < 0) {
+ return -1;
+ }
+
+ /* Set raw attributes on the pty. */
+ tcgetattr(*aslave, &tty);
+ cfmakeraw(&tty);
+ tcsetattr(*aslave, TCSAFLUSH, &tty);
+
+ if (pty_name) {
+ strcpy(pty_name, q_ptsname(amaster));
+ }
+
+ return amaster;
+}
+
static void char_pty_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c
deleted file mode 100644
index 427f43a76973..000000000000
--- a/util/qemu-openpty.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * qemu-openpty.c
- *
- * Copyright (c) 2003-2008 Fabrice Bellard
- * Copyright (c) 2010 Red Hat, Inc.
- *
- * Wrapper function qemu_openpty() implementation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/*
- * This is not part of oslib-posix.c because this function
- * uses openpty() which often in -lutil, and if we add this
- * dependency to oslib-posix.o, every app will have to be
- * linked with -lutil.
- */
-
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-
-#if defined HAVE_PTY_H
-# include <pty.h>
-#elif defined CONFIG_BSD
-# include <termios.h>
-# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-# include <libutil.h>
-# else
-# include <util.h>
-# endif
-#elif defined CONFIG_SOLARIS
-# include <termios.h>
-# include <stropts.h>
-#else
-# include <termios.h>
-#endif
-
-#ifdef __sun__
-
-#if !defined(HAVE_OPENPTY)
-/* Once illumos has openpty(), this is going to be removed. */
-static int openpty(int *amaster, int *aslave, char *name,
- struct termios *termp, struct winsize *winp)
-{
- const char *slave;
- int mfd = -1, sfd = -1;
-
- *amaster = *aslave = -1;
-
- mfd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
- if (mfd < 0)
- goto err;
-
- if (grantpt(mfd) == -1 || unlockpt(mfd) == -1)
- goto err;
-
- if ((slave = ptsname(mfd)) == NULL)
- goto err;
-
- if ((sfd = open(slave, O_RDONLY | O_NOCTTY)) == -1)
- goto err;
-
- if (ioctl(sfd, I_PUSH, "ptem") == -1 ||
- (termp != NULL && tcgetattr(sfd, termp) < 0))
- goto err;
-
- *amaster = mfd;
- *aslave = sfd;
-
- if (winp)
- ioctl(sfd, TIOCSWINSZ, winp);
-
- return 0;
-
-err:
- if (sfd != -1)
- close(sfd);
- close(mfd);
- return -1;
-}
-#endif
-
-static void cfmakeraw (struct termios *termios_p)
-{
- termios_p->c_iflag &=
- ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
- termios_p->c_oflag &= ~OPOST;
- termios_p->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
- termios_p->c_cflag &= ~(CSIZE|PARENB);
- termios_p->c_cflag |= CS8;
-
- termios_p->c_cc[VMIN] = 0;
- termios_p->c_cc[VTIME] = 0;
-}
-#endif
-
-int qemu_openpty_raw(int *aslave, char *pty_name)
-{
- int amaster;
- struct termios tty;
-#if defined(__OpenBSD__) || defined(__DragonFly__)
- char pty_buf[PATH_MAX];
-#define q_ptsname(x) pty_buf
-#else
- char *pty_buf = NULL;
-#define q_ptsname(x) ptsname(x)
-#endif
-
- if (openpty(&amaster, aslave, pty_buf, NULL, NULL) < 0) {
- return -1;
- }
-
- /* Set raw attributes on the pty. */
- tcgetattr(*aslave, &tty);
- cfmakeraw(&tty);
- tcsetattr(*aslave, TCSAFLUSH, &tty);
-
- if (pty_name) {
- strcpy(pty_name, q_ptsname(amaster));
- }
-
- return amaster;
-}
diff --git a/chardev/meson.build b/chardev/meson.build
index 325ba2bdb97d..664f77b8879a 100644
--- a/chardev/meson.build
+++ b/chardev/meson.build
@@ -12,11 +12,11 @@ chardev_ss.add(files(
'char-udp.c',
'char.c',
))
-chardev_ss.add(when: 'CONFIG_POSIX', if_true: files(
+chardev_ss.add(when: 'CONFIG_POSIX', if_true: [files(
'char-fd.c',
'char-parallel.c',
'char-pty.c',
-))
+), util])
chardev_ss.add(when: 'CONFIG_WIN32', if_true: files(
'char-console.c',
'char-win-stdio.c',
diff --git a/util/meson.build b/util/meson.build
index bb0b010662d7..f8f0643318c3 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -16,7 +16,6 @@ if targetos == 'freebsd'
freebsd_dep = util
endif
util_ss.add(when: 'CONFIG_POSIX', if_true: [files('oslib-posix.c'), freebsd_dep])
-util_ss.add(when: 'CONFIG_POSIX', if_true: [files('qemu-openpty.c'), util])
util_ss.add(when: 'CONFIG_POSIX', if_true: files('qemu-thread-posix.c'))
util_ss.add(when: 'CONFIG_POSIX', if_true: files('memfd.c'))
util_ss.add(when: 'CONFIG_WIN32', if_true: files('aio-win32.c'))
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 06/32] Replace config-time define HOST_WORDS_BIGENDIAN
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 02/32] meson: add util dependency for oslib-posix on freebsd marcandre.lureau
` (31 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Paolo Bonzini, Richard Henderson,
Gerd Hoffmann, Peter Maydell, Michael S. Tsirkin, Pavel Pisa,
Vikram Garhwal, Jason Wang, Dmitry Fleytman, Halil Pasic,
Christian Borntraeger, Eric Farman, David Hildenbrand,
Cornelia Huck, Thomas Huth, Peter Xu, Philippe Mathieu-Daudé,
Aurelien Jarno, Alex Bennée, Eduardo Habkost,
Marcel Apfelbaum, Yanan Wang, Laurent Vivier, Jiaxun Yang,
Aleksandar Rikalo, Cédric Le Goater,
Daniel Henrique Barboza, David Gibson, Greg Kurz, Palmer Dabbelt,
Alistair Francis, Bin Meng, Mark Cave-Ayland, Artyom Tarasenko,
Max Filippov, Huacai Chen, Coiby Xu, Stefan Hajnoczi,
open list:Overall KVM CPUs, open list:ARM PrimeCell and...,
open list:S390 SCLP-backed...,
open list:PowerPC TCG CPUs, open list:RISC-V TCG CPUs,
open list:virtio-blk
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Replace a config-time define with a compile time condition
define (compatible with clang and gcc) that must be declared prior to
its usage. This avoids having a global configure time define, but also
prevents from bad usage, if the config header wasn't included before.
This can help to make some code independent from qemu too.
gcc supports __BYTE_ORDER__ from about 4.6 and clang from 3.2.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[ For the s390x parts I'm involved in ]
Acked-by: Halil Pasic <pasic@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
meson.build | 1 -
accel/tcg/atomic_template.h | 4 +-
audio/audio.h | 2 +-
hw/display/pl110_template.h | 6 +--
hw/net/can/ctucan_core.h | 2 +-
hw/net/vmxnet3.h | 4 +-
include/exec/cpu-all.h | 7 ++--
include/exec/cpu-common.h | 2 +-
include/exec/memop.h | 2 +-
include/exec/memory.h | 2 +-
include/fpu/softfloat-types.h | 2 +-
include/hw/core/cpu.h | 2 +-
include/hw/i386/intel_iommu.h | 6 +--
include/hw/i386/x86-iommu.h | 4 +-
include/hw/virtio/virtio-access.h | 6 +--
include/hw/virtio/virtio-gpu-bswap.h | 2 +-
include/libdecnumber/dconfig.h | 2 +-
include/net/eth.h | 2 +-
include/qemu/bswap.h | 8 ++--
include/qemu/host-utils.h | 2 +-
include/qemu/int128.h | 2 +-
include/ui/qemu-pixman.h | 2 +-
net/util.h | 2 +-
target/arm/cpu.h | 8 ++--
target/arm/translate-a64.h | 2 +-
target/arm/vec_internal.h | 2 +-
target/i386/cpu.h | 2 +-
target/mips/cpu.h | 2 +-
target/ppc/cpu.h | 2 +-
target/s390x/tcg/vec.h | 2 +-
target/xtensa/cpu.h | 2 +-
tests/fp/platform.h | 4 +-
accel/kvm/kvm-all.c | 4 +-
audio/dbusaudio.c | 2 +-
disas.c | 2 +-
hw/core/loader.c | 4 +-
hw/display/artist.c | 6 +--
hw/display/pxa2xx_lcd.c | 2 +-
hw/display/vga.c | 12 +++---
hw/display/virtio-gpu-gl.c | 2 +-
hw/s390x/event-facility.c | 2 +-
hw/virtio/vhost.c | 2 +-
linux-user/arm/nwfpe/double_cpdo.c | 4 +-
linux-user/arm/nwfpe/fpa11_cpdt.c | 4 +-
linux-user/ppc/signal.c | 3 +-
linux-user/syscall.c | 6 +--
net/net.c | 4 +-
target/alpha/translate.c | 2 +-
target/arm/crypto_helper.c | 2 +-
target/arm/helper.c | 2 +-
target/arm/kvm64.c | 4 +-
target/arm/neon_helper.c | 2 +-
target/arm/sve_helper.c | 4 +-
target/arm/translate-sve.c | 6 +--
target/arm/translate-vfp.c | 2 +-
target/arm/translate.c | 2 +-
target/hppa/translate.c | 2 +-
target/i386/tcg/translate.c | 2 +-
target/mips/tcg/lmmi_helper.c | 2 +-
target/mips/tcg/msa_helper.c | 54 ++++++++++++-------------
target/ppc/arch_dump.c | 2 +-
target/ppc/int_helper.c | 22 +++++-----
target/ppc/kvm.c | 4 +-
target/ppc/mem_helper.c | 2 +-
target/riscv/vector_helper.c | 2 +-
target/s390x/tcg/translate.c | 2 +-
target/sparc/vis_helper.c | 4 +-
tcg/tcg-op.c | 4 +-
tcg/tcg.c | 12 +++---
tests/qtest/vhost-user-blk-test.c | 2 +-
tests/qtest/virtio-blk-test.c | 2 +-
ui/vdagent.c | 2 +-
ui/vnc.c | 2 +-
util/bitmap.c | 2 +-
util/host-utils.c | 2 +-
target/ppc/translate/vmx-impl.c.inc | 4 +-
target/ppc/translate/vsx-impl.c.inc | 2 +-
target/riscv/insn_trans/trans_rvv.c.inc | 4 +-
target/s390x/tcg/translate_vx.c.inc | 2 +-
tcg/aarch64/tcg-target.c.inc | 4 +-
tcg/arm/tcg-target.c.inc | 4 +-
tcg/mips/tcg-target.c.inc | 2 +-
tcg/ppc/tcg-target.c.inc | 10 ++---
tcg/riscv/tcg-target.c.inc | 4 +-
84 files changed, 173 insertions(+), 174 deletions(-)
diff --git a/meson.build b/meson.build
index dc17d37e461b..7828f6537813 100644
--- a/meson.build
+++ b/meson.build
@@ -1592,7 +1592,6 @@ config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2]
config_host_data.set_quoted('CONFIG_HOST_DSOSUF', host_dsosuf)
config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
-config_host_data.set('HOST_WORDS_BIGENDIAN', host_machine.endian() == 'big')
have_coroutine_pool = get_option('coroutine_pool')
if get_option('debug_stack_usage') and have_coroutine_pool
diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h
index fc165031e868..404a530f7c2a 100644
--- a/accel/tcg/atomic_template.h
+++ b/accel/tcg/atomic_template.h
@@ -63,7 +63,7 @@
the ATOMIC_NAME macro, and redefined below. */
#if DATA_SIZE == 1
# define END
-#elif defined(HOST_WORDS_BIGENDIAN)
+#elif HOST_BIG_ENDIAN
# define END _be
#else
# define END _le
@@ -196,7 +196,7 @@ GEN_ATOMIC_HELPER_FN(umax_fetch, MAX, DATA_TYPE, new)
/* Define reverse-host-endian atomic operations. Note that END is used
within the ATOMIC_NAME macro. */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define END _le
#else
# define END _be
diff --git a/audio/audio.h b/audio/audio.h
index cbb10f4816e5..3d5ecdecd5c1 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -32,7 +32,7 @@
typedef void (*audio_callback_fn) (void *opaque, int avail);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define AUDIO_HOST_ENDIANNESS 1
#else
#define AUDIO_HOST_ENDIANNESS 0
diff --git a/hw/display/pl110_template.h b/hw/display/pl110_template.h
index 877419aa817a..00877853225d 100644
--- a/hw/display/pl110_template.h
+++ b/hw/display/pl110_template.h
@@ -15,18 +15,18 @@
#if ORDER == 0
#define NAME glue(lblp_, BORDER)
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define SWAP_WORDS 1
#endif
#elif ORDER == 1
#define NAME glue(bbbp_, BORDER)
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
#define SWAP_WORDS 1
#endif
#else
#define SWAP_PIXELS 1
#define NAME glue(lbbp_, BORDER)
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define SWAP_WORDS 1
#endif
#endif
diff --git a/hw/net/can/ctucan_core.h b/hw/net/can/ctucan_core.h
index bbc09ae06785..608307a6310c 100644
--- a/hw/net/can/ctucan_core.h
+++ b/hw/net/can/ctucan_core.h
@@ -31,7 +31,7 @@
#include "exec/hwaddr.h"
#include "net/can_emu.h"
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
#define __LITTLE_ENDIAN_BITFIELD 1
#endif
diff --git a/hw/net/vmxnet3.h b/hw/net/vmxnet3.h
index 5b3b76ba7ad1..bf4f6de74a07 100644
--- a/hw/net/vmxnet3.h
+++ b/hw/net/vmxnet3.h
@@ -35,7 +35,7 @@
#define __le32 uint32_t
#define __le64 uint64_t
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define __BIG_ENDIAN_BITFIELD
#else
#endif
@@ -800,7 +800,7 @@ struct Vmxnet3_DriverShared {
#undef __le16
#undef __le32
#undef __le64
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#undef __BIG_ENDIAN_BITFIELD
#endif
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index c0f0fab28a1f..f77070da5f7e 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -34,13 +34,14 @@
/* some important defines:
*
- * HOST_WORDS_BIGENDIAN : if defined, the host cpu is big endian and
+ * HOST_BIG_ENDIAN : whether the host cpu is big endian and
* otherwise little endian.
*
- * TARGET_WORDS_BIGENDIAN : same for target cpu
+ * TARGET_WORDS_BIGENDIAN : if defined, the host cpu is big endian and otherwise
+ * little endian.
*/
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
#define BSWAP_NEEDED
#endif
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 50a7d2912e0b..c7d50fac955c 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -46,7 +46,7 @@ enum device_endian {
DEVICE_LITTLE_ENDIAN,
};
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define DEVICE_HOST_ENDIAN DEVICE_BIG_ENDIAN
#else
#define DEVICE_HOST_ENDIAN DEVICE_LITTLE_ENDIAN
diff --git a/include/exec/memop.h b/include/exec/memop.h
index 2a885f3917b4..44f923ed4660 100644
--- a/include/exec/memop.h
+++ b/include/exec/memop.h
@@ -28,7 +28,7 @@ typedef enum MemOp {
MO_SIGN = 0x08, /* Sign-extended, otherwise zero-extended. */
MO_BSWAP = 0x10, /* Host reverse endian. */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
MO_LE = MO_BSWAP,
MO_BE = 0,
#else
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 4d5997e6bbae..e40653f0d19e 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -2931,7 +2931,7 @@ static inline MemOp devend_memop(enum device_endian end)
QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN &&
DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN);
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
/* Swap if non-host endianness or native (target) endianness */
return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP;
#else
diff --git a/include/fpu/softfloat-types.h b/include/fpu/softfloat-types.h
index 8abd9ab4ec9c..7a6ea881d83e 100644
--- a/include/fpu/softfloat-types.h
+++ b/include/fpu/softfloat-types.h
@@ -103,7 +103,7 @@ typedef struct {
#define make_floatx80(exp, mant) ((floatx80) { mant, exp })
#define make_floatx80_init(exp, mant) { .low = mant, .high = exp }
typedef struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t high, low;
#else
uint64_t low, high;
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 136973655c1a..b0e2e5b9d253 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -187,7 +187,7 @@ struct CPUClass {
typedef union IcountDecr {
uint32_t u32;
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint16_t high;
uint16_t low;
#else
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index 3b5ac869db6e..bfa982a41957 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -145,7 +145,7 @@ enum {
/* Interrupt Remapping Table Entry Definition */
union VTD_IR_TableEntry {
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t __reserved_1:8; /* Reserved 1 */
uint32_t vector:8; /* Interrupt Vector */
uint32_t irte_mode:1; /* IRTE Mode */
@@ -172,7 +172,7 @@ union VTD_IR_TableEntry {
#endif
uint32_t dest_id; /* Destination ID */
uint16_t source_id; /* Source-ID */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t __reserved_2:44; /* Reserved 2 */
uint64_t sid_vtype:2; /* Source-ID Validation Type */
uint64_t sid_q:2; /* Source-ID Qualifier */
@@ -191,7 +191,7 @@ union VTD_IR_TableEntry {
/* Programming format for MSI/MSI-X addresses */
union VTD_IR_MSIAddress {
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t __head:12; /* Should always be: 0x0fee */
uint32_t index_l:15; /* Interrupt index bit 14-0 */
uint32_t int_mode:1; /* Interrupt format */
diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h
index 5ba0c056d60c..7637edb430a4 100644
--- a/include/hw/i386/x86-iommu.h
+++ b/include/hw/i386/x86-iommu.h
@@ -87,7 +87,7 @@ struct X86IOMMUIrq {
struct X86IOMMU_MSIMessage {
union {
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t __addr_head:12; /* 0xfee */
uint32_t dest:8;
uint32_t __reserved:8;
@@ -108,7 +108,7 @@ struct X86IOMMU_MSIMessage {
};
union {
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint16_t trigger_mode:1;
uint16_t level:1;
uint16_t __resved:3;
diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h
index 6818a23a2d35..90cbb77782b5 100644
--- a/include/hw/virtio/virtio-access.h
+++ b/include/hw/virtio/virtio-access.h
@@ -149,7 +149,7 @@ static inline uint64_t virtio_ldq_p(VirtIODevice *vdev, const void *ptr)
static inline uint16_t virtio_tswap16(VirtIODevice *vdev, uint16_t s)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return virtio_access_is_big_endian(vdev) ? s : bswap16(s);
#else
return virtio_access_is_big_endian(vdev) ? bswap16(s) : s;
@@ -215,7 +215,7 @@ static inline void virtio_tswap16s(VirtIODevice *vdev, uint16_t *s)
static inline uint32_t virtio_tswap32(VirtIODevice *vdev, uint32_t s)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return virtio_access_is_big_endian(vdev) ? s : bswap32(s);
#else
return virtio_access_is_big_endian(vdev) ? bswap32(s) : s;
@@ -229,7 +229,7 @@ static inline void virtio_tswap32s(VirtIODevice *vdev, uint32_t *s)
static inline uint64_t virtio_tswap64(VirtIODevice *vdev, uint64_t s)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return virtio_access_is_big_endian(vdev) ? s : bswap64(s);
#else
return virtio_access_is_big_endian(vdev) ? bswap64(s) : s;
diff --git a/include/hw/virtio/virtio-gpu-bswap.h b/include/hw/virtio/virtio-gpu-bswap.h
index 5faac0d8d5f3..912410848597 100644
--- a/include/hw/virtio/virtio-gpu-bswap.h
+++ b/include/hw/virtio/virtio-gpu-bswap.h
@@ -29,7 +29,7 @@ virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr)
static inline void
virtio_gpu_bswap_32(void *ptr, size_t size)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
size_t i;
struct virtio_gpu_ctrl_hdr *hdr = (struct virtio_gpu_ctrl_hdr *) ptr;
diff --git a/include/libdecnumber/dconfig.h b/include/libdecnumber/dconfig.h
index 0f7dccef1f4e..2bc0ba7f1444 100644
--- a/include/libdecnumber/dconfig.h
+++ b/include/libdecnumber/dconfig.h
@@ -28,7 +28,7 @@
02110-1301, USA. */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define WORDS_BIGENDIAN 1
#else
#define WORDS_BIGENDIAN 0
diff --git a/include/net/eth.h b/include/net/eth.h
index 7767ae880ecc..6e699b0d7a4a 100644
--- a/include/net/eth.h
+++ b/include/net/eth.h
@@ -159,7 +159,7 @@ struct tcp_hdr {
u_short th_dport; /* destination port */
uint32_t th_seq; /* sequence number */
uint32_t th_ack; /* acknowledgment number */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
u_char th_off : 4, /* data offset */
th_x2:4; /* (unused) */
#else
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 2d3bb8bbedda..9dff7c7dbbc9 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -84,7 +84,7 @@ static inline void bswap64s(uint64_t *s)
*s = bswap64(*s);
}
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define be_bswap(v, size) (v)
#define le_bswap(v, size) glue(bswap, size)(v)
#define be_bswaps(v, size)
@@ -188,7 +188,7 @@ CPU_CONVERT(le, 64, uint64_t)
* a compile-time constant if you pass in a constant. So this can be
* used to initialize static variables.
*/
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
# define const_le32(_x) \
((((_x) & 0x000000ffU) << 24) | \
(((_x) & 0x0000ff00U) << 8) | \
@@ -211,7 +211,7 @@ typedef union {
typedef union {
float64 d;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
struct {
uint32_t upper;
uint32_t lower;
@@ -235,7 +235,7 @@ typedef union {
typedef union {
float128 q;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
struct {
uint32_t upmost;
uint32_t upper;
diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h
index ca979dc6ccde..f19bd2910563 100644
--- a/include/qemu/host-utils.h
+++ b/include/qemu/host-utils.h
@@ -88,7 +88,7 @@ static inline uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
union {
uint64_t ll;
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t high, low;
#else
uint32_t low, high;
diff --git a/include/qemu/int128.h b/include/qemu/int128.h
index 2c4064256cdf..37e07fd6dd92 100644
--- a/include/qemu/int128.h
+++ b/include/qemu/int128.h
@@ -205,7 +205,7 @@ typedef struct Int128 Int128;
* a union with other integer types).
*/
struct Int128 {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
int64_t hi;
uint64_t lo;
#else
diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h
index 806ddcd7cdab..0c775604d173 100644
--- a/include/ui/qemu-pixman.h
+++ b/include/ui/qemu-pixman.h
@@ -19,7 +19,7 @@
* feeding libjpeg / libpng and writing screenshots.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define PIXMAN_BE_r8g8b8 PIXMAN_r8g8b8
# define PIXMAN_BE_x8r8g8b8 PIXMAN_x8r8g8b8
# define PIXMAN_BE_a8r8g8b8 PIXMAN_a8r8g8b8
diff --git a/net/util.h b/net/util.h
index 358185fd5034..288312979f09 100644
--- a/net/util.h
+++ b/net/util.h
@@ -30,7 +30,7 @@
* Structure of an internet header, naked of options.
*/
struct ip {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint8_t ip_v:4, /* version */
ip_hl:4; /* header length */
#else
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 23879de5fa7f..816aa0394e9f 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -95,7 +95,7 @@ enum {
* therefore useful to be able to pass TCG the offset of the least
* significant half of a uint64_t struct member.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define offsetoflow32(S, M) (offsetof(S, M) + sizeof(uint32_t))
#define offsetofhigh32(S, M) offsetof(S, M)
#else
@@ -382,7 +382,7 @@ typedef struct CPUArchState {
union { /* Fault address registers. */
struct {
uint64_t _unused_far0;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t ifar_ns;
uint32_t dfar_ns;
uint32_t ifar_s;
@@ -419,7 +419,7 @@ typedef struct CPUArchState {
uint64_t c9_pminten; /* perf monitor interrupt enables */
union { /* Memory attribute redirection */
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t _unused_mair_0;
uint32_t mair1_ns;
uint32_t mair0_ns;
@@ -1093,7 +1093,7 @@ void aarch64_add_pauth_properties(Object *obj);
*/
static inline uint64_t *sve_bswap64(uint64_t *dst, uint64_t *src, int nr)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
int i;
for (i = 0; i < nr; ++i) {
diff --git a/target/arm/translate-a64.h b/target/arm/translate-a64.h
index 58f50abca469..38884158aab3 100644
--- a/target/arm/translate-a64.h
+++ b/target/arm/translate-a64.h
@@ -71,7 +71,7 @@ static inline int vec_reg_offset(DisasContext *s, int regno,
{
int element_size = 1 << size;
int offs = element * element_size;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
/* This is complicated slightly because vfp.zregs[n].d[0] is
* still the lowest and vfp.zregs[n].d[15] the highest of the
* 256 byte vector, even on big endian systems.
diff --git a/target/arm/vec_internal.h b/target/arm/vec_internal.h
index 2a3355829068..fb43a2380e21 100644
--- a/target/arm/vec_internal.h
+++ b/target/arm/vec_internal.h
@@ -29,7 +29,7 @@
* The H1_<N> macros are used when performing byte arithmetic and then
* casting the final pointer to a type of size N.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define H1(x) ((x) ^ 7)
#define H1_2(x) ((x) ^ 6)
#define H1_4(x) ((x) ^ 4)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 5e406088a91a..5124c1e307b5 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1246,7 +1246,7 @@ typedef struct BNDCSReg {
#define BNDCFG_BNDPRESERVE 2ULL
#define BNDCFG_BDIR_MASK TARGET_PAGE_MASK
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define ZMM_B(n) _b_ZMMReg[63 - (n)]
#define ZMM_W(n) _w_ZMMReg[31 - (n)]
#define ZMM_L(n) _l_ZMMReg[15 - (n)]
diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index 52ce08a94d36..5335ac10a3dc 100644
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -35,7 +35,7 @@ union fpr_t {
*define FP_ENDIAN_IDX to access the same location
* in the fpr_t union regardless of the host endianness
*/
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
# define FP_ENDIAN_IDX 1
#else
# define FP_ENDIAN_IDX 0
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 047b24ba50ea..627e574127ba 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -2642,7 +2642,7 @@ static inline bool lsw_reg_in_range(int start, int nregs, int rx)
}
/* Accessors for FP, VMX and VSX registers */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VsrB(i) u8[i]
#define VsrSB(i) s8[i]
#define VsrH(i) u16[i]
diff --git a/target/s390x/tcg/vec.h b/target/s390x/tcg/vec.h
index a6e361869b2e..8d095efcfc6f 100644
--- a/target/s390x/tcg/vec.h
+++ b/target/s390x/tcg/vec.h
@@ -38,7 +38,7 @@ typedef union S390Vector {
* W: [ 1][ 0] - [ 3][ 2]
* DW: [ 0] - [ 1]
*/
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
#define H1(x) ((x) ^ 7)
#define H2(x) ((x) ^ 3)
#define H4(x) ((x) ^ 1)
diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index 4515f682aa26..a572e831aebf 100644
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -494,7 +494,7 @@ typedef struct XtensaConfigList {
struct XtensaConfigList *next;
} XtensaConfigList;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
enum {
FP_F32_HIGH,
FP_F32_LOW,
diff --git a/tests/fp/platform.h b/tests/fp/platform.h
index c20ba70baa07..6c72ad0cd05b 100644
--- a/tests/fp/platform.h
+++ b/tests/fp/platform.h
@@ -29,9 +29,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config-host.h"
+#include "qemu/compiler.h"
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
#define LITTLEENDIAN 1
/* otherwise do not define it */
#endif
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 5f1377ca048c..1c129dc90c8b 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1202,8 +1202,8 @@ void kvm_hwpoison_page_add(ram_addr_t ram_addr)
static uint32_t adjust_ioeventfd_endianness(uint32_t val, uint32_t size)
{
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
- /* The kernel expects ioeventfd values in HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+ /* The kernel expects ioeventfd values in HOST_BIG_ENDIAN
* endianness, but the memory core hands them in target endianness.
* For example, PPC is always treated as big-endian even if running
* on KVM and on PPC64LE. Correct here.
diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c
index f178b47deec1..a3d656d3b017 100644
--- a/audio/dbusaudio.c
+++ b/audio/dbusaudio.c
@@ -122,7 +122,7 @@ static size_t dbus_put_buffer_out(HWVoiceOut *hw, void *buf, size_t size)
return size;
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define AUDIO_HOST_BE TRUE
#else
#define AUDIO_HOST_BE FALSE
diff --git a/disas.c b/disas.c
index 3dab4482d1a1..2d2565ac5774 100644
--- a/disas.c
+++ b/disas.c
@@ -144,7 +144,7 @@ static void initialize_debug_host(CPUDebug *s)
s->info.read_memory_func = host_read_memory;
s->info.print_address_func = host_print_address;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
s->info.endian = BFD_ENDIAN_BIG;
#else
s->info.endian = BFD_ENDIAN_LITTLE;
diff --git a/hw/core/loader.c b/hw/core/loader.c
index ca2f2431fba7..8d9b2df6e725 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -474,7 +474,7 @@ ssize_t load_elf_ram_sym(const char *filename,
ret = ELF_LOAD_NOT_ELF;
goto fail;
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
data_order = ELFDATA2MSB;
#else
data_order = ELFDATA2LSB;
@@ -511,7 +511,7 @@ ssize_t load_elf_ram_sym(const char *filename,
static void bswap_uboot_header(uboot_image_header_t *hdr)
{
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
bswap32s(&hdr->ih_magic);
bswap32s(&hdr->ih_hcrc);
bswap32s(&hdr->ih_time);
diff --git a/hw/display/artist.c b/hw/display/artist.c
index 1d877998b9ae..69a8f9eea8ba 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -26,7 +26,7 @@
#define TYPE_ARTIST "artist"
OBJECT_DECLARE_SIMPLE_TYPE(ARTISTState, ARTIST)
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define ROP8OFF(_i) (3 - (_i))
#else
#define ROP8OFF
@@ -712,7 +712,7 @@ static void combine_write_reg(hwaddr addr, uint64_t val, int size, void *out)
* FIXME: is there a qemu helper for this?
*/
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
addr ^= 3;
#endif
@@ -1087,7 +1087,7 @@ static uint64_t combine_read_reg(hwaddr addr, int size, void *in)
* FIXME: is there a qemu helper for this?
*/
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
addr ^= 3;
#endif
diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c
index 0f06ed6e9f3d..7859c5d1cd86 100644
--- a/hw/display/pxa2xx_lcd.c
+++ b/hw/display/pxa2xx_lcd.c
@@ -199,7 +199,7 @@ typedef struct QEMU_PACKED {
SKIP_PIXEL(to); \
} while (0)
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define SWAP_WORDS 1
#endif
diff --git a/hw/display/vga.c b/hw/display/vga.c
index a7a291fa2089..737cfbde98ce 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -94,19 +94,19 @@ const uint8_t gr_mask[16] = {
(((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >> 8) | \
(((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) ))
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define PAT(x) cbswap_32(x)
#else
#define PAT(x) (x)
#endif
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define BIG 1
#else
#define BIG 0
#endif
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define GET_PLANE(data, p) (((data) >> (24 - (p) * 8)) & 0xff)
#else
#define GET_PLANE(data, p) (((data) >> ((p) * 8)) & 0xff)
@@ -133,7 +133,7 @@ static const uint32_t mask16[16] = {
#undef PAT
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define PAT(x) (x)
#else
#define PAT(x) cbswap_32(x)
@@ -1296,7 +1296,7 @@ static void vga_draw_text(VGACommonState *s, int full_update)
if (cx > cx_max)
cx_max = cx;
*ch_attr_ptr = ch_attr;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
ch = ch_attr >> 8;
cattr = ch_attr & 0xff;
#else
@@ -1477,7 +1477,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
vga_draw_line_func *vga_draw_line = NULL;
bool share_surface, force_shadow = false;
pixman_format_code_t format;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
bool byteswap = !s->big_endian_fb;
#else
bool byteswap = s->big_endian_fb;
diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
index 6cc4313b1af2..0bca8877035e 100644
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -108,7 +108,7 @@ static void virtio_gpu_gl_device_realize(DeviceState *qdev, Error **errp)
{
VirtIOGPU *g = VIRTIO_GPU(qdev);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
error_setg(errp, "virgl is not supported on bigendian platforms");
return;
#endif
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 6fa47b889ca4..faa51aa4c70d 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -28,7 +28,7 @@ typedef struct SCLPEventsBus {
} SCLPEventsBus;
/* we need to save 32 bit chunks for compatibility */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define RECV_MASK_LOWER 1
#define RECV_MASK_UPPER 0
#else /* little endian host */
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index b643f42ea4ec..e55ac32bf3a9 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -989,7 +989,7 @@ static inline bool vhost_needs_vring_endian(VirtIODevice *vdev)
if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {
return false;
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return vdev->device_endian == VIRTIO_DEVICE_ENDIAN_LITTLE;
#else
return vdev->device_endian == VIRTIO_DEVICE_ENDIAN_BIG;
diff --git a/linux-user/arm/nwfpe/double_cpdo.c b/linux-user/arm/nwfpe/double_cpdo.c
index 1cef380852c9..d45ece2e2fe7 100644
--- a/linux-user/arm/nwfpe/double_cpdo.c
+++ b/linux-user/arm/nwfpe/double_cpdo.c
@@ -150,7 +150,7 @@ unsigned int DoubleCPDO(const unsigned int opcode)
case MNF_CODE:
{
unsigned int *p = (unsigned int*)&rFm;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
p[0] ^= 0x80000000;
#else
p[1] ^= 0x80000000;
@@ -162,7 +162,7 @@ unsigned int DoubleCPDO(const unsigned int opcode)
case ABS_CODE:
{
unsigned int *p = (unsigned int*)&rFm;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
p[0] &= 0x7fffffff;
#else
p[1] &= 0x7fffffff;
diff --git a/linux-user/arm/nwfpe/fpa11_cpdt.c b/linux-user/arm/nwfpe/fpa11_cpdt.c
index c32b0c2faac0..fee525937c55 100644
--- a/linux-user/arm/nwfpe/fpa11_cpdt.c
+++ b/linux-user/arm/nwfpe/fpa11_cpdt.c
@@ -44,7 +44,7 @@ void loadDouble(const unsigned int Fn, target_ulong addr)
unsigned int *p;
p = (unsigned int*)&fpa11->fpreg[Fn].fDouble;
fpa11->fType[Fn] = typeDouble;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
/* FIXME - handle failure of get_user() */
get_user_u32(p[0], addr); /* sign & exponent */
get_user_u32(p[1], addr + 4);
@@ -147,7 +147,7 @@ void storeDouble(const unsigned int Fn, target_ulong addr)
default: val = fpa11->fpreg[Fn].fDouble;
}
/* FIXME - handle put_user() failures */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
put_user_u32(p[0], addr); /* msw */
put_user_u32(p[1], addr + 4); /* lsw */
#else
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index ec0b9c0df3da..2550b8f8c069 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -215,8 +215,7 @@ static target_ulong get_sigframe(struct target_sigaction *ka,
return (oldsp - frame_size) & ~0xFUL;
}
-#if ((defined(TARGET_WORDS_BIGENDIAN) && defined(HOST_WORDS_BIGENDIAN)) || \
- (!defined(HOST_WORDS_BIGENDIAN) && !defined(TARGET_WORDS_BIGENDIAN)))
+#if defined(TARGET_WORDS_BIGENDIAN) == HOST_BIG_ENDIAN
#define PPC_VEC_HI 0
#define PPC_VEC_LO 1
#else
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 75ed71eb461d..7182dbd9796d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8152,7 +8152,7 @@ static int is_proc_myself(const char *filename, const char *entry)
return 0;
}
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) || \
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) || \
defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA)
static int is_proc(const char *filename, const char *entry)
{
@@ -8160,7 +8160,7 @@ static int is_proc(const char *filename, const char *entry)
}
#endif
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
static int open_net_route(void *cpu_env, int fd)
{
FILE *fp;
@@ -8246,7 +8246,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
{ "stat", open_self_stat, is_proc_myself },
{ "auxv", open_self_auxv, is_proc_myself },
{ "cmdline", open_self_cmdline, is_proc_myself },
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
{ "/proc/net/route", open_net_route, is_proc },
#endif
#if defined(TARGET_SPARC) || defined(TARGET_HPPA)
diff --git a/net/net.c b/net/net.c
index f0d14dbfc1f0..9f17ab204422 100644
--- a/net/net.c
+++ b/net/net.c
@@ -524,7 +524,7 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)
int qemu_set_vnet_le(NetClientState *nc, bool is_le)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
if (!nc || !nc->info->set_vnet_le) {
return -ENOSYS;
}
@@ -537,7 +537,7 @@ int qemu_set_vnet_le(NetClientState *nc, bool is_le)
int qemu_set_vnet_be(NetClientState *nc, bool is_be)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return 0;
#else
if (!nc || !nc->info->set_vnet_be) {
diff --git a/target/alpha/translate.c b/target/alpha/translate.c
index 66768ab47ad5..4e887311ab62 100644
--- a/target/alpha/translate.c
+++ b/target/alpha/translate.c
@@ -235,7 +235,7 @@ static TCGv dest_fpr(DisasContext *ctx, unsigned reg)
static int get_flag_ofs(unsigned shift)
{
int ofs = offsetof(CPUAlphaState, flags);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
ofs += 3 - (shift / 8);
#else
ofs += shift / 8;
diff --git a/target/arm/crypto_helper.c b/target/arm/crypto_helper.c
index 28a84c2dbdb6..4c8fd34aecb0 100644
--- a/target/arm/crypto_helper.c
+++ b/target/arm/crypto_helper.c
@@ -23,7 +23,7 @@ union CRYPTO_STATE {
uint64_t l[2];
};
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define CR_ST_BYTE(state, i) ((state).bytes[(15 - (i)) ^ 8])
#define CR_ST_WORD(state, i) ((state).words[(3 - (i)) ^ 2])
#else
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 812ca591f4eb..8ffe26b17b13 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -8642,7 +8642,7 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r,
r2->cp = 15;
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
if (r2->fieldoffset) {
r2->fieldoffset += sizeof(uint32_t);
}
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index ccadfbbe72be..9ec8875150d6 100644
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -1023,7 +1023,7 @@ static int kvm_arch_put_fpsimd(CPUState *cs)
for (i = 0; i < 32; i++) {
uint64_t *q = aa64_vfp_qreg(env, i);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t fp_val[2] = { q[1], q[0] };
reg.addr = (uintptr_t)fp_val;
#else
@@ -1242,7 +1242,7 @@ static int kvm_arch_get_fpsimd(CPUState *cs)
if (ret) {
return ret;
} else {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t t;
t = q[0], q[0] = q[1], q[1] = t;
#endif
diff --git a/target/arm/neon_helper.c b/target/arm/neon_helper.c
index 338b9189d5b2..bc6c4a54e9d9 100644
--- a/target/arm/neon_helper.c
+++ b/target/arm/neon_helper.c
@@ -23,7 +23,7 @@ typedef struct \
{ \
type v1; \
} neon_##name;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define NEON_TYPE2(name, type) \
typedef struct \
{ \
diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c
index 07be55b7e1ad..d1ea26f1f774 100644
--- a/target/arm/sve_helper.c
+++ b/target/arm/sve_helper.c
@@ -2802,7 +2802,7 @@ static void swap_memmove(void *vd, void *vs, size_t n)
uintptr_t o = (d | s | n) & 7;
size_t i;
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
o = 0;
#endif
switch (o) {
@@ -2864,7 +2864,7 @@ static void swap_memzero(void *vd, size_t n)
return;
}
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
o = 0;
#endif
switch (o) {
diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c
index 2c23459e7684..180e14d9f884 100644
--- a/target/arm/translate-sve.c
+++ b/target/arm/translate-sve.c
@@ -2872,7 +2872,7 @@ static TCGv_i64 load_last_active(DisasContext *s, TCGv_i32 last,
* The final adjustment for the vector register base
* is added via constant offset to the load.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
/* Adjust for element ordering. See vec_reg_offset. */
if (esz < 3) {
tcg_gen_xori_i32(last, last, 8 - (1 << esz));
@@ -5711,7 +5711,7 @@ static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype)
* for this load operation.
*/
TCGv_i64 tmp = tcg_temp_new_i64();
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
poff += 6;
#endif
tcg_gen_ld16u_i64(tmp, cpu_env, poff);
@@ -5790,7 +5790,7 @@ static void do_ldro(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype)
* for this load operation.
*/
TCGv_i64 tmp = tcg_temp_new_i64();
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
poff += 4;
#endif
tcg_gen_ld32u_i64(tmp, cpu_env, poff);
diff --git a/target/arm/translate-vfp.c b/target/arm/translate-vfp.c
index 17f796e32a33..6a95a67a69e5 100644
--- a/target/arm/translate-vfp.c
+++ b/target/arm/translate-vfp.c
@@ -93,7 +93,7 @@ uint64_t vfp_expand_imm(int size, uint8_t imm8)
static inline long vfp_f16_offset(unsigned reg, bool top)
{
long offs = vfp_reg_offset(false, reg);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
if (!top) {
offs += 2;
}
diff --git a/target/arm/translate.c b/target/arm/translate.c
index bf2196b9e24c..e8dfa71364db 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -1158,7 +1158,7 @@ long neon_element_offset(int reg, int element, MemOp memop)
{
int element_size = 1 << (memop & MO_SIZE);
int ofs = element * element_size;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
/*
* Calculate the offset assuming fully little-endian,
* then XOR to account for the order of the 8-byte units.
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index 5c0b1eb274aa..0b83ee4d9856 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -566,7 +566,7 @@ static void save_gpr(DisasContext *ctx, unsigned reg, TCGv_reg t)
}
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define HI_OFS 0
# define LO_OFS 4
#else
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index 2a94d3374252..5649bba9a88d 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -359,7 +359,7 @@ static void gen_update_cc_op(DisasContext *s)
#endif /* !TARGET_X86_64 */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define REG_B_OFFSET (sizeof(target_ulong) - 1)
#define REG_H_OFFSET (sizeof(target_ulong) - 2)
#define REG_W_OFFSET (sizeof(target_ulong) - 2)
diff --git a/target/mips/tcg/lmmi_helper.c b/target/mips/tcg/lmmi_helper.c
index abeb7736aeb2..2c8732525ce3 100644
--- a/target/mips/tcg/lmmi_helper.c
+++ b/target/mips/tcg/lmmi_helper.c
@@ -37,7 +37,7 @@ typedef union {
} LMIValue;
/* Some byte ordering issues can be mitigated by XORing in the following. */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define BYTE_ORDER_XOR(N) N
#else
# define BYTE_ORDER_XOR(N) 0
diff --git a/target/mips/tcg/msa_helper.c b/target/mips/tcg/msa_helper.c
index 5667b1f0a15c..389c42e4baa3 100644
--- a/target/mips/tcg/msa_helper.c
+++ b/target/mips/tcg/msa_helper.c
@@ -4146,7 +4146,7 @@ void helper_msa_ilvev_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[8] = pws->b[9];
pwd->b[9] = pwt->b[9];
pwd->b[10] = pws->b[11];
@@ -4190,7 +4190,7 @@ void helper_msa_ilvev_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[4] = pws->h[5];
pwd->h[5] = pwt->h[5];
pwd->h[6] = pws->h[7];
@@ -4218,7 +4218,7 @@ void helper_msa_ilvev_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[2] = pws->w[3];
pwd->w[3] = pwt->w[3];
pwd->w[0] = pws->w[1];
@@ -4250,7 +4250,7 @@ void helper_msa_ilvod_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[7] = pwt->b[6];
pwd->b[6] = pws->b[6];
pwd->b[5] = pwt->b[4];
@@ -4294,7 +4294,7 @@ void helper_msa_ilvod_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[3] = pwt->h[2];
pwd->h[2] = pws->h[2];
pwd->h[1] = pwt->h[0];
@@ -4322,7 +4322,7 @@ void helper_msa_ilvod_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[1] = pwt->w[0];
pwd->w[0] = pws->w[0];
pwd->w[3] = pwt->w[2];
@@ -4354,7 +4354,7 @@ void helper_msa_ilvl_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[7] = pwt->b[15];
pwd->b[6] = pws->b[15];
pwd->b[5] = pwt->b[14];
@@ -4398,7 +4398,7 @@ void helper_msa_ilvl_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[3] = pwt->h[7];
pwd->h[2] = pws->h[7];
pwd->h[1] = pwt->h[6];
@@ -4426,7 +4426,7 @@ void helper_msa_ilvl_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[1] = pwt->w[3];
pwd->w[0] = pws->w[3];
pwd->w[3] = pwt->w[2];
@@ -4458,7 +4458,7 @@ void helper_msa_ilvr_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[8] = pws->b[0];
pwd->b[9] = pwt->b[0];
pwd->b[10] = pws->b[1];
@@ -4502,7 +4502,7 @@ void helper_msa_ilvr_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[4] = pws->h[0];
pwd->h[5] = pwt->h[0];
pwd->h[6] = pws->h[1];
@@ -4530,7 +4530,7 @@ void helper_msa_ilvr_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[2] = pws->w[0];
pwd->w[3] = pwt->w[0];
pwd->w[0] = pws->w[1];
@@ -4661,7 +4661,7 @@ void helper_msa_pckev_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[8] = pws->b[9];
pwd->b[10] = pws->b[13];
pwd->b[12] = pws->b[1];
@@ -4705,7 +4705,7 @@ void helper_msa_pckev_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[4] = pws->h[5];
pwd->h[6] = pws->h[1];
pwd->h[0] = pwt->h[5];
@@ -4733,7 +4733,7 @@ void helper_msa_pckev_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[2] = pws->w[3];
pwd->w[0] = pwt->w[3];
pwd->w[3] = pws->w[1];
@@ -4765,7 +4765,7 @@ void helper_msa_pckod_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[7] = pwt->b[6];
pwd->b[5] = pwt->b[2];
pwd->b[3] = pwt->b[14];
@@ -4810,7 +4810,7 @@ void helper_msa_pckod_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[3] = pwt->h[2];
pwd->h[1] = pwt->h[6];
pwd->h[7] = pws->h[2];
@@ -4838,7 +4838,7 @@ void helper_msa_pckod_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[1] = pwt->w[0];
pwd->w[3] = pws->w[0];
pwd->w[0] = pwt->w[2];
@@ -5926,7 +5926,7 @@ void helper_msa_copy_s_b(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 16;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 8) {
n = 8 - n - 1;
} else {
@@ -5940,7 +5940,7 @@ void helper_msa_copy_s_h(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 8;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 4) {
n = 4 - n - 1;
} else {
@@ -5954,7 +5954,7 @@ void helper_msa_copy_s_w(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 4;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 2) {
n = 2 - n - 1;
} else {
@@ -5975,7 +5975,7 @@ void helper_msa_copy_u_b(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 16;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 8) {
n = 8 - n - 1;
} else {
@@ -5989,7 +5989,7 @@ void helper_msa_copy_u_h(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 8;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 4) {
n = 4 - n - 1;
} else {
@@ -6003,7 +6003,7 @@ void helper_msa_copy_u_w(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 4;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 2) {
n = 2 - n - 1;
} else {
@@ -6019,7 +6019,7 @@ void helper_msa_insert_b(CPUMIPSState *env, uint32_t wd,
wr_t *pwd = &(env->active_fpu.fpr[wd].wr);
target_ulong rs = env->active_tc.gpr[rs_num];
n %= 16;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 8) {
n = 8 - n - 1;
} else {
@@ -6035,7 +6035,7 @@ void helper_msa_insert_h(CPUMIPSState *env, uint32_t wd,
wr_t *pwd = &(env->active_fpu.fpr[wd].wr);
target_ulong rs = env->active_tc.gpr[rs_num];
n %= 8;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 4) {
n = 4 - n - 1;
} else {
@@ -6051,7 +6051,7 @@ void helper_msa_insert_w(CPUMIPSState *env, uint32_t wd,
wr_t *pwd = &(env->active_fpu.fpr[wd].wr);
target_ulong rs = env->active_tc.gpr[rs_num];
n %= 4;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 2) {
n = 2 - n - 1;
} else {
diff --git a/target/ppc/arch_dump.c b/target/ppc/arch_dump.c
index 993740897d83..1139cead9fed 100644
--- a/target/ppc/arch_dump.c
+++ b/target/ppc/arch_dump.c
@@ -161,7 +161,7 @@ static void ppc_write_elf_vmxregset(NoteFuncArg *arg, PowerPCCPU *cpu)
bool needs_byteswap;
ppc_avr_t *avr = cpu_avr_ptr(&cpu->env, i);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
needs_byteswap = s->dump_info.d_endian == ELFDATA2LSB;
#else
needs_byteswap = s->dump_info.d_endian == ELFDATA2MSB;
diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c
index 492f34c4992b..8c1674510bb3 100644
--- a/target/ppc/int_helper.c
+++ b/target/ppc/int_helper.c
@@ -425,7 +425,7 @@ uint64_t helper_PEXTD(uint64_t src, uint64_t mask)
/*****************************************************************************/
/* Altivec extension helpers */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VECTOR_FOR_INORDER_I(index, element) \
for (index = 0; index < ARRAY_SIZE(r->element); index++)
#else
@@ -1177,7 +1177,7 @@ XXGENPCV(XXGENPCVDM, 8)
#undef XXGENPCV_LE_COMP
#undef XXGENPCV
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VBPERMQ_INDEX(avr, i) ((avr)->u8[(i)])
#define VBPERMD_INDEX(i) (i)
#define VBPERMQ_DW(index) (((index) & 0x40) != 0)
@@ -1298,7 +1298,7 @@ void helper_vpmsumd(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
}
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define PKBIG 1
#else
#define PKBIG 0
@@ -1307,7 +1307,7 @@ void helper_vpkpx(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
{
int i, j;
ppc_avr_t result;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
const ppc_avr_t *x[2] = { a, b };
#else
const ppc_avr_t *x[2] = { b, a };
@@ -1516,7 +1516,7 @@ void helper_vslo(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
{
int sh = (b->VsrB(0xf) >> 3) & 0xf;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
memmove(&r->u8[0], &a->u8[sh], 16 - sh);
memset(&r->u8[16 - sh], 0, sh);
#else
@@ -1525,7 +1525,7 @@ void helper_vslo(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
#endif
}
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define ELEM_ADDR(VEC, IDX, SIZE) (&(VEC)->u8[IDX])
#else
#define ELEM_ADDR(VEC, IDX, SIZE) (&(VEC)->u8[15 - (IDX)] - (SIZE) + 1)
@@ -1554,7 +1554,7 @@ VINSX(W, uint32_t)
VINSX(D, uint64_t)
#undef ELEM_ADDR
#undef VINSX
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VEXTDVLX(NAME, SIZE) \
void helper_##NAME(CPUPPCState *env, ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, \
target_ulong index) \
@@ -1593,7 +1593,7 @@ VEXTDVLX(VEXTDUHVLX, 2)
VEXTDVLX(VEXTDUWVLX, 4)
VEXTDVLX(VEXTDDVLX, 8)
#undef VEXTDVLX
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VEXTRACT(suffix, element) \
void helper_vextract##suffix(ppc_avr_t *r, ppc_avr_t *b, uint32_t index) \
{ \
@@ -1750,7 +1750,7 @@ void helper_vsro(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
{
int sh = (b->VsrB(0xf) >> 3) & 0xf;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
memmove(&r->u8[sh], &a->u8[0], 16 - sh);
memset(&r->u8[0], 0, sh);
#else
@@ -1867,7 +1867,7 @@ void helper_vsum4ubs(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
}
}
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define UPKHI 1
#define UPKLO 0
#else
@@ -1974,7 +1974,7 @@ VGENERIC_DO(popcntd, u64)
#undef VGENERIC_DO
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define QW_ONE { .u64 = { 0, 1 } }
#else
#define QW_ONE { .u64 = { 1, 0 } }
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index dc93b99189ea..d1f07c4f41d4 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -632,7 +632,7 @@ static int kvm_put_fp(CPUState *cs)
uint64_t *fpr = cpu_fpr_ptr(&cpu->env, i);
uint64_t *vsrl = cpu_vsrl_ptr(&cpu->env, i);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
vsr[0] = float64_val(*fpr);
vsr[1] = *vsrl;
#else
@@ -710,7 +710,7 @@ static int kvm_get_fp(CPUState *cs)
strerror(errno));
return ret;
} else {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
*fpr = vsr[0];
if (vsx) {
*vsrl = vsr[1];
diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c
index 39945d9ea585..f1c76a7750ab 100644
--- a/target/ppc/mem_helper.c
+++ b/target/ppc/mem_helper.c
@@ -461,7 +461,7 @@ uint32_t helper_stqcx_be_parallel(CPUPPCState *env, target_ulong addr,
/*****************************************************************************/
/* Altivec extension helpers */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define HI_IDX 0
#define LO_IDX 1
#else
diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
index 3bd4aac9c970..7a6ce0a3bc7d 100644
--- a/target/riscv/vector_helper.c
+++ b/target/riscv/vector_helper.c
@@ -79,7 +79,7 @@ target_ulong HELPER(vsetvl)(CPURISCVState *env, target_ulong s1,
* Note that vector data is stored in host-endian 64-bit chunks,
* so addressing units smaller than that needs a host-endian fixup.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define H1(x) ((x) ^ 7)
#define H1_2(x) ((x) ^ 6)
#define H1_4(x) ((x) ^ 4)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 5acfc0ff9b4e..80f1f0be9aba 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -263,7 +263,7 @@ static inline int vec_reg_offset(uint8_t reg, uint8_t enr, MemOp es)
* 16 byte operations to handle it in a special way.
*/
g_assert(es <= MO_64);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
offs ^= (8 - bytes);
#endif
return offs + vec_full_reg_offset(reg);
diff --git a/target/sparc/vis_helper.c b/target/sparc/vis_helper.c
index f917e5992dc7..3afdc6975cff 100644
--- a/target/sparc/vis_helper.c
+++ b/target/sparc/vis_helper.c
@@ -42,7 +42,7 @@ target_ulong helper_array8(target_ulong pixel_addr, target_ulong cubesize)
GET_FIELD_SP(pixel_addr, 11, 12);
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define VIS_B64(n) b[7 - (n)]
#define VIS_W64(n) w[3 - (n)]
#define VIS_SW64(n) sw[3 - (n)]
@@ -470,7 +470,7 @@ uint64_t helper_bshuffle(uint64_t gsr, uint64_t src1, uint64_t src2)
uint32_t i, mask, host;
/* Set up S such that we can index across all of the bytes. */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
s.ll[0] = src1;
s.ll[1] = src2;
host = 0;
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 65e1c94c2d5c..5d48537927b5 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -1156,7 +1156,7 @@ void tcg_gen_ld_i64(TCGv_i64 ret, TCGv_ptr arg2, tcg_target_long offset)
{
/* Since arg2 and ret have different types,
they cannot be the same temporary */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
tcg_gen_ld_i32(TCGV_HIGH(ret), arg2, offset);
tcg_gen_ld_i32(TCGV_LOW(ret), arg2, offset + 4);
#else
@@ -1167,7 +1167,7 @@ void tcg_gen_ld_i64(TCGv_i64 ret, TCGv_ptr arg2, tcg_target_long offset)
void tcg_gen_st_i64(TCGv_i64 arg1, TCGv_ptr arg2, tcg_target_long offset)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
tcg_gen_st_i32(TCGV_HIGH(arg1), arg2, offset);
tcg_gen_st_i32(TCGV_LOW(arg1), arg2, offset + 4);
#else
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 33a97eabdb83..f8542529d030 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -51,7 +51,7 @@
#else
# define ELF_CLASS ELFCLASS64
#endif
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define ELF_DATA ELFDATA2MSB
#else
# define ELF_DATA ELFDATA2LSB
@@ -883,7 +883,7 @@ TCGTemp *tcg_global_mem_new_internal(TCGType type, TCGv_ptr base,
TCGTemp *base_ts = tcgv_ptr_temp(base);
TCGTemp *ts = tcg_global_alloc(s);
int indirect_reg = 0, bigendian = 0;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
bigendian = 1;
#endif
@@ -1547,7 +1547,7 @@ void tcg_gen_callN(void *func, TCGTemp *ret, int nargs, TCGTemp **args)
}
#else
if (TCG_TARGET_REG_BITS < 64 && (typemask & 6) == dh_typecode_i64) {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
op->args[pi++] = temp_arg(ret + 1);
op->args[pi++] = temp_arg(ret);
#else
@@ -1600,7 +1600,7 @@ void tcg_gen_callN(void *func, TCGTemp *ret, int nargs, TCGTemp **args)
* have to get more complicated to differentiate between
* stack arguments and register arguments.
*/
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TCG_TARGET_STACK_GROWSUP)
+#if HOST_BIG_ENDIAN != defined(TCG_TARGET_STACK_GROWSUP)
op->args[pi++] = temp_arg(args[i] + 1);
op->args[pi++] = temp_arg(args[i]);
#else
@@ -3598,7 +3598,7 @@ static void tcg_reg_alloc_dup(TCGContext *s, const TCGOp *op)
/* fall through */
case TEMP_VAL_MEM:
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
endian_fixup = itype == TCG_TYPE_I32 ? 4 : 8;
endian_fixup -= 1 << vece;
#else
@@ -3879,7 +3879,7 @@ static bool tcg_reg_alloc_dup2(TCGContext *s, const TCGOp *op)
if (!itsh->mem_coherent) {
temp_sync(s, itsh, s->reserved_regs, 0, 0);
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
TCGTemp *its = itsh;
#else
TCGTemp *its = itsl;
diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk-test.c
index 62e670f39be0..659b5050d8af 100644
--- a/tests/qtest/vhost-user-blk-test.c
+++ b/tests/qtest/vhost-user-blk-test.c
@@ -37,7 +37,7 @@ typedef struct QVirtioBlkReq {
uint8_t status;
} QVirtioBlkReq;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
static const bool host_is_big_endian = true;
#else
static const bool host_is_big_endian; /* false */
diff --git a/tests/qtest/virtio-blk-test.c b/tests/qtest/virtio-blk-test.c
index 2a236982118f..f22594a1a823 100644
--- a/tests/qtest/virtio-blk-test.c
+++ b/tests/qtest/virtio-blk-test.c
@@ -33,7 +33,7 @@ typedef struct QVirtioBlkReq {
} QVirtioBlkReq;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
const bool host_is_big_endian = true;
#else
const bool host_is_big_endian; /* false */
diff --git a/ui/vdagent.c b/ui/vdagent.c
index 7ea4bc5d9a26..02861edfb13c 100644
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -664,7 +664,7 @@ static void vdagent_chr_open(Chardev *chr,
VDAgentChardev *vd = QEMU_VDAGENT_CHARDEV(chr);
ChardevQemuVDAgent *cfg = backend->u.qemu_vdagent.data;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
/*
* TODO: vdagent protocol is defined to be LE,
* so we have to byteswap everything on BE hosts.
diff --git a/ui/vnc.c b/ui/vnc.c
index 310a873c2184..5cbeebb8d1fd 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2340,7 +2340,7 @@ static void pixel_format_message (VncState *vs) {
vnc_write_u8(vs, vs->client_pf.bits_per_pixel); /* bits-per-pixel */
vnc_write_u8(vs, vs->client_pf.depth); /* depth */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
vnc_write_u8(vs, 1); /* big-endian-flag */
#else
vnc_write_u8(vs, 0); /* big-endian-flag */
diff --git a/util/bitmap.c b/util/bitmap.c
index 1f201393aef1..f81d8057a7e6 100644
--- a/util/bitmap.c
+++ b/util/bitmap.c
@@ -376,7 +376,7 @@ static void bitmap_to_from_le(unsigned long *dst,
{
long len = BITS_TO_LONGS(nbits);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
long index;
for (index = 0; index < len; index++) {
diff --git a/util/host-utils.c b/util/host-utils.c
index bcc772b8ec95..96d5dc0bed25 100644
--- a/util/host-utils.c
+++ b/util/host-utils.c
@@ -34,7 +34,7 @@ static inline void mul64(uint64_t *plow, uint64_t *phigh,
typedef union {
uint64_t ll;
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t high, low;
#else
uint32_t low, high;
diff --git a/target/ppc/translate/vmx-impl.c.inc b/target/ppc/translate/vmx-impl.c.inc
index 6101bca3fd7a..764ac45409ae 100644
--- a/target/ppc/translate/vmx-impl.c.inc
+++ b/target/ppc/translate/vmx-impl.c.inc
@@ -173,7 +173,7 @@ static void gen_mtvscr(DisasContext *ctx)
val = tcg_temp_new_i32();
bofs = avr_full_offset(rB(ctx->opcode));
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
bofs += 3 * 4;
#endif
@@ -1692,7 +1692,7 @@ static void gen_vsplt(DisasContext *ctx, int vece)
/* Experimental testing shows that hardware masks the immediate. */
bofs += (uimm << vece) & 15;
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
bofs ^= 15;
bofs &= ~((1 << vece) - 1);
#endif
diff --git a/target/ppc/translate/vsx-impl.c.inc b/target/ppc/translate/vsx-impl.c.inc
index e67fbf2bb8ed..c4cc01239ea3 100644
--- a/target/ppc/translate/vsx-impl.c.inc
+++ b/target/ppc/translate/vsx-impl.c.inc
@@ -1552,7 +1552,7 @@ static bool trans_XXSPLTW(DisasContext *ctx, arg_XX2_uim2 *a)
tofs = vsr_full_offset(a->xt);
bofs = vsr_full_offset(a->xb);
bofs += a->uim << MO_32;
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
bofs ^= 8 | 4;
#endif
diff --git a/target/riscv/insn_trans/trans_rvv.c.inc b/target/riscv/insn_trans/trans_rvv.c.inc
index 275fded6e43b..04b55e5040ba 100644
--- a/target/riscv/insn_trans/trans_rvv.c.inc
+++ b/target/riscv/insn_trans/trans_rvv.c.inc
@@ -3288,7 +3288,7 @@ static void load_element(TCGv_i64 dest, TCGv_ptr base,
/* offset of the idx element with base regsiter r */
static uint32_t endian_ofs(DisasContext *s, int r, int idx)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return vreg_ofs(s, r) + ((idx ^ (7 >> s->sew)) << s->sew);
#else
return vreg_ofs(s, r) + (idx << s->sew);
@@ -3298,7 +3298,7 @@ static uint32_t endian_ofs(DisasContext *s, int r, int idx)
/* adjust the index according to the endian */
static void endian_adjust(TCGv_i32 ofs, int sew)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
tcg_gen_xori_i32(ofs, ofs, 7 >> sew);
#endif
}
diff --git a/target/s390x/tcg/translate_vx.c.inc b/target/s390x/tcg/translate_vx.c.inc
index 98eb7710a4a9..b829ce0c7c79 100644
--- a/target/s390x/tcg/translate_vx.c.inc
+++ b/target/s390x/tcg/translate_vx.c.inc
@@ -175,7 +175,7 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8_t reg, TCGv_i64 enr,
/* convert it to an element offset relative to cpu_env (vec_reg_offset() */
tcg_gen_shli_i64(tmp, tmp, es);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
tcg_gen_xori_i64(tmp, tmp, 8 - NUM_VEC_ELEMENT_BYTES(es));
#endif
tcg_gen_addi_i64(tmp, tmp, vec_full_reg_offset(reg));
diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
index 077fc5140154..eb38113a70af 100644
--- a/tcg/aarch64/tcg-target.c.inc
+++ b/tcg/aarch64/tcg-target.c.inc
@@ -1557,7 +1557,7 @@ static void tcg_out_adr(TCGContext *s, TCGReg rd, const void *target)
*/
static void * const qemu_ld_helpers[MO_SIZE + 1] = {
[MO_8] = helper_ret_ldub_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_16] = helper_be_lduw_mmu,
[MO_32] = helper_be_ldul_mmu,
[MO_64] = helper_be_ldq_mmu,
@@ -1574,7 +1574,7 @@ static void * const qemu_ld_helpers[MO_SIZE + 1] = {
*/
static void * const qemu_st_helpers[MO_SIZE + 1] = {
[MO_8] = helper_ret_stb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_16] = helper_be_stw_mmu,
[MO_32] = helper_be_stl_mmu,
[MO_64] = helper_be_stq_mmu,
diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc
index 4bc0420f4d2f..2c6c353eea2b 100644
--- a/tcg/arm/tcg-target.c.inc
+++ b/tcg/arm/tcg-target.c.inc
@@ -1296,7 +1296,7 @@ static void tcg_out_vldst(TCGContext *s, ARMInsn insn,
static void * const qemu_ld_helpers[MO_SSIZE + 1] = {
[MO_UB] = helper_ret_ldub_mmu,
[MO_SB] = helper_ret_ldsb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_UW] = helper_be_lduw_mmu,
[MO_UL] = helper_be_ldul_mmu,
[MO_UQ] = helper_be_ldq_mmu,
@@ -1316,7 +1316,7 @@ static void * const qemu_ld_helpers[MO_SSIZE + 1] = {
*/
static void * const qemu_st_helpers[MO_SIZE + 1] = {
[MO_8] = helper_ret_stb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_16] = helper_be_stw_mmu,
[MO_32] = helper_be_stl_mmu,
[MO_64] = helper_be_stq_mmu,
diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc
index 993149d18a56..bd76f0c97f15 100644
--- a/tcg/mips/tcg-target.c.inc
+++ b/tcg/mips/tcg-target.c.inc
@@ -26,7 +26,7 @@
#include "../tcg-ldst.c.inc"
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define MIPS_BE 1
#else
# define MIPS_BE 0
diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
index 1f3c5c171cb7..cfcd121f9c23 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -1864,7 +1864,7 @@ void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx,
i1 = ADDIS | TAI(TCG_REG_TB, TCG_REG_TB, hi >> 16);
i2 = ADDI | TAI(TCG_REG_TB, TCG_REG_TB, lo);
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
pair = (uint64_t)i1 << 32 | i2;
#else
pair = (uint64_t)i2 << 32 | i1;
@@ -3235,7 +3235,7 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
tcg_out_mem_long(s, 0, LVEBX, out, base, offset);
}
elt = extract32(offset, 0, 4);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
elt ^= 15;
#endif
tcg_out32(s, VSPLTB | VRT(out) | VRB(out) | (elt << 16));
@@ -3248,7 +3248,7 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
tcg_out_mem_long(s, 0, LVEHX, out, base, offset);
}
elt = extract32(offset, 1, 3);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
elt ^= 7;
#endif
tcg_out32(s, VSPLTH | VRT(out) | VRB(out) | (elt << 16));
@@ -3261,7 +3261,7 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
tcg_debug_assert((offset & 3) == 0);
tcg_out_mem_long(s, 0, LVEWX, out, base, offset);
elt = extract32(offset, 2, 2);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
elt ^= 3;
#endif
tcg_out32(s, VSPLTW | VRT(out) | VRB(out) | (elt << 16));
@@ -3275,7 +3275,7 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
tcg_out_mem_long(s, 0, LVX, out, base, offset & -16);
tcg_out_vsldoi(s, TCG_VEC_TMP1, out, out, 8);
elt = extract32(offset, 3, 1);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
elt = !elt;
#endif
if (elt) {
diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc
index 6409d9c3d54f..81a83e45b156 100644
--- a/tcg/riscv/tcg-target.c.inc
+++ b/tcg/riscv/tcg-target.c.inc
@@ -854,7 +854,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0)
static void * const qemu_ld_helpers[MO_SSIZE + 1] = {
[MO_UB] = helper_ret_ldub_mmu,
[MO_SB] = helper_ret_ldsb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_UW] = helper_be_lduw_mmu,
[MO_SW] = helper_be_ldsw_mmu,
[MO_UL] = helper_be_ldul_mmu,
@@ -879,7 +879,7 @@ static void * const qemu_ld_helpers[MO_SSIZE + 1] = {
*/
static void * const qemu_st_helpers[MO_SIZE + 1] = {
[MO_8] = helper_ret_stb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_16] = helper_be_stw_mmu,
[MO_32] = helper_be_stl_mmu,
[MO_64] = helper_be_stq_mmu,
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 06/32] Replace config-time define HOST_WORDS_BIGENDIAN
@ 2022-03-23 15:57 ` marcandre.lureau
0 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Dmitry Fleytman, open list:Overall KVM CPUs,
Michael S. Tsirkin, Jason Wang, Bin Meng, Mark Cave-Ayland,
Thomas Huth, Peter Xu, Laurent Vivier, Yanan Wang, Max Filippov,
Alistair Francis, Gerd Hoffmann, Daniel Henrique Barboza,
Vikram Garhwal, open list:virtio-blk, David Hildenbrand,
Halil Pasic, Marc-André Lureau, Christian Borntraeger,
Artyom Tarasenko, Pavel Pisa, Huacai Chen, Eric Farman,
Richard Henderson, Greg Kurz, open list:S390 SCLP-backed...,
open list:ARM PrimeCell and...,
Stefan Hajnoczi, open list:PowerPC TCG CPUs, Alex Bennée,
David Gibson, Eduardo Habkost, open list:RISC-V TCG CPUs,
Cornelia Huck, Philippe Mathieu-Daudé,
Coiby Xu, Palmer Dabbelt, Paolo Bonzini, Aleksandar Rikalo,
Aurelien Jarno, Cédric Le Goater
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Replace a config-time define with a compile time condition
define (compatible with clang and gcc) that must be declared prior to
its usage. This avoids having a global configure time define, but also
prevents from bad usage, if the config header wasn't included before.
This can help to make some code independent from qemu too.
gcc supports __BYTE_ORDER__ from about 4.6 and clang from 3.2.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
[ For the s390x parts I'm involved in ]
Acked-by: Halil Pasic <pasic@linux.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
meson.build | 1 -
accel/tcg/atomic_template.h | 4 +-
audio/audio.h | 2 +-
hw/display/pl110_template.h | 6 +--
hw/net/can/ctucan_core.h | 2 +-
hw/net/vmxnet3.h | 4 +-
include/exec/cpu-all.h | 7 ++--
include/exec/cpu-common.h | 2 +-
include/exec/memop.h | 2 +-
include/exec/memory.h | 2 +-
include/fpu/softfloat-types.h | 2 +-
include/hw/core/cpu.h | 2 +-
include/hw/i386/intel_iommu.h | 6 +--
include/hw/i386/x86-iommu.h | 4 +-
include/hw/virtio/virtio-access.h | 6 +--
include/hw/virtio/virtio-gpu-bswap.h | 2 +-
include/libdecnumber/dconfig.h | 2 +-
include/net/eth.h | 2 +-
include/qemu/bswap.h | 8 ++--
include/qemu/host-utils.h | 2 +-
include/qemu/int128.h | 2 +-
include/ui/qemu-pixman.h | 2 +-
net/util.h | 2 +-
target/arm/cpu.h | 8 ++--
target/arm/translate-a64.h | 2 +-
target/arm/vec_internal.h | 2 +-
target/i386/cpu.h | 2 +-
target/mips/cpu.h | 2 +-
target/ppc/cpu.h | 2 +-
target/s390x/tcg/vec.h | 2 +-
target/xtensa/cpu.h | 2 +-
tests/fp/platform.h | 4 +-
accel/kvm/kvm-all.c | 4 +-
audio/dbusaudio.c | 2 +-
disas.c | 2 +-
hw/core/loader.c | 4 +-
hw/display/artist.c | 6 +--
hw/display/pxa2xx_lcd.c | 2 +-
hw/display/vga.c | 12 +++---
hw/display/virtio-gpu-gl.c | 2 +-
hw/s390x/event-facility.c | 2 +-
hw/virtio/vhost.c | 2 +-
linux-user/arm/nwfpe/double_cpdo.c | 4 +-
linux-user/arm/nwfpe/fpa11_cpdt.c | 4 +-
linux-user/ppc/signal.c | 3 +-
linux-user/syscall.c | 6 +--
net/net.c | 4 +-
target/alpha/translate.c | 2 +-
target/arm/crypto_helper.c | 2 +-
target/arm/helper.c | 2 +-
target/arm/kvm64.c | 4 +-
target/arm/neon_helper.c | 2 +-
target/arm/sve_helper.c | 4 +-
target/arm/translate-sve.c | 6 +--
target/arm/translate-vfp.c | 2 +-
target/arm/translate.c | 2 +-
target/hppa/translate.c | 2 +-
target/i386/tcg/translate.c | 2 +-
target/mips/tcg/lmmi_helper.c | 2 +-
target/mips/tcg/msa_helper.c | 54 ++++++++++++-------------
target/ppc/arch_dump.c | 2 +-
target/ppc/int_helper.c | 22 +++++-----
target/ppc/kvm.c | 4 +-
target/ppc/mem_helper.c | 2 +-
target/riscv/vector_helper.c | 2 +-
target/s390x/tcg/translate.c | 2 +-
target/sparc/vis_helper.c | 4 +-
tcg/tcg-op.c | 4 +-
tcg/tcg.c | 12 +++---
tests/qtest/vhost-user-blk-test.c | 2 +-
tests/qtest/virtio-blk-test.c | 2 +-
ui/vdagent.c | 2 +-
ui/vnc.c | 2 +-
util/bitmap.c | 2 +-
util/host-utils.c | 2 +-
target/ppc/translate/vmx-impl.c.inc | 4 +-
target/ppc/translate/vsx-impl.c.inc | 2 +-
target/riscv/insn_trans/trans_rvv.c.inc | 4 +-
target/s390x/tcg/translate_vx.c.inc | 2 +-
tcg/aarch64/tcg-target.c.inc | 4 +-
tcg/arm/tcg-target.c.inc | 4 +-
tcg/mips/tcg-target.c.inc | 2 +-
tcg/ppc/tcg-target.c.inc | 10 ++---
tcg/riscv/tcg-target.c.inc | 4 +-
84 files changed, 173 insertions(+), 174 deletions(-)
diff --git a/meson.build b/meson.build
index dc17d37e461b..7828f6537813 100644
--- a/meson.build
+++ b/meson.build
@@ -1592,7 +1592,6 @@ config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2]
config_host_data.set_quoted('CONFIG_HOST_DSOSUF', host_dsosuf)
config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
-config_host_data.set('HOST_WORDS_BIGENDIAN', host_machine.endian() == 'big')
have_coroutine_pool = get_option('coroutine_pool')
if get_option('debug_stack_usage') and have_coroutine_pool
diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h
index fc165031e868..404a530f7c2a 100644
--- a/accel/tcg/atomic_template.h
+++ b/accel/tcg/atomic_template.h
@@ -63,7 +63,7 @@
the ATOMIC_NAME macro, and redefined below. */
#if DATA_SIZE == 1
# define END
-#elif defined(HOST_WORDS_BIGENDIAN)
+#elif HOST_BIG_ENDIAN
# define END _be
#else
# define END _le
@@ -196,7 +196,7 @@ GEN_ATOMIC_HELPER_FN(umax_fetch, MAX, DATA_TYPE, new)
/* Define reverse-host-endian atomic operations. Note that END is used
within the ATOMIC_NAME macro. */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define END _le
#else
# define END _be
diff --git a/audio/audio.h b/audio/audio.h
index cbb10f4816e5..3d5ecdecd5c1 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -32,7 +32,7 @@
typedef void (*audio_callback_fn) (void *opaque, int avail);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define AUDIO_HOST_ENDIANNESS 1
#else
#define AUDIO_HOST_ENDIANNESS 0
diff --git a/hw/display/pl110_template.h b/hw/display/pl110_template.h
index 877419aa817a..00877853225d 100644
--- a/hw/display/pl110_template.h
+++ b/hw/display/pl110_template.h
@@ -15,18 +15,18 @@
#if ORDER == 0
#define NAME glue(lblp_, BORDER)
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define SWAP_WORDS 1
#endif
#elif ORDER == 1
#define NAME glue(bbbp_, BORDER)
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
#define SWAP_WORDS 1
#endif
#else
#define SWAP_PIXELS 1
#define NAME glue(lbbp_, BORDER)
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define SWAP_WORDS 1
#endif
#endif
diff --git a/hw/net/can/ctucan_core.h b/hw/net/can/ctucan_core.h
index bbc09ae06785..608307a6310c 100644
--- a/hw/net/can/ctucan_core.h
+++ b/hw/net/can/ctucan_core.h
@@ -31,7 +31,7 @@
#include "exec/hwaddr.h"
#include "net/can_emu.h"
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
#define __LITTLE_ENDIAN_BITFIELD 1
#endif
diff --git a/hw/net/vmxnet3.h b/hw/net/vmxnet3.h
index 5b3b76ba7ad1..bf4f6de74a07 100644
--- a/hw/net/vmxnet3.h
+++ b/hw/net/vmxnet3.h
@@ -35,7 +35,7 @@
#define __le32 uint32_t
#define __le64 uint64_t
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define __BIG_ENDIAN_BITFIELD
#else
#endif
@@ -800,7 +800,7 @@ struct Vmxnet3_DriverShared {
#undef __le16
#undef __le32
#undef __le64
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#undef __BIG_ENDIAN_BITFIELD
#endif
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index c0f0fab28a1f..f77070da5f7e 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -34,13 +34,14 @@
/* some important defines:
*
- * HOST_WORDS_BIGENDIAN : if defined, the host cpu is big endian and
+ * HOST_BIG_ENDIAN : whether the host cpu is big endian and
* otherwise little endian.
*
- * TARGET_WORDS_BIGENDIAN : same for target cpu
+ * TARGET_WORDS_BIGENDIAN : if defined, the host cpu is big endian and otherwise
+ * little endian.
*/
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
#define BSWAP_NEEDED
#endif
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 50a7d2912e0b..c7d50fac955c 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -46,7 +46,7 @@ enum device_endian {
DEVICE_LITTLE_ENDIAN,
};
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define DEVICE_HOST_ENDIAN DEVICE_BIG_ENDIAN
#else
#define DEVICE_HOST_ENDIAN DEVICE_LITTLE_ENDIAN
diff --git a/include/exec/memop.h b/include/exec/memop.h
index 2a885f3917b4..44f923ed4660 100644
--- a/include/exec/memop.h
+++ b/include/exec/memop.h
@@ -28,7 +28,7 @@ typedef enum MemOp {
MO_SIGN = 0x08, /* Sign-extended, otherwise zero-extended. */
MO_BSWAP = 0x10, /* Host reverse endian. */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
MO_LE = MO_BSWAP,
MO_BE = 0,
#else
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 4d5997e6bbae..e40653f0d19e 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -2931,7 +2931,7 @@ static inline MemOp devend_memop(enum device_endian end)
QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN &&
DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN);
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
/* Swap if non-host endianness or native (target) endianness */
return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP;
#else
diff --git a/include/fpu/softfloat-types.h b/include/fpu/softfloat-types.h
index 8abd9ab4ec9c..7a6ea881d83e 100644
--- a/include/fpu/softfloat-types.h
+++ b/include/fpu/softfloat-types.h
@@ -103,7 +103,7 @@ typedef struct {
#define make_floatx80(exp, mant) ((floatx80) { mant, exp })
#define make_floatx80_init(exp, mant) { .low = mant, .high = exp }
typedef struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t high, low;
#else
uint64_t low, high;
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 136973655c1a..b0e2e5b9d253 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -187,7 +187,7 @@ struct CPUClass {
typedef union IcountDecr {
uint32_t u32;
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint16_t high;
uint16_t low;
#else
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index 3b5ac869db6e..bfa982a41957 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -145,7 +145,7 @@ enum {
/* Interrupt Remapping Table Entry Definition */
union VTD_IR_TableEntry {
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t __reserved_1:8; /* Reserved 1 */
uint32_t vector:8; /* Interrupt Vector */
uint32_t irte_mode:1; /* IRTE Mode */
@@ -172,7 +172,7 @@ union VTD_IR_TableEntry {
#endif
uint32_t dest_id; /* Destination ID */
uint16_t source_id; /* Source-ID */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t __reserved_2:44; /* Reserved 2 */
uint64_t sid_vtype:2; /* Source-ID Validation Type */
uint64_t sid_q:2; /* Source-ID Qualifier */
@@ -191,7 +191,7 @@ union VTD_IR_TableEntry {
/* Programming format for MSI/MSI-X addresses */
union VTD_IR_MSIAddress {
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t __head:12; /* Should always be: 0x0fee */
uint32_t index_l:15; /* Interrupt index bit 14-0 */
uint32_t int_mode:1; /* Interrupt format */
diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h
index 5ba0c056d60c..7637edb430a4 100644
--- a/include/hw/i386/x86-iommu.h
+++ b/include/hw/i386/x86-iommu.h
@@ -87,7 +87,7 @@ struct X86IOMMUIrq {
struct X86IOMMU_MSIMessage {
union {
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t __addr_head:12; /* 0xfee */
uint32_t dest:8;
uint32_t __reserved:8;
@@ -108,7 +108,7 @@ struct X86IOMMU_MSIMessage {
};
union {
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint16_t trigger_mode:1;
uint16_t level:1;
uint16_t __resved:3;
diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h
index 6818a23a2d35..90cbb77782b5 100644
--- a/include/hw/virtio/virtio-access.h
+++ b/include/hw/virtio/virtio-access.h
@@ -149,7 +149,7 @@ static inline uint64_t virtio_ldq_p(VirtIODevice *vdev, const void *ptr)
static inline uint16_t virtio_tswap16(VirtIODevice *vdev, uint16_t s)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return virtio_access_is_big_endian(vdev) ? s : bswap16(s);
#else
return virtio_access_is_big_endian(vdev) ? bswap16(s) : s;
@@ -215,7 +215,7 @@ static inline void virtio_tswap16s(VirtIODevice *vdev, uint16_t *s)
static inline uint32_t virtio_tswap32(VirtIODevice *vdev, uint32_t s)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return virtio_access_is_big_endian(vdev) ? s : bswap32(s);
#else
return virtio_access_is_big_endian(vdev) ? bswap32(s) : s;
@@ -229,7 +229,7 @@ static inline void virtio_tswap32s(VirtIODevice *vdev, uint32_t *s)
static inline uint64_t virtio_tswap64(VirtIODevice *vdev, uint64_t s)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return virtio_access_is_big_endian(vdev) ? s : bswap64(s);
#else
return virtio_access_is_big_endian(vdev) ? bswap64(s) : s;
diff --git a/include/hw/virtio/virtio-gpu-bswap.h b/include/hw/virtio/virtio-gpu-bswap.h
index 5faac0d8d5f3..912410848597 100644
--- a/include/hw/virtio/virtio-gpu-bswap.h
+++ b/include/hw/virtio/virtio-gpu-bswap.h
@@ -29,7 +29,7 @@ virtio_gpu_ctrl_hdr_bswap(struct virtio_gpu_ctrl_hdr *hdr)
static inline void
virtio_gpu_bswap_32(void *ptr, size_t size)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
size_t i;
struct virtio_gpu_ctrl_hdr *hdr = (struct virtio_gpu_ctrl_hdr *) ptr;
diff --git a/include/libdecnumber/dconfig.h b/include/libdecnumber/dconfig.h
index 0f7dccef1f4e..2bc0ba7f1444 100644
--- a/include/libdecnumber/dconfig.h
+++ b/include/libdecnumber/dconfig.h
@@ -28,7 +28,7 @@
02110-1301, USA. */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define WORDS_BIGENDIAN 1
#else
#define WORDS_BIGENDIAN 0
diff --git a/include/net/eth.h b/include/net/eth.h
index 7767ae880ecc..6e699b0d7a4a 100644
--- a/include/net/eth.h
+++ b/include/net/eth.h
@@ -159,7 +159,7 @@ struct tcp_hdr {
u_short th_dport; /* destination port */
uint32_t th_seq; /* sequence number */
uint32_t th_ack; /* acknowledgment number */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
u_char th_off : 4, /* data offset */
th_x2:4; /* (unused) */
#else
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 2d3bb8bbedda..9dff7c7dbbc9 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -84,7 +84,7 @@ static inline void bswap64s(uint64_t *s)
*s = bswap64(*s);
}
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define be_bswap(v, size) (v)
#define le_bswap(v, size) glue(bswap, size)(v)
#define be_bswaps(v, size)
@@ -188,7 +188,7 @@ CPU_CONVERT(le, 64, uint64_t)
* a compile-time constant if you pass in a constant. So this can be
* used to initialize static variables.
*/
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
# define const_le32(_x) \
((((_x) & 0x000000ffU) << 24) | \
(((_x) & 0x0000ff00U) << 8) | \
@@ -211,7 +211,7 @@ typedef union {
typedef union {
float64 d;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
struct {
uint32_t upper;
uint32_t lower;
@@ -235,7 +235,7 @@ typedef union {
typedef union {
float128 q;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
struct {
uint32_t upmost;
uint32_t upper;
diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h
index ca979dc6ccde..f19bd2910563 100644
--- a/include/qemu/host-utils.h
+++ b/include/qemu/host-utils.h
@@ -88,7 +88,7 @@ static inline uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
union {
uint64_t ll;
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t high, low;
#else
uint32_t low, high;
diff --git a/include/qemu/int128.h b/include/qemu/int128.h
index 2c4064256cdf..37e07fd6dd92 100644
--- a/include/qemu/int128.h
+++ b/include/qemu/int128.h
@@ -205,7 +205,7 @@ typedef struct Int128 Int128;
* a union with other integer types).
*/
struct Int128 {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
int64_t hi;
uint64_t lo;
#else
diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h
index 806ddcd7cdab..0c775604d173 100644
--- a/include/ui/qemu-pixman.h
+++ b/include/ui/qemu-pixman.h
@@ -19,7 +19,7 @@
* feeding libjpeg / libpng and writing screenshots.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define PIXMAN_BE_r8g8b8 PIXMAN_r8g8b8
# define PIXMAN_BE_x8r8g8b8 PIXMAN_x8r8g8b8
# define PIXMAN_BE_a8r8g8b8 PIXMAN_a8r8g8b8
diff --git a/net/util.h b/net/util.h
index 358185fd5034..288312979f09 100644
--- a/net/util.h
+++ b/net/util.h
@@ -30,7 +30,7 @@
* Structure of an internet header, naked of options.
*/
struct ip {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint8_t ip_v:4, /* version */
ip_hl:4; /* header length */
#else
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 23879de5fa7f..816aa0394e9f 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -95,7 +95,7 @@ enum {
* therefore useful to be able to pass TCG the offset of the least
* significant half of a uint64_t struct member.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define offsetoflow32(S, M) (offsetof(S, M) + sizeof(uint32_t))
#define offsetofhigh32(S, M) offsetof(S, M)
#else
@@ -382,7 +382,7 @@ typedef struct CPUArchState {
union { /* Fault address registers. */
struct {
uint64_t _unused_far0;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t ifar_ns;
uint32_t dfar_ns;
uint32_t ifar_s;
@@ -419,7 +419,7 @@ typedef struct CPUArchState {
uint64_t c9_pminten; /* perf monitor interrupt enables */
union { /* Memory attribute redirection */
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t _unused_mair_0;
uint32_t mair1_ns;
uint32_t mair0_ns;
@@ -1093,7 +1093,7 @@ void aarch64_add_pauth_properties(Object *obj);
*/
static inline uint64_t *sve_bswap64(uint64_t *dst, uint64_t *src, int nr)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
int i;
for (i = 0; i < nr; ++i) {
diff --git a/target/arm/translate-a64.h b/target/arm/translate-a64.h
index 58f50abca469..38884158aab3 100644
--- a/target/arm/translate-a64.h
+++ b/target/arm/translate-a64.h
@@ -71,7 +71,7 @@ static inline int vec_reg_offset(DisasContext *s, int regno,
{
int element_size = 1 << size;
int offs = element * element_size;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
/* This is complicated slightly because vfp.zregs[n].d[0] is
* still the lowest and vfp.zregs[n].d[15] the highest of the
* 256 byte vector, even on big endian systems.
diff --git a/target/arm/vec_internal.h b/target/arm/vec_internal.h
index 2a3355829068..fb43a2380e21 100644
--- a/target/arm/vec_internal.h
+++ b/target/arm/vec_internal.h
@@ -29,7 +29,7 @@
* The H1_<N> macros are used when performing byte arithmetic and then
* casting the final pointer to a type of size N.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define H1(x) ((x) ^ 7)
#define H1_2(x) ((x) ^ 6)
#define H1_4(x) ((x) ^ 4)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 5e406088a91a..5124c1e307b5 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1246,7 +1246,7 @@ typedef struct BNDCSReg {
#define BNDCFG_BNDPRESERVE 2ULL
#define BNDCFG_BDIR_MASK TARGET_PAGE_MASK
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define ZMM_B(n) _b_ZMMReg[63 - (n)]
#define ZMM_W(n) _w_ZMMReg[31 - (n)]
#define ZMM_L(n) _l_ZMMReg[15 - (n)]
diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index 52ce08a94d36..5335ac10a3dc 100644
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -35,7 +35,7 @@ union fpr_t {
*define FP_ENDIAN_IDX to access the same location
* in the fpr_t union regardless of the host endianness
*/
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
# define FP_ENDIAN_IDX 1
#else
# define FP_ENDIAN_IDX 0
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 047b24ba50ea..627e574127ba 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -2642,7 +2642,7 @@ static inline bool lsw_reg_in_range(int start, int nregs, int rx)
}
/* Accessors for FP, VMX and VSX registers */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VsrB(i) u8[i]
#define VsrSB(i) s8[i]
#define VsrH(i) u16[i]
diff --git a/target/s390x/tcg/vec.h b/target/s390x/tcg/vec.h
index a6e361869b2e..8d095efcfc6f 100644
--- a/target/s390x/tcg/vec.h
+++ b/target/s390x/tcg/vec.h
@@ -38,7 +38,7 @@ typedef union S390Vector {
* W: [ 1][ 0] - [ 3][ 2]
* DW: [ 0] - [ 1]
*/
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
#define H1(x) ((x) ^ 7)
#define H2(x) ((x) ^ 3)
#define H4(x) ((x) ^ 1)
diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index 4515f682aa26..a572e831aebf 100644
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -494,7 +494,7 @@ typedef struct XtensaConfigList {
struct XtensaConfigList *next;
} XtensaConfigList;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
enum {
FP_F32_HIGH,
FP_F32_LOW,
diff --git a/tests/fp/platform.h b/tests/fp/platform.h
index c20ba70baa07..6c72ad0cd05b 100644
--- a/tests/fp/platform.h
+++ b/tests/fp/platform.h
@@ -29,9 +29,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config-host.h"
+#include "qemu/compiler.h"
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
#define LITTLEENDIAN 1
/* otherwise do not define it */
#endif
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 5f1377ca048c..1c129dc90c8b 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1202,8 +1202,8 @@ void kvm_hwpoison_page_add(ram_addr_t ram_addr)
static uint32_t adjust_ioeventfd_endianness(uint32_t val, uint32_t size)
{
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
- /* The kernel expects ioeventfd values in HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+ /* The kernel expects ioeventfd values in HOST_BIG_ENDIAN
* endianness, but the memory core hands them in target endianness.
* For example, PPC is always treated as big-endian even if running
* on KVM and on PPC64LE. Correct here.
diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c
index f178b47deec1..a3d656d3b017 100644
--- a/audio/dbusaudio.c
+++ b/audio/dbusaudio.c
@@ -122,7 +122,7 @@ static size_t dbus_put_buffer_out(HWVoiceOut *hw, void *buf, size_t size)
return size;
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define AUDIO_HOST_BE TRUE
#else
#define AUDIO_HOST_BE FALSE
diff --git a/disas.c b/disas.c
index 3dab4482d1a1..2d2565ac5774 100644
--- a/disas.c
+++ b/disas.c
@@ -144,7 +144,7 @@ static void initialize_debug_host(CPUDebug *s)
s->info.read_memory_func = host_read_memory;
s->info.print_address_func = host_print_address;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
s->info.endian = BFD_ENDIAN_BIG;
#else
s->info.endian = BFD_ENDIAN_LITTLE;
diff --git a/hw/core/loader.c b/hw/core/loader.c
index ca2f2431fba7..8d9b2df6e725 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -474,7 +474,7 @@ ssize_t load_elf_ram_sym(const char *filename,
ret = ELF_LOAD_NOT_ELF;
goto fail;
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
data_order = ELFDATA2MSB;
#else
data_order = ELFDATA2LSB;
@@ -511,7 +511,7 @@ ssize_t load_elf_ram_sym(const char *filename,
static void bswap_uboot_header(uboot_image_header_t *hdr)
{
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
bswap32s(&hdr->ih_magic);
bswap32s(&hdr->ih_hcrc);
bswap32s(&hdr->ih_time);
diff --git a/hw/display/artist.c b/hw/display/artist.c
index 1d877998b9ae..69a8f9eea8ba 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -26,7 +26,7 @@
#define TYPE_ARTIST "artist"
OBJECT_DECLARE_SIMPLE_TYPE(ARTISTState, ARTIST)
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define ROP8OFF(_i) (3 - (_i))
#else
#define ROP8OFF
@@ -712,7 +712,7 @@ static void combine_write_reg(hwaddr addr, uint64_t val, int size, void *out)
* FIXME: is there a qemu helper for this?
*/
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
addr ^= 3;
#endif
@@ -1087,7 +1087,7 @@ static uint64_t combine_read_reg(hwaddr addr, int size, void *in)
* FIXME: is there a qemu helper for this?
*/
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
addr ^= 3;
#endif
diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c
index 0f06ed6e9f3d..7859c5d1cd86 100644
--- a/hw/display/pxa2xx_lcd.c
+++ b/hw/display/pxa2xx_lcd.c
@@ -199,7 +199,7 @@ typedef struct QEMU_PACKED {
SKIP_PIXEL(to); \
} while (0)
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define SWAP_WORDS 1
#endif
diff --git a/hw/display/vga.c b/hw/display/vga.c
index a7a291fa2089..737cfbde98ce 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -94,19 +94,19 @@ const uint8_t gr_mask[16] = {
(((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >> 8) | \
(((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) ))
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define PAT(x) cbswap_32(x)
#else
#define PAT(x) (x)
#endif
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define BIG 1
#else
#define BIG 0
#endif
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define GET_PLANE(data, p) (((data) >> (24 - (p) * 8)) & 0xff)
#else
#define GET_PLANE(data, p) (((data) >> ((p) * 8)) & 0xff)
@@ -133,7 +133,7 @@ static const uint32_t mask16[16] = {
#undef PAT
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define PAT(x) (x)
#else
#define PAT(x) cbswap_32(x)
@@ -1296,7 +1296,7 @@ static void vga_draw_text(VGACommonState *s, int full_update)
if (cx > cx_max)
cx_max = cx;
*ch_attr_ptr = ch_attr;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
ch = ch_attr >> 8;
cattr = ch_attr & 0xff;
#else
@@ -1477,7 +1477,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
vga_draw_line_func *vga_draw_line = NULL;
bool share_surface, force_shadow = false;
pixman_format_code_t format;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
bool byteswap = !s->big_endian_fb;
#else
bool byteswap = s->big_endian_fb;
diff --git a/hw/display/virtio-gpu-gl.c b/hw/display/virtio-gpu-gl.c
index 6cc4313b1af2..0bca8877035e 100644
--- a/hw/display/virtio-gpu-gl.c
+++ b/hw/display/virtio-gpu-gl.c
@@ -108,7 +108,7 @@ static void virtio_gpu_gl_device_realize(DeviceState *qdev, Error **errp)
{
VirtIOGPU *g = VIRTIO_GPU(qdev);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
error_setg(errp, "virgl is not supported on bigendian platforms");
return;
#endif
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 6fa47b889ca4..faa51aa4c70d 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -28,7 +28,7 @@ typedef struct SCLPEventsBus {
} SCLPEventsBus;
/* we need to save 32 bit chunks for compatibility */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define RECV_MASK_LOWER 1
#define RECV_MASK_UPPER 0
#else /* little endian host */
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index b643f42ea4ec..e55ac32bf3a9 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -989,7 +989,7 @@ static inline bool vhost_needs_vring_endian(VirtIODevice *vdev)
if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {
return false;
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return vdev->device_endian == VIRTIO_DEVICE_ENDIAN_LITTLE;
#else
return vdev->device_endian == VIRTIO_DEVICE_ENDIAN_BIG;
diff --git a/linux-user/arm/nwfpe/double_cpdo.c b/linux-user/arm/nwfpe/double_cpdo.c
index 1cef380852c9..d45ece2e2fe7 100644
--- a/linux-user/arm/nwfpe/double_cpdo.c
+++ b/linux-user/arm/nwfpe/double_cpdo.c
@@ -150,7 +150,7 @@ unsigned int DoubleCPDO(const unsigned int opcode)
case MNF_CODE:
{
unsigned int *p = (unsigned int*)&rFm;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
p[0] ^= 0x80000000;
#else
p[1] ^= 0x80000000;
@@ -162,7 +162,7 @@ unsigned int DoubleCPDO(const unsigned int opcode)
case ABS_CODE:
{
unsigned int *p = (unsigned int*)&rFm;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
p[0] &= 0x7fffffff;
#else
p[1] &= 0x7fffffff;
diff --git a/linux-user/arm/nwfpe/fpa11_cpdt.c b/linux-user/arm/nwfpe/fpa11_cpdt.c
index c32b0c2faac0..fee525937c55 100644
--- a/linux-user/arm/nwfpe/fpa11_cpdt.c
+++ b/linux-user/arm/nwfpe/fpa11_cpdt.c
@@ -44,7 +44,7 @@ void loadDouble(const unsigned int Fn, target_ulong addr)
unsigned int *p;
p = (unsigned int*)&fpa11->fpreg[Fn].fDouble;
fpa11->fType[Fn] = typeDouble;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
/* FIXME - handle failure of get_user() */
get_user_u32(p[0], addr); /* sign & exponent */
get_user_u32(p[1], addr + 4);
@@ -147,7 +147,7 @@ void storeDouble(const unsigned int Fn, target_ulong addr)
default: val = fpa11->fpreg[Fn].fDouble;
}
/* FIXME - handle put_user() failures */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
put_user_u32(p[0], addr); /* msw */
put_user_u32(p[1], addr + 4); /* lsw */
#else
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index ec0b9c0df3da..2550b8f8c069 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -215,8 +215,7 @@ static target_ulong get_sigframe(struct target_sigaction *ka,
return (oldsp - frame_size) & ~0xFUL;
}
-#if ((defined(TARGET_WORDS_BIGENDIAN) && defined(HOST_WORDS_BIGENDIAN)) || \
- (!defined(HOST_WORDS_BIGENDIAN) && !defined(TARGET_WORDS_BIGENDIAN)))
+#if defined(TARGET_WORDS_BIGENDIAN) == HOST_BIG_ENDIAN
#define PPC_VEC_HI 0
#define PPC_VEC_LO 1
#else
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 75ed71eb461d..7182dbd9796d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8152,7 +8152,7 @@ static int is_proc_myself(const char *filename, const char *entry)
return 0;
}
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) || \
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) || \
defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA)
static int is_proc(const char *filename, const char *entry)
{
@@ -8160,7 +8160,7 @@ static int is_proc(const char *filename, const char *entry)
}
#endif
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
static int open_net_route(void *cpu_env, int fd)
{
FILE *fp;
@@ -8246,7 +8246,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
{ "stat", open_self_stat, is_proc_myself },
{ "auxv", open_self_auxv, is_proc_myself },
{ "cmdline", open_self_cmdline, is_proc_myself },
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
{ "/proc/net/route", open_net_route, is_proc },
#endif
#if defined(TARGET_SPARC) || defined(TARGET_HPPA)
diff --git a/net/net.c b/net/net.c
index f0d14dbfc1f0..9f17ab204422 100644
--- a/net/net.c
+++ b/net/net.c
@@ -524,7 +524,7 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)
int qemu_set_vnet_le(NetClientState *nc, bool is_le)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
if (!nc || !nc->info->set_vnet_le) {
return -ENOSYS;
}
@@ -537,7 +537,7 @@ int qemu_set_vnet_le(NetClientState *nc, bool is_le)
int qemu_set_vnet_be(NetClientState *nc, bool is_be)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return 0;
#else
if (!nc || !nc->info->set_vnet_be) {
diff --git a/target/alpha/translate.c b/target/alpha/translate.c
index 66768ab47ad5..4e887311ab62 100644
--- a/target/alpha/translate.c
+++ b/target/alpha/translate.c
@@ -235,7 +235,7 @@ static TCGv dest_fpr(DisasContext *ctx, unsigned reg)
static int get_flag_ofs(unsigned shift)
{
int ofs = offsetof(CPUAlphaState, flags);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
ofs += 3 - (shift / 8);
#else
ofs += shift / 8;
diff --git a/target/arm/crypto_helper.c b/target/arm/crypto_helper.c
index 28a84c2dbdb6..4c8fd34aecb0 100644
--- a/target/arm/crypto_helper.c
+++ b/target/arm/crypto_helper.c
@@ -23,7 +23,7 @@ union CRYPTO_STATE {
uint64_t l[2];
};
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define CR_ST_BYTE(state, i) ((state).bytes[(15 - (i)) ^ 8])
#define CR_ST_WORD(state, i) ((state).words[(3 - (i)) ^ 2])
#else
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 812ca591f4eb..8ffe26b17b13 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -8642,7 +8642,7 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r,
r2->cp = 15;
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
if (r2->fieldoffset) {
r2->fieldoffset += sizeof(uint32_t);
}
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index ccadfbbe72be..9ec8875150d6 100644
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -1023,7 +1023,7 @@ static int kvm_arch_put_fpsimd(CPUState *cs)
for (i = 0; i < 32; i++) {
uint64_t *q = aa64_vfp_qreg(env, i);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t fp_val[2] = { q[1], q[0] };
reg.addr = (uintptr_t)fp_val;
#else
@@ -1242,7 +1242,7 @@ static int kvm_arch_get_fpsimd(CPUState *cs)
if (ret) {
return ret;
} else {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint64_t t;
t = q[0], q[0] = q[1], q[1] = t;
#endif
diff --git a/target/arm/neon_helper.c b/target/arm/neon_helper.c
index 338b9189d5b2..bc6c4a54e9d9 100644
--- a/target/arm/neon_helper.c
+++ b/target/arm/neon_helper.c
@@ -23,7 +23,7 @@ typedef struct \
{ \
type v1; \
} neon_##name;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define NEON_TYPE2(name, type) \
typedef struct \
{ \
diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c
index 07be55b7e1ad..d1ea26f1f774 100644
--- a/target/arm/sve_helper.c
+++ b/target/arm/sve_helper.c
@@ -2802,7 +2802,7 @@ static void swap_memmove(void *vd, void *vs, size_t n)
uintptr_t o = (d | s | n) & 7;
size_t i;
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
o = 0;
#endif
switch (o) {
@@ -2864,7 +2864,7 @@ static void swap_memzero(void *vd, size_t n)
return;
}
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
o = 0;
#endif
switch (o) {
diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c
index 2c23459e7684..180e14d9f884 100644
--- a/target/arm/translate-sve.c
+++ b/target/arm/translate-sve.c
@@ -2872,7 +2872,7 @@ static TCGv_i64 load_last_active(DisasContext *s, TCGv_i32 last,
* The final adjustment for the vector register base
* is added via constant offset to the load.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
/* Adjust for element ordering. See vec_reg_offset. */
if (esz < 3) {
tcg_gen_xori_i32(last, last, 8 - (1 << esz));
@@ -5711,7 +5711,7 @@ static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype)
* for this load operation.
*/
TCGv_i64 tmp = tcg_temp_new_i64();
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
poff += 6;
#endif
tcg_gen_ld16u_i64(tmp, cpu_env, poff);
@@ -5790,7 +5790,7 @@ static void do_ldro(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype)
* for this load operation.
*/
TCGv_i64 tmp = tcg_temp_new_i64();
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
poff += 4;
#endif
tcg_gen_ld32u_i64(tmp, cpu_env, poff);
diff --git a/target/arm/translate-vfp.c b/target/arm/translate-vfp.c
index 17f796e32a33..6a95a67a69e5 100644
--- a/target/arm/translate-vfp.c
+++ b/target/arm/translate-vfp.c
@@ -93,7 +93,7 @@ uint64_t vfp_expand_imm(int size, uint8_t imm8)
static inline long vfp_f16_offset(unsigned reg, bool top)
{
long offs = vfp_reg_offset(false, reg);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
if (!top) {
offs += 2;
}
diff --git a/target/arm/translate.c b/target/arm/translate.c
index bf2196b9e24c..e8dfa71364db 100644
--- a/target/arm/translate.c
+++ b/target/arm/translate.c
@@ -1158,7 +1158,7 @@ long neon_element_offset(int reg, int element, MemOp memop)
{
int element_size = 1 << (memop & MO_SIZE);
int ofs = element * element_size;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
/*
* Calculate the offset assuming fully little-endian,
* then XOR to account for the order of the 8-byte units.
diff --git a/target/hppa/translate.c b/target/hppa/translate.c
index 5c0b1eb274aa..0b83ee4d9856 100644
--- a/target/hppa/translate.c
+++ b/target/hppa/translate.c
@@ -566,7 +566,7 @@ static void save_gpr(DisasContext *ctx, unsigned reg, TCGv_reg t)
}
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define HI_OFS 0
# define LO_OFS 4
#else
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index 2a94d3374252..5649bba9a88d 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -359,7 +359,7 @@ static void gen_update_cc_op(DisasContext *s)
#endif /* !TARGET_X86_64 */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define REG_B_OFFSET (sizeof(target_ulong) - 1)
#define REG_H_OFFSET (sizeof(target_ulong) - 2)
#define REG_W_OFFSET (sizeof(target_ulong) - 2)
diff --git a/target/mips/tcg/lmmi_helper.c b/target/mips/tcg/lmmi_helper.c
index abeb7736aeb2..2c8732525ce3 100644
--- a/target/mips/tcg/lmmi_helper.c
+++ b/target/mips/tcg/lmmi_helper.c
@@ -37,7 +37,7 @@ typedef union {
} LMIValue;
/* Some byte ordering issues can be mitigated by XORing in the following. */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define BYTE_ORDER_XOR(N) N
#else
# define BYTE_ORDER_XOR(N) 0
diff --git a/target/mips/tcg/msa_helper.c b/target/mips/tcg/msa_helper.c
index 5667b1f0a15c..389c42e4baa3 100644
--- a/target/mips/tcg/msa_helper.c
+++ b/target/mips/tcg/msa_helper.c
@@ -4146,7 +4146,7 @@ void helper_msa_ilvev_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[8] = pws->b[9];
pwd->b[9] = pwt->b[9];
pwd->b[10] = pws->b[11];
@@ -4190,7 +4190,7 @@ void helper_msa_ilvev_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[4] = pws->h[5];
pwd->h[5] = pwt->h[5];
pwd->h[6] = pws->h[7];
@@ -4218,7 +4218,7 @@ void helper_msa_ilvev_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[2] = pws->w[3];
pwd->w[3] = pwt->w[3];
pwd->w[0] = pws->w[1];
@@ -4250,7 +4250,7 @@ void helper_msa_ilvod_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[7] = pwt->b[6];
pwd->b[6] = pws->b[6];
pwd->b[5] = pwt->b[4];
@@ -4294,7 +4294,7 @@ void helper_msa_ilvod_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[3] = pwt->h[2];
pwd->h[2] = pws->h[2];
pwd->h[1] = pwt->h[0];
@@ -4322,7 +4322,7 @@ void helper_msa_ilvod_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[1] = pwt->w[0];
pwd->w[0] = pws->w[0];
pwd->w[3] = pwt->w[2];
@@ -4354,7 +4354,7 @@ void helper_msa_ilvl_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[7] = pwt->b[15];
pwd->b[6] = pws->b[15];
pwd->b[5] = pwt->b[14];
@@ -4398,7 +4398,7 @@ void helper_msa_ilvl_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[3] = pwt->h[7];
pwd->h[2] = pws->h[7];
pwd->h[1] = pwt->h[6];
@@ -4426,7 +4426,7 @@ void helper_msa_ilvl_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[1] = pwt->w[3];
pwd->w[0] = pws->w[3];
pwd->w[3] = pwt->w[2];
@@ -4458,7 +4458,7 @@ void helper_msa_ilvr_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[8] = pws->b[0];
pwd->b[9] = pwt->b[0];
pwd->b[10] = pws->b[1];
@@ -4502,7 +4502,7 @@ void helper_msa_ilvr_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[4] = pws->h[0];
pwd->h[5] = pwt->h[0];
pwd->h[6] = pws->h[1];
@@ -4530,7 +4530,7 @@ void helper_msa_ilvr_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[2] = pws->w[0];
pwd->w[3] = pwt->w[0];
pwd->w[0] = pws->w[1];
@@ -4661,7 +4661,7 @@ void helper_msa_pckev_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[8] = pws->b[9];
pwd->b[10] = pws->b[13];
pwd->b[12] = pws->b[1];
@@ -4705,7 +4705,7 @@ void helper_msa_pckev_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[4] = pws->h[5];
pwd->h[6] = pws->h[1];
pwd->h[0] = pwt->h[5];
@@ -4733,7 +4733,7 @@ void helper_msa_pckev_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[2] = pws->w[3];
pwd->w[0] = pwt->w[3];
pwd->w[3] = pws->w[1];
@@ -4765,7 +4765,7 @@ void helper_msa_pckod_b(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->b[7] = pwt->b[6];
pwd->b[5] = pwt->b[2];
pwd->b[3] = pwt->b[14];
@@ -4810,7 +4810,7 @@ void helper_msa_pckod_h(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->h[3] = pwt->h[2];
pwd->h[1] = pwt->h[6];
pwd->h[7] = pws->h[2];
@@ -4838,7 +4838,7 @@ void helper_msa_pckod_w(CPUMIPSState *env,
wr_t *pws = &(env->active_fpu.fpr[ws].wr);
wr_t *pwt = &(env->active_fpu.fpr[wt].wr);
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
pwd->w[1] = pwt->w[0];
pwd->w[3] = pws->w[0];
pwd->w[0] = pwt->w[2];
@@ -5926,7 +5926,7 @@ void helper_msa_copy_s_b(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 16;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 8) {
n = 8 - n - 1;
} else {
@@ -5940,7 +5940,7 @@ void helper_msa_copy_s_h(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 8;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 4) {
n = 4 - n - 1;
} else {
@@ -5954,7 +5954,7 @@ void helper_msa_copy_s_w(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 4;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 2) {
n = 2 - n - 1;
} else {
@@ -5975,7 +5975,7 @@ void helper_msa_copy_u_b(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 16;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 8) {
n = 8 - n - 1;
} else {
@@ -5989,7 +5989,7 @@ void helper_msa_copy_u_h(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 8;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 4) {
n = 4 - n - 1;
} else {
@@ -6003,7 +6003,7 @@ void helper_msa_copy_u_w(CPUMIPSState *env, uint32_t rd,
uint32_t ws, uint32_t n)
{
n %= 4;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 2) {
n = 2 - n - 1;
} else {
@@ -6019,7 +6019,7 @@ void helper_msa_insert_b(CPUMIPSState *env, uint32_t wd,
wr_t *pwd = &(env->active_fpu.fpr[wd].wr);
target_ulong rs = env->active_tc.gpr[rs_num];
n %= 16;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 8) {
n = 8 - n - 1;
} else {
@@ -6035,7 +6035,7 @@ void helper_msa_insert_h(CPUMIPSState *env, uint32_t wd,
wr_t *pwd = &(env->active_fpu.fpr[wd].wr);
target_ulong rs = env->active_tc.gpr[rs_num];
n %= 8;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 4) {
n = 4 - n - 1;
} else {
@@ -6051,7 +6051,7 @@ void helper_msa_insert_w(CPUMIPSState *env, uint32_t wd,
wr_t *pwd = &(env->active_fpu.fpr[wd].wr);
target_ulong rs = env->active_tc.gpr[rs_num];
n %= 4;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
if (n < 2) {
n = 2 - n - 1;
} else {
diff --git a/target/ppc/arch_dump.c b/target/ppc/arch_dump.c
index 993740897d83..1139cead9fed 100644
--- a/target/ppc/arch_dump.c
+++ b/target/ppc/arch_dump.c
@@ -161,7 +161,7 @@ static void ppc_write_elf_vmxregset(NoteFuncArg *arg, PowerPCCPU *cpu)
bool needs_byteswap;
ppc_avr_t *avr = cpu_avr_ptr(&cpu->env, i);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
needs_byteswap = s->dump_info.d_endian == ELFDATA2LSB;
#else
needs_byteswap = s->dump_info.d_endian == ELFDATA2MSB;
diff --git a/target/ppc/int_helper.c b/target/ppc/int_helper.c
index 492f34c4992b..8c1674510bb3 100644
--- a/target/ppc/int_helper.c
+++ b/target/ppc/int_helper.c
@@ -425,7 +425,7 @@ uint64_t helper_PEXTD(uint64_t src, uint64_t mask)
/*****************************************************************************/
/* Altivec extension helpers */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VECTOR_FOR_INORDER_I(index, element) \
for (index = 0; index < ARRAY_SIZE(r->element); index++)
#else
@@ -1177,7 +1177,7 @@ XXGENPCV(XXGENPCVDM, 8)
#undef XXGENPCV_LE_COMP
#undef XXGENPCV
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VBPERMQ_INDEX(avr, i) ((avr)->u8[(i)])
#define VBPERMD_INDEX(i) (i)
#define VBPERMQ_DW(index) (((index) & 0x40) != 0)
@@ -1298,7 +1298,7 @@ void helper_vpmsumd(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
}
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define PKBIG 1
#else
#define PKBIG 0
@@ -1307,7 +1307,7 @@ void helper_vpkpx(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
{
int i, j;
ppc_avr_t result;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
const ppc_avr_t *x[2] = { a, b };
#else
const ppc_avr_t *x[2] = { b, a };
@@ -1516,7 +1516,7 @@ void helper_vslo(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
{
int sh = (b->VsrB(0xf) >> 3) & 0xf;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
memmove(&r->u8[0], &a->u8[sh], 16 - sh);
memset(&r->u8[16 - sh], 0, sh);
#else
@@ -1525,7 +1525,7 @@ void helper_vslo(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
#endif
}
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define ELEM_ADDR(VEC, IDX, SIZE) (&(VEC)->u8[IDX])
#else
#define ELEM_ADDR(VEC, IDX, SIZE) (&(VEC)->u8[15 - (IDX)] - (SIZE) + 1)
@@ -1554,7 +1554,7 @@ VINSX(W, uint32_t)
VINSX(D, uint64_t)
#undef ELEM_ADDR
#undef VINSX
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VEXTDVLX(NAME, SIZE) \
void helper_##NAME(CPUPPCState *env, ppc_avr_t *t, ppc_avr_t *a, ppc_avr_t *b, \
target_ulong index) \
@@ -1593,7 +1593,7 @@ VEXTDVLX(VEXTDUHVLX, 2)
VEXTDVLX(VEXTDUWVLX, 4)
VEXTDVLX(VEXTDDVLX, 8)
#undef VEXTDVLX
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define VEXTRACT(suffix, element) \
void helper_vextract##suffix(ppc_avr_t *r, ppc_avr_t *b, uint32_t index) \
{ \
@@ -1750,7 +1750,7 @@ void helper_vsro(ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
{
int sh = (b->VsrB(0xf) >> 3) & 0xf;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
memmove(&r->u8[sh], &a->u8[0], 16 - sh);
memset(&r->u8[0], 0, sh);
#else
@@ -1867,7 +1867,7 @@ void helper_vsum4ubs(CPUPPCState *env, ppc_avr_t *r, ppc_avr_t *a, ppc_avr_t *b)
}
}
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define UPKHI 1
#define UPKLO 0
#else
@@ -1974,7 +1974,7 @@ VGENERIC_DO(popcntd, u64)
#undef VGENERIC_DO
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define QW_ONE { .u64 = { 0, 1 } }
#else
#define QW_ONE { .u64 = { 1, 0 } }
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index dc93b99189ea..d1f07c4f41d4 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -632,7 +632,7 @@ static int kvm_put_fp(CPUState *cs)
uint64_t *fpr = cpu_fpr_ptr(&cpu->env, i);
uint64_t *vsrl = cpu_vsrl_ptr(&cpu->env, i);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
vsr[0] = float64_val(*fpr);
vsr[1] = *vsrl;
#else
@@ -710,7 +710,7 @@ static int kvm_get_fp(CPUState *cs)
strerror(errno));
return ret;
} else {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
*fpr = vsr[0];
if (vsx) {
*vsrl = vsr[1];
diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c
index 39945d9ea585..f1c76a7750ab 100644
--- a/target/ppc/mem_helper.c
+++ b/target/ppc/mem_helper.c
@@ -461,7 +461,7 @@ uint32_t helper_stqcx_be_parallel(CPUPPCState *env, target_ulong addr,
/*****************************************************************************/
/* Altivec extension helpers */
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
#define HI_IDX 0
#define LO_IDX 1
#else
diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
index 3bd4aac9c970..7a6ce0a3bc7d 100644
--- a/target/riscv/vector_helper.c
+++ b/target/riscv/vector_helper.c
@@ -79,7 +79,7 @@ target_ulong HELPER(vsetvl)(CPURISCVState *env, target_ulong s1,
* Note that vector data is stored in host-endian 64-bit chunks,
* so addressing units smaller than that needs a host-endian fixup.
*/
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define H1(x) ((x) ^ 7)
#define H1_2(x) ((x) ^ 6)
#define H1_4(x) ((x) ^ 4)
diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c
index 5acfc0ff9b4e..80f1f0be9aba 100644
--- a/target/s390x/tcg/translate.c
+++ b/target/s390x/tcg/translate.c
@@ -263,7 +263,7 @@ static inline int vec_reg_offset(uint8_t reg, uint8_t enr, MemOp es)
* 16 byte operations to handle it in a special way.
*/
g_assert(es <= MO_64);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
offs ^= (8 - bytes);
#endif
return offs + vec_full_reg_offset(reg);
diff --git a/target/sparc/vis_helper.c b/target/sparc/vis_helper.c
index f917e5992dc7..3afdc6975cff 100644
--- a/target/sparc/vis_helper.c
+++ b/target/sparc/vis_helper.c
@@ -42,7 +42,7 @@ target_ulong helper_array8(target_ulong pixel_addr, target_ulong cubesize)
GET_FIELD_SP(pixel_addr, 11, 12);
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
#define VIS_B64(n) b[7 - (n)]
#define VIS_W64(n) w[3 - (n)]
#define VIS_SW64(n) sw[3 - (n)]
@@ -470,7 +470,7 @@ uint64_t helper_bshuffle(uint64_t gsr, uint64_t src1, uint64_t src2)
uint32_t i, mask, host;
/* Set up S such that we can index across all of the bytes. */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
s.ll[0] = src1;
s.ll[1] = src2;
host = 0;
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 65e1c94c2d5c..5d48537927b5 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -1156,7 +1156,7 @@ void tcg_gen_ld_i64(TCGv_i64 ret, TCGv_ptr arg2, tcg_target_long offset)
{
/* Since arg2 and ret have different types,
they cannot be the same temporary */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
tcg_gen_ld_i32(TCGV_HIGH(ret), arg2, offset);
tcg_gen_ld_i32(TCGV_LOW(ret), arg2, offset + 4);
#else
@@ -1167,7 +1167,7 @@ void tcg_gen_ld_i64(TCGv_i64 ret, TCGv_ptr arg2, tcg_target_long offset)
void tcg_gen_st_i64(TCGv_i64 arg1, TCGv_ptr arg2, tcg_target_long offset)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
tcg_gen_st_i32(TCGV_HIGH(arg1), arg2, offset);
tcg_gen_st_i32(TCGV_LOW(arg1), arg2, offset + 4);
#else
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 33a97eabdb83..f8542529d030 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -51,7 +51,7 @@
#else
# define ELF_CLASS ELFCLASS64
#endif
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define ELF_DATA ELFDATA2MSB
#else
# define ELF_DATA ELFDATA2LSB
@@ -883,7 +883,7 @@ TCGTemp *tcg_global_mem_new_internal(TCGType type, TCGv_ptr base,
TCGTemp *base_ts = tcgv_ptr_temp(base);
TCGTemp *ts = tcg_global_alloc(s);
int indirect_reg = 0, bigendian = 0;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
bigendian = 1;
#endif
@@ -1547,7 +1547,7 @@ void tcg_gen_callN(void *func, TCGTemp *ret, int nargs, TCGTemp **args)
}
#else
if (TCG_TARGET_REG_BITS < 64 && (typemask & 6) == dh_typecode_i64) {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
op->args[pi++] = temp_arg(ret + 1);
op->args[pi++] = temp_arg(ret);
#else
@@ -1600,7 +1600,7 @@ void tcg_gen_callN(void *func, TCGTemp *ret, int nargs, TCGTemp **args)
* have to get more complicated to differentiate between
* stack arguments and register arguments.
*/
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TCG_TARGET_STACK_GROWSUP)
+#if HOST_BIG_ENDIAN != defined(TCG_TARGET_STACK_GROWSUP)
op->args[pi++] = temp_arg(args[i] + 1);
op->args[pi++] = temp_arg(args[i]);
#else
@@ -3598,7 +3598,7 @@ static void tcg_reg_alloc_dup(TCGContext *s, const TCGOp *op)
/* fall through */
case TEMP_VAL_MEM:
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
endian_fixup = itype == TCG_TYPE_I32 ? 4 : 8;
endian_fixup -= 1 << vece;
#else
@@ -3879,7 +3879,7 @@ static bool tcg_reg_alloc_dup2(TCGContext *s, const TCGOp *op)
if (!itsh->mem_coherent) {
temp_sync(s, itsh, s->reserved_regs, 0, 0);
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
TCGTemp *its = itsh;
#else
TCGTemp *its = itsl;
diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk-test.c
index 62e670f39be0..659b5050d8af 100644
--- a/tests/qtest/vhost-user-blk-test.c
+++ b/tests/qtest/vhost-user-blk-test.c
@@ -37,7 +37,7 @@ typedef struct QVirtioBlkReq {
uint8_t status;
} QVirtioBlkReq;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
static const bool host_is_big_endian = true;
#else
static const bool host_is_big_endian; /* false */
diff --git a/tests/qtest/virtio-blk-test.c b/tests/qtest/virtio-blk-test.c
index 2a236982118f..f22594a1a823 100644
--- a/tests/qtest/virtio-blk-test.c
+++ b/tests/qtest/virtio-blk-test.c
@@ -33,7 +33,7 @@ typedef struct QVirtioBlkReq {
} QVirtioBlkReq;
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
const bool host_is_big_endian = true;
#else
const bool host_is_big_endian; /* false */
diff --git a/ui/vdagent.c b/ui/vdagent.c
index 7ea4bc5d9a26..02861edfb13c 100644
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -664,7 +664,7 @@ static void vdagent_chr_open(Chardev *chr,
VDAgentChardev *vd = QEMU_VDAGENT_CHARDEV(chr);
ChardevQemuVDAgent *cfg = backend->u.qemu_vdagent.data;
-#if defined(HOST_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN
/*
* TODO: vdagent protocol is defined to be LE,
* so we have to byteswap everything on BE hosts.
diff --git a/ui/vnc.c b/ui/vnc.c
index 310a873c2184..5cbeebb8d1fd 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2340,7 +2340,7 @@ static void pixel_format_message (VncState *vs) {
vnc_write_u8(vs, vs->client_pf.bits_per_pixel); /* bits-per-pixel */
vnc_write_u8(vs, vs->client_pf.depth); /* depth */
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
vnc_write_u8(vs, 1); /* big-endian-flag */
#else
vnc_write_u8(vs, 0); /* big-endian-flag */
diff --git a/util/bitmap.c b/util/bitmap.c
index 1f201393aef1..f81d8057a7e6 100644
--- a/util/bitmap.c
+++ b/util/bitmap.c
@@ -376,7 +376,7 @@ static void bitmap_to_from_le(unsigned long *dst,
{
long len = BITS_TO_LONGS(nbits);
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
long index;
for (index = 0; index < len; index++) {
diff --git a/util/host-utils.c b/util/host-utils.c
index bcc772b8ec95..96d5dc0bed25 100644
--- a/util/host-utils.c
+++ b/util/host-utils.c
@@ -34,7 +34,7 @@ static inline void mul64(uint64_t *plow, uint64_t *phigh,
typedef union {
uint64_t ll;
struct {
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
uint32_t high, low;
#else
uint32_t low, high;
diff --git a/target/ppc/translate/vmx-impl.c.inc b/target/ppc/translate/vmx-impl.c.inc
index 6101bca3fd7a..764ac45409ae 100644
--- a/target/ppc/translate/vmx-impl.c.inc
+++ b/target/ppc/translate/vmx-impl.c.inc
@@ -173,7 +173,7 @@ static void gen_mtvscr(DisasContext *ctx)
val = tcg_temp_new_i32();
bofs = avr_full_offset(rB(ctx->opcode));
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
bofs += 3 * 4;
#endif
@@ -1692,7 +1692,7 @@ static void gen_vsplt(DisasContext *ctx, int vece)
/* Experimental testing shows that hardware masks the immediate. */
bofs += (uimm << vece) & 15;
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
bofs ^= 15;
bofs &= ~((1 << vece) - 1);
#endif
diff --git a/target/ppc/translate/vsx-impl.c.inc b/target/ppc/translate/vsx-impl.c.inc
index e67fbf2bb8ed..c4cc01239ea3 100644
--- a/target/ppc/translate/vsx-impl.c.inc
+++ b/target/ppc/translate/vsx-impl.c.inc
@@ -1552,7 +1552,7 @@ static bool trans_XXSPLTW(DisasContext *ctx, arg_XX2_uim2 *a)
tofs = vsr_full_offset(a->xt);
bofs = vsr_full_offset(a->xb);
bofs += a->uim << MO_32;
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
bofs ^= 8 | 4;
#endif
diff --git a/target/riscv/insn_trans/trans_rvv.c.inc b/target/riscv/insn_trans/trans_rvv.c.inc
index 275fded6e43b..04b55e5040ba 100644
--- a/target/riscv/insn_trans/trans_rvv.c.inc
+++ b/target/riscv/insn_trans/trans_rvv.c.inc
@@ -3288,7 +3288,7 @@ static void load_element(TCGv_i64 dest, TCGv_ptr base,
/* offset of the idx element with base regsiter r */
static uint32_t endian_ofs(DisasContext *s, int r, int idx)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
return vreg_ofs(s, r) + ((idx ^ (7 >> s->sew)) << s->sew);
#else
return vreg_ofs(s, r) + (idx << s->sew);
@@ -3298,7 +3298,7 @@ static uint32_t endian_ofs(DisasContext *s, int r, int idx)
/* adjust the index according to the endian */
static void endian_adjust(TCGv_i32 ofs, int sew)
{
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
tcg_gen_xori_i32(ofs, ofs, 7 >> sew);
#endif
}
diff --git a/target/s390x/tcg/translate_vx.c.inc b/target/s390x/tcg/translate_vx.c.inc
index 98eb7710a4a9..b829ce0c7c79 100644
--- a/target/s390x/tcg/translate_vx.c.inc
+++ b/target/s390x/tcg/translate_vx.c.inc
@@ -175,7 +175,7 @@ static void get_vec_element_ptr_i64(TCGv_ptr ptr, uint8_t reg, TCGv_i64 enr,
/* convert it to an element offset relative to cpu_env (vec_reg_offset() */
tcg_gen_shli_i64(tmp, tmp, es);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
tcg_gen_xori_i64(tmp, tmp, 8 - NUM_VEC_ELEMENT_BYTES(es));
#endif
tcg_gen_addi_i64(tmp, tmp, vec_full_reg_offset(reg));
diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc
index 077fc5140154..eb38113a70af 100644
--- a/tcg/aarch64/tcg-target.c.inc
+++ b/tcg/aarch64/tcg-target.c.inc
@@ -1557,7 +1557,7 @@ static void tcg_out_adr(TCGContext *s, TCGReg rd, const void *target)
*/
static void * const qemu_ld_helpers[MO_SIZE + 1] = {
[MO_8] = helper_ret_ldub_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_16] = helper_be_lduw_mmu,
[MO_32] = helper_be_ldul_mmu,
[MO_64] = helper_be_ldq_mmu,
@@ -1574,7 +1574,7 @@ static void * const qemu_ld_helpers[MO_SIZE + 1] = {
*/
static void * const qemu_st_helpers[MO_SIZE + 1] = {
[MO_8] = helper_ret_stb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_16] = helper_be_stw_mmu,
[MO_32] = helper_be_stl_mmu,
[MO_64] = helper_be_stq_mmu,
diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc
index 4bc0420f4d2f..2c6c353eea2b 100644
--- a/tcg/arm/tcg-target.c.inc
+++ b/tcg/arm/tcg-target.c.inc
@@ -1296,7 +1296,7 @@ static void tcg_out_vldst(TCGContext *s, ARMInsn insn,
static void * const qemu_ld_helpers[MO_SSIZE + 1] = {
[MO_UB] = helper_ret_ldub_mmu,
[MO_SB] = helper_ret_ldsb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_UW] = helper_be_lduw_mmu,
[MO_UL] = helper_be_ldul_mmu,
[MO_UQ] = helper_be_ldq_mmu,
@@ -1316,7 +1316,7 @@ static void * const qemu_ld_helpers[MO_SSIZE + 1] = {
*/
static void * const qemu_st_helpers[MO_SIZE + 1] = {
[MO_8] = helper_ret_stb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_16] = helper_be_stw_mmu,
[MO_32] = helper_be_stl_mmu,
[MO_64] = helper_be_stq_mmu,
diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc
index 993149d18a56..bd76f0c97f15 100644
--- a/tcg/mips/tcg-target.c.inc
+++ b/tcg/mips/tcg-target.c.inc
@@ -26,7 +26,7 @@
#include "../tcg-ldst.c.inc"
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
# define MIPS_BE 1
#else
# define MIPS_BE 0
diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc
index 1f3c5c171cb7..cfcd121f9c23 100644
--- a/tcg/ppc/tcg-target.c.inc
+++ b/tcg/ppc/tcg-target.c.inc
@@ -1864,7 +1864,7 @@ void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx,
i1 = ADDIS | TAI(TCG_REG_TB, TCG_REG_TB, hi >> 16);
i2 = ADDI | TAI(TCG_REG_TB, TCG_REG_TB, lo);
}
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
pair = (uint64_t)i1 << 32 | i2;
#else
pair = (uint64_t)i2 << 32 | i1;
@@ -3235,7 +3235,7 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
tcg_out_mem_long(s, 0, LVEBX, out, base, offset);
}
elt = extract32(offset, 0, 4);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
elt ^= 15;
#endif
tcg_out32(s, VSPLTB | VRT(out) | VRB(out) | (elt << 16));
@@ -3248,7 +3248,7 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
tcg_out_mem_long(s, 0, LVEHX, out, base, offset);
}
elt = extract32(offset, 1, 3);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
elt ^= 7;
#endif
tcg_out32(s, VSPLTH | VRT(out) | VRB(out) | (elt << 16));
@@ -3261,7 +3261,7 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
tcg_debug_assert((offset & 3) == 0);
tcg_out_mem_long(s, 0, LVEWX, out, base, offset);
elt = extract32(offset, 2, 2);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
elt ^= 3;
#endif
tcg_out32(s, VSPLTW | VRT(out) | VRB(out) | (elt << 16));
@@ -3275,7 +3275,7 @@ static bool tcg_out_dupm_vec(TCGContext *s, TCGType type, unsigned vece,
tcg_out_mem_long(s, 0, LVX, out, base, offset & -16);
tcg_out_vsldoi(s, TCG_VEC_TMP1, out, out, 8);
elt = extract32(offset, 3, 1);
-#ifndef HOST_WORDS_BIGENDIAN
+#if !HOST_BIG_ENDIAN
elt = !elt;
#endif
if (elt) {
diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc
index 6409d9c3d54f..81a83e45b156 100644
--- a/tcg/riscv/tcg-target.c.inc
+++ b/tcg/riscv/tcg-target.c.inc
@@ -854,7 +854,7 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0)
static void * const qemu_ld_helpers[MO_SSIZE + 1] = {
[MO_UB] = helper_ret_ldub_mmu,
[MO_SB] = helper_ret_ldsb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_UW] = helper_be_lduw_mmu,
[MO_SW] = helper_be_ldsw_mmu,
[MO_UL] = helper_be_ldul_mmu,
@@ -879,7 +879,7 @@ static void * const qemu_ld_helpers[MO_SSIZE + 1] = {
*/
static void * const qemu_st_helpers[MO_SIZE + 1] = {
[MO_8] = helper_ret_stb_mmu,
-#ifdef HOST_WORDS_BIGENDIAN
+#if HOST_BIG_ENDIAN
[MO_16] = helper_be_stw_mmu,
[MO_32] = helper_be_stl_mmu,
[MO_64] = helper_be_stq_mmu,
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 06/32] Replace config-time define HOST_WORDS_BIGENDIAN
2022-03-23 15:57 ` marcandre.lureau
(?)
@ 2022-03-23 17:10 ` Richard Henderson
-1 siblings, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 17:10 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> Replace a config-time define with a compile time condition
> define (compatible with clang and gcc) that must be declared prior to
> its usage. This avoids having a global configure time define, but also
> prevents from bad usage, if the config header wasn't included before.
>
> This can help to make some code independent from qemu too.
>
> gcc supports __BYTE_ORDER__ from about 4.6 and clang from 3.2.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> [ For the s390x parts I'm involved in ]
> Acked-by: Halil Pasic<pasic@linux.ibm.com>
> Reviewed-by: Philippe Mathieu-Daudé<f4bug@amsat.org>
> ---
The last time this came up, I asked for HOST_WORDS_BIGENDIAN to be poisoned, so that uses
can't creep back in (usually via rebasing branches across this patch).
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PATCH 06/32] Replace config-time define HOST_WORDS_BIGENDIAN
2022-03-23 15:57 ` marcandre.lureau
(?)
(?)
@ 2022-03-23 17:16 ` Richard Henderson
-1 siblings, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 17:16 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> Replace a config-time define with a compile time condition
> define (compatible with clang and gcc) that must be declared prior to
> its usage. This avoids having a global configure time define, but also
> prevents from bad usage, if the config header wasn't included before.
>
> This can help to make some code independent from qemu too.
>
> gcc supports __BYTE_ORDER__ from about 4.6 and clang from 3.2.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> [ For the s390x parts I'm involved in ]
> Acked-by: Halil Pasic<pasic@linux.ibm.com>
> Reviewed-by: Philippe Mathieu-Daudé<f4bug@amsat.org>
> ---
I see now the poison is two patches later.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 07/32] Replace TARGET_WORDS_BIGENDIAN
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 02/32] meson: add util dependency for oslib-posix on freebsd marcandre.lureau
` (31 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Paolo Bonzini, Warner Losh, Kyle Evans,
Laurent Vivier, Eduardo Habkost, Marcel Apfelbaum,
Philippe Mathieu-Daudé,
Yanan Wang, Peter Maydell, Gerd Hoffmann, Edgar E. Iglesias,
Aurelien Jarno, Hervé Poussineau, Aleksandar Rikalo,
Chris Wulff, Marek Vasut, Max Filippov, Richard Henderson,
Alex Bennée, Peter Xu, David Hildenbrand,
Michael S. Tsirkin, Thomas Huth, Jiaxun Yang,
Cédric Le Goater, Daniel Henrique Barboza, David Gibson,
Greg Kurz, open list:Overall KVM CPUs, open list:ARM TCG CPUs,
open list:PowerPC TCG CPUs
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Convert the TARGET_WORDS_BIGENDIAN macro, similarly to what was done
with HOST_BIG_ENDIAN. The new TARGET_BIG_ENDIAN macro is either 0 or 1,
and thus should always be defined to prevent misuse.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: Halil Pasic <pasic@linux.ibm.com>
---
docs/devel/loads-stores.rst | 2 +-
configs/targets/aarch64_be-linux-user.mak | 2 +-
configs/targets/armeb-linux-user.mak | 2 +-
configs/targets/hppa-linux-user.mak | 2 +-
configs/targets/hppa-softmmu.mak | 2 +-
configs/targets/m68k-linux-user.mak | 2 +-
configs/targets/m68k-softmmu.mak | 2 +-
configs/targets/microblaze-linux-user.mak | 2 +-
configs/targets/microblaze-softmmu.mak | 2 +-
configs/targets/mips-linux-user.mak | 2 +-
configs/targets/mips-softmmu.mak | 2 +-
configs/targets/mips64-linux-user.mak | 2 +-
configs/targets/mips64-softmmu.mak | 2 +-
configs/targets/mipsn32-linux-user.mak | 2 +-
configs/targets/or1k-linux-user.mak | 2 +-
configs/targets/or1k-softmmu.mak | 2 +-
configs/targets/ppc-linux-user.mak | 2 +-
configs/targets/ppc-softmmu.mak | 2 +-
configs/targets/ppc64-linux-user.mak | 2 +-
configs/targets/ppc64-softmmu.mak | 2 +-
configs/targets/s390x-linux-user.mak | 2 +-
configs/targets/s390x-softmmu.mak | 2 +-
configs/targets/sh4eb-linux-user.mak | 2 +-
configs/targets/sh4eb-softmmu.mak | 2 +-
configs/targets/sparc-linux-user.mak | 2 +-
configs/targets/sparc-softmmu.mak | 2 +-
configs/targets/sparc32plus-linux-user.mak | 2 +-
configs/targets/sparc64-linux-user.mak | 2 +-
configs/targets/sparc64-softmmu.mak | 2 +-
configs/targets/xtensaeb-linux-user.mak | 2 +-
configs/targets/xtensaeb-softmmu.mak | 2 +-
meson.build | 5 +++++
bsd-user/qemu.h | 2 +-
include/exec/cpu-all.h | 7 +++----
include/exec/cpu_ldst.h | 2 +-
include/exec/gdbstub.h | 2 +-
include/exec/memop.h | 2 +-
include/exec/memory.h | 2 +-
include/exec/poison.h | 2 +-
include/hw/core/cpu.h | 2 +-
include/hw/mips/bios.h | 2 +-
include/hw/virtio/virtio-access.h | 2 +-
linux-user/aarch64/target_syscall.h | 2 +-
linux-user/arm/target_syscall.h | 2 +-
linux-user/ppc/target_syscall.h | 2 +-
linux-user/qemu.h | 2 +-
linux-user/user-internals.h | 2 +-
linux-user/xtensa/target_structs.h | 2 +-
target/arm/cpu.h | 8 ++++----
target/xtensa/cpu.h | 2 +-
target/xtensa/overlay_tool.h | 2 +-
accel/kvm/kvm-all.c | 2 +-
cpu.c | 2 +-
disas.c | 2 +-
hw/arm/armv7m.c | 2 +-
hw/display/vga.c | 2 +-
hw/microblaze/boot.c | 2 +-
hw/mips/gt64xxx_pci.c | 6 +++---
hw/mips/jazz.c | 2 +-
hw/mips/malta.c | 24 +++++++++++-----------
hw/mips/mipssim.c | 2 +-
hw/nios2/boot.c | 2 +-
hw/xtensa/sim.c | 2 +-
hw/xtensa/xtfpga.c | 4 ++--
linux-user/aarch64/cpu_loop.c | 2 +-
linux-user/aarch64/signal.c | 4 ++--
linux-user/arm/cpu_loop.c | 2 +-
linux-user/elfload.c | 6 +++---
linux-user/ppc/signal.c | 4 ++--
linux-user/syscall.c | 6 +++---
linux-user/uname.c | 2 +-
linux-user/xtensa/signal.c | 2 +-
softmmu/memory.c | 2 +-
softmmu/qtest.c | 2 +-
target/arm/cpu.c | 2 +-
target/mips/cpu.c | 4 ++--
target/mips/tcg/msa_helper.c | 10 ++++-----
target/ppc/cpu_init.c | 2 +-
target/ppc/gdbstub.c | 4 ++--
target/ppc/mem_helper.c | 2 +-
target/ppc/translate.c | 2 +-
target/xtensa/translate.c | 6 +++---
tests/tcg/xtensa/Makefile.softmmu-target | 2 +-
83 files changed, 120 insertions(+), 116 deletions(-)
diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst
index 8f0035c821bf..ad5dfe133e15 100644
--- a/docs/devel/loads-stores.rst
+++ b/docs/devel/loads-stores.rst
@@ -275,7 +275,7 @@ called during the translator callback ``translate_insn``.
There is a set of functions ending in ``_swap`` which, if the parameter
is true, returns the value in the endianness that is the reverse of
-the guest native endianness, as determined by ``TARGET_WORDS_BIGENDIAN``.
+the guest native endianness, as determined by ``TARGET_BIG_ENDIAN``.
Function names follow the pattern:
diff --git a/configs/targets/aarch64_be-linux-user.mak b/configs/targets/aarch64_be-linux-user.mak
index d3ee10c00f31..77944247459b 100644
--- a/configs/targets/aarch64_be-linux-user.mak
+++ b/configs/targets/aarch64_be-linux-user.mak
@@ -1,6 +1,6 @@
TARGET_ARCH=aarch64
TARGET_BASE_ARCH=arm
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml
TARGET_HAS_BFLT=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/configs/targets/armeb-linux-user.mak b/configs/targets/armeb-linux-user.mak
index f81e5bf1fe4b..a249cc2e29d6 100644
--- a/configs/targets/armeb-linux-user.mak
+++ b/configs/targets/armeb-linux-user.mak
@@ -1,7 +1,7 @@
TARGET_ARCH=arm
TARGET_SYSTBL_ABI=common,oabi
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml
TARGET_HAS_BFLT=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/configs/targets/hppa-linux-user.mak b/configs/targets/hppa-linux-user.mak
index f01e0a7b9ed8..db873a879688 100644
--- a/configs/targets/hppa-linux-user.mak
+++ b/configs/targets/hppa-linux-user.mak
@@ -2,4 +2,4 @@ TARGET_ARCH=hppa
TARGET_SYSTBL_ABI=common,32
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/hppa-softmmu.mak b/configs/targets/hppa-softmmu.mak
index e3e71eb21b9a..44f07b033238 100644
--- a/configs/targets/hppa-softmmu.mak
+++ b/configs/targets/hppa-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=hppa
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
diff --git a/configs/targets/m68k-linux-user.mak b/configs/targets/m68k-linux-user.mak
index 805d16c6ab2d..579b5d299ccf 100644
--- a/configs/targets/m68k-linux-user.mak
+++ b/configs/targets/m68k-linux-user.mak
@@ -1,6 +1,6 @@
TARGET_ARCH=m68k
TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml
TARGET_HAS_BFLT=y
diff --git a/configs/targets/m68k-softmmu.mak b/configs/targets/m68k-softmmu.mak
index 5df1a2b7d76c..bbcd0bada698 100644
--- a/configs/targets/m68k-softmmu.mak
+++ b/configs/targets/m68k-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=m68k
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml
diff --git a/configs/targets/microblaze-linux-user.mak b/configs/targets/microblaze-linux-user.mak
index 2a25bf2fa39a..4249a37f6528 100644
--- a/configs/targets/microblaze-linux-user.mak
+++ b/configs/targets/microblaze-linux-user.mak
@@ -1,5 +1,5 @@
TARGET_ARCH=microblaze
TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_HAS_BFLT=y
diff --git a/configs/targets/microblaze-softmmu.mak b/configs/targets/microblaze-softmmu.mak
index 33f2a004029f..8385e2d33363 100644
--- a/configs/targets/microblaze-softmmu.mak
+++ b/configs/targets/microblaze-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=microblaze
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
TARGET_NEED_FDT=y
diff --git a/configs/targets/mips-linux-user.mak b/configs/targets/mips-linux-user.mak
index 19f5779831ae..71fa77d464dd 100644
--- a/configs/targets/mips-linux-user.mak
+++ b/configs/targets/mips-linux-user.mak
@@ -3,4 +3,4 @@ TARGET_ABI_MIPSO32=y
TARGET_SYSTBL_ABI=o32
TARGET_SYSTBL=syscall_o32.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/mips-softmmu.mak b/configs/targets/mips-softmmu.mak
index 8a49999a47dd..7787a4d94cf6 100644
--- a/configs/targets/mips-softmmu.mak
+++ b/configs/targets/mips-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=mips
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
diff --git a/configs/targets/mips64-linux-user.mak b/configs/targets/mips64-linux-user.mak
index 32fd1acdf254..5a4771f22dba 100644
--- a/configs/targets/mips64-linux-user.mak
+++ b/configs/targets/mips64-linux-user.mak
@@ -4,4 +4,4 @@ TARGET_BASE_ARCH=mips
TARGET_SYSTBL_ABI=n64
TARGET_SYSTBL=syscall_n64.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/mips64-softmmu.mak b/configs/targets/mips64-softmmu.mak
index ece25b96242e..568d66650c88 100644
--- a/configs/targets/mips64-softmmu.mak
+++ b/configs/targets/mips64-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=mips64
TARGET_BASE_ARCH=mips
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/mipsn32-linux-user.mak b/configs/targets/mipsn32-linux-user.mak
index b8c2441ad076..1e80b302fcb5 100644
--- a/configs/targets/mipsn32-linux-user.mak
+++ b/configs/targets/mipsn32-linux-user.mak
@@ -5,4 +5,4 @@ TARGET_BASE_ARCH=mips
TARGET_SYSTBL_ABI=n32
TARGET_SYSTBL=syscall_n32.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/or1k-linux-user.mak b/configs/targets/or1k-linux-user.mak
index 1dfb93e46dc8..39558f77ecfe 100644
--- a/configs/targets/or1k-linux-user.mak
+++ b/configs/targets/or1k-linux-user.mak
@@ -1,2 +1,2 @@
TARGET_ARCH=openrisc
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/or1k-softmmu.mak b/configs/targets/or1k-softmmu.mak
index 9e1d4a1fb1e5..263e97087094 100644
--- a/configs/targets/or1k-softmmu.mak
+++ b/configs/targets/or1k-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=openrisc
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_NEED_FDT=y
diff --git a/configs/targets/ppc-linux-user.mak b/configs/targets/ppc-linux-user.mak
index ca4187e4aaca..cc0439a52857 100644
--- a/configs/targets/ppc-linux-user.mak
+++ b/configs/targets/ppc-linux-user.mak
@@ -1,5 +1,5 @@
TARGET_ARCH=ppc
TARGET_SYSTBL_ABI=common,nospu,32
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
diff --git a/configs/targets/ppc-softmmu.mak b/configs/targets/ppc-softmmu.mak
index f4eef1819a66..774440108f7f 100644
--- a/configs/targets/ppc-softmmu.mak
+++ b/configs/targets/ppc-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=ppc
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
TARGET_NEED_FDT=y
diff --git a/configs/targets/ppc64-linux-user.mak b/configs/targets/ppc64-linux-user.mak
index 3133346676cf..4d81969f4a2d 100644
--- a/configs/targets/ppc64-linux-user.mak
+++ b/configs/targets/ppc64-linux-user.mak
@@ -3,5 +3,5 @@ TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc
TARGET_SYSTBL_ABI=common,nospu,64
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
diff --git a/configs/targets/ppc64-softmmu.mak b/configs/targets/ppc64-softmmu.mak
index 84fbf46be9e0..ddf0c39617f4 100644
--- a/configs/targets/ppc64-softmmu.mak
+++ b/configs/targets/ppc64-softmmu.mak
@@ -1,6 +1,6 @@
TARGET_ARCH=ppc64
TARGET_BASE_ARCH=ppc
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
TARGET_NEED_FDT=y
diff --git a/configs/targets/s390x-linux-user.mak b/configs/targets/s390x-linux-user.mak
index 9e31ce6457e9..e2978248eded 100644
--- a/configs/targets/s390x-linux-user.mak
+++ b/configs/targets/s390x-linux-user.mak
@@ -1,5 +1,5 @@
TARGET_ARCH=s390x
TARGET_SYSTBL_ABI=common,64
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml
diff --git a/configs/targets/s390x-softmmu.mak b/configs/targets/s390x-softmmu.mak
index fd9fbd870d32..258b4cf35824 100644
--- a/configs/targets/s390x-softmmu.mak
+++ b/configs/targets/s390x-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=s390x
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml
diff --git a/configs/targets/sh4eb-linux-user.mak b/configs/targets/sh4eb-linux-user.mak
index 9b6fb4c1bbed..6724165efee2 100644
--- a/configs/targets/sh4eb-linux-user.mak
+++ b/configs/targets/sh4eb-linux-user.mak
@@ -2,5 +2,5 @@ TARGET_ARCH=sh4
TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_HAS_BFLT=y
diff --git a/configs/targets/sh4eb-softmmu.mak b/configs/targets/sh4eb-softmmu.mak
index 382e9a80f8d2..dc8b30bf7a22 100644
--- a/configs/targets/sh4eb-softmmu.mak
+++ b/configs/targets/sh4eb-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=sh4
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc-linux-user.mak b/configs/targets/sparc-linux-user.mak
index 53dc7aaed5a6..00e7bc1f076a 100644
--- a/configs/targets/sparc-linux-user.mak
+++ b/configs/targets/sparc-linux-user.mak
@@ -2,4 +2,4 @@ TARGET_ARCH=sparc
TARGET_SYSTBL_ABI=common,32
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc-softmmu.mak b/configs/targets/sparc-softmmu.mak
index 9ba3d7b07f19..a849190f0108 100644
--- a/configs/targets/sparc-softmmu.mak
+++ b/configs/targets/sparc-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=sparc
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc32plus-linux-user.mak b/configs/targets/sparc32plus-linux-user.mak
index e4c51df3dcad..a65c0951a18b 100644
--- a/configs/targets/sparc32plus-linux-user.mak
+++ b/configs/targets/sparc32plus-linux-user.mak
@@ -5,4 +5,4 @@ TARGET_ABI_DIR=sparc
TARGET_SYSTBL_ABI=common,32
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc64-linux-user.mak b/configs/targets/sparc64-linux-user.mak
index 9d23ab4a266e..20fcb93fa4b1 100644
--- a/configs/targets/sparc64-linux-user.mak
+++ b/configs/targets/sparc64-linux-user.mak
@@ -4,4 +4,4 @@ TARGET_ABI_DIR=sparc
TARGET_SYSTBL_ABI=common,64
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc64-softmmu.mak b/configs/targets/sparc64-softmmu.mak
index 8dd321780042..c626ac3eae67 100644
--- a/configs/targets/sparc64-softmmu.mak
+++ b/configs/targets/sparc64-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=sparc64
TARGET_BASE_ARCH=sparc
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/xtensaeb-linux-user.mak b/configs/targets/xtensaeb-linux-user.mak
index 1ea0f1ba9156..bce2d1d65d23 100644
--- a/configs/targets/xtensaeb-linux-user.mak
+++ b/configs/targets/xtensaeb-linux-user.mak
@@ -1,5 +1,5 @@
TARGET_ARCH=xtensa
TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_HAS_BFLT=y
diff --git a/configs/targets/xtensaeb-softmmu.mak b/configs/targets/xtensaeb-softmmu.mak
index 405cf5acbb4a..b02e11b82008 100644
--- a/configs/targets/xtensaeb-softmmu.mak
+++ b/configs/targets/xtensaeb-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=xtensa
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
diff --git a/meson.build b/meson.build
index 7828f6537813..e03a1b50cc11 100644
--- a/meson.build
+++ b/meson.build
@@ -2186,6 +2186,9 @@ foreach target : target_dirs
if 'TARGET_ABI_DIR' not in config_target
config_target += {'TARGET_ABI_DIR': config_target['TARGET_ARCH']}
endif
+ if 'TARGET_BIG_ENDIAN' not in config_target
+ config_target += {'TARGET_BIG_ENDIAN': 'n'}
+ endif
foreach k, v: disassemblers
if host_arch.startswith(k) or config_target['TARGET_BASE_ARCH'].startswith(k)
@@ -2210,6 +2213,8 @@ foreach target : target_dirs
config_target_data.set_quoted(k, v)
elif v == 'y'
config_target_data.set(k, 1)
+ elif v == 'n'
+ config_target_data.set(k, 0)
else
config_target_data.set(k, v)
endif
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 21c06f2e7003..be6105385e8c 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -465,7 +465,7 @@ static inline void *lock_user_string(abi_ulong guest_addr)
static inline uint64_t target_arg64(uint32_t word0, uint32_t word1)
{
#if TARGET_ABI_BITS == 32
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
return ((uint64_t)word0 << 32) | word1;
#else
return ((uint64_t)word1 << 32) | word0;
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index f77070da5f7e..5d5290deb5a9 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -37,11 +37,10 @@
* HOST_BIG_ENDIAN : whether the host cpu is big endian and
* otherwise little endian.
*
- * TARGET_WORDS_BIGENDIAN : if defined, the host cpu is big endian and otherwise
- * little endian.
+ * TARGET_BIG_ENDIAN : same for the target cpu
*/
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
#define BSWAP_NEEDED
#endif
@@ -121,7 +120,7 @@ static inline void tswap64s(uint64_t *s)
/* Target-endianness CPU memory access functions. These fit into the
* {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h.
*/
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
#define lduw_p(p) lduw_be_p(p)
#define ldsw_p(p) ldsw_be_p(p)
#define ldl_p(p) ldl_be_p(p)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 6adacf89280d..d0c7c0d5fe8e 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -377,7 +377,7 @@ static inline CPUTLBEntry *tlb_entry(CPUArchState *env, uintptr_t mmu_idx,
#endif /* defined(CONFIG_USER_ONLY) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
# define cpu_lduw_data cpu_lduw_be_data
# define cpu_ldsw_data cpu_ldsw_be_data
# define cpu_ldl_data cpu_ldl_be_data
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 89edf94d2860..c35d7334b494 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -110,7 +110,7 @@ static inline int gdb_get_reg128(GByteArray *buf, uint64_t val_hi,
uint64_t val_lo)
{
uint64_t to_quad;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
to_quad = tswap64(val_hi);
g_byte_array_append(buf, (uint8_t *) &to_quad, 8);
to_quad = tswap64(val_lo);
diff --git a/include/exec/memop.h b/include/exec/memop.h
index 44f923ed4660..25d027434ad5 100644
--- a/include/exec/memop.h
+++ b/include/exec/memop.h
@@ -36,7 +36,7 @@ typedef enum MemOp {
MO_BE = MO_BSWAP,
#endif
#ifdef NEED_CPU_H
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
MO_TE = MO_BE,
#else
MO_TE = MO_LE,
diff --git a/include/exec/memory.h b/include/exec/memory.h
index e40653f0d19e..f1c19451bcd0 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -2931,7 +2931,7 @@ static inline MemOp devend_memop(enum device_endian end)
QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN &&
DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN);
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
/* Swap if non-host endianness or native (target) endianness */
return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP;
#else
diff --git a/include/exec/poison.h b/include/exec/poison.h
index 7c5c02f03f08..9f1ca3409c25 100644
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -38,7 +38,7 @@
#pragma GCC poison TARGET_HAS_BFLT
#pragma GCC poison TARGET_NAME
#pragma GCC poison TARGET_SUPPORTS_MTTCG
-#pragma GCC poison TARGET_WORDS_BIGENDIAN
+#pragma GCC poison TARGET_BIG_ENDIAN
#pragma GCC poison BSWAP_NEEDED
#pragma GCC poison TARGET_LONG_BITS
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index b0e2e5b9d253..13adb251b2ab 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -1028,7 +1028,7 @@ void cpu_exec_unrealizefn(CPUState *cpu);
* target_words_bigendian:
* Returns true if the (default) endianness of the target is big endian,
* false otherwise. Note that in target-specific code, you can use
- * TARGET_WORDS_BIGENDIAN directly instead. On the other hand, common
+ * TARGET_BIG_ENDIAN directly instead. On the other hand, common
* code should normally never need to know about the endianness of the
* target, so please do *not* use this function unless you know very well
* what you are doing!
diff --git a/include/hw/mips/bios.h b/include/hw/mips/bios.h
index c03007999a03..44acb6815bec 100644
--- a/include/hw/mips/bios.h
+++ b/include/hw/mips/bios.h
@@ -5,7 +5,7 @@
#include "cpu.h"
#define BIOS_SIZE (4 * MiB)
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define BIOS_FILENAME "mips_bios.bin"
#else
#define BIOS_FILENAME "mipsel_bios.bin"
diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h
index 90cbb77782b5..07aae69042a9 100644
--- a/include/hw/virtio/virtio-access.h
+++ b/include/hw/virtio/virtio-access.h
@@ -28,7 +28,7 @@ static inline bool virtio_access_is_big_endian(VirtIODevice *vdev)
{
#if defined(LEGACY_VIRTIO_IS_BIENDIAN)
return virtio_is_big_endian(vdev);
-#elif defined(TARGET_WORDS_BIGENDIAN)
+#elif TARGET_BIG_ENDIAN
if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {
/* Devices conforming to VIRTIO 1.0 or later are always LE. */
return false;
diff --git a/linux-user/aarch64/target_syscall.h b/linux-user/aarch64/target_syscall.h
index a98f568ab4d7..c055133725ec 100644
--- a/linux-user/aarch64/target_syscall.h
+++ b/linux-user/aarch64/target_syscall.h
@@ -8,7 +8,7 @@ struct target_pt_regs {
uint64_t pstate;
};
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
#define UNAME_MACHINE "aarch64_be"
#else
#define UNAME_MACHINE "aarch64"
diff --git a/linux-user/arm/target_syscall.h b/linux-user/arm/target_syscall.h
index f04f9c9e3d75..412ad434cfc2 100644
--- a/linux-user/arm/target_syscall.h
+++ b/linux-user/arm/target_syscall.h
@@ -18,7 +18,7 @@ struct target_pt_regs {
#define ARM_NR_set_tls (ARM_NR_BASE + 5)
#define ARM_NR_get_tls (ARM_NR_BASE + 6)
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
#define UNAME_MACHINE "armv5teb"
#else
#define UNAME_MACHINE "armv5tel"
diff --git a/linux-user/ppc/target_syscall.h b/linux-user/ppc/target_syscall.h
index 7df911893775..77b36d0b46e6 100644
--- a/linux-user/ppc/target_syscall.h
+++ b/linux-user/ppc/target_syscall.h
@@ -59,7 +59,7 @@ struct target_revectored_struct {
*/
#if defined(TARGET_PPC64)
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define UNAME_MACHINE "ppc64"
#else
#define UNAME_MACHINE "ppc64le"
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 98dfbf20962b..46550f5e2178 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -236,7 +236,7 @@ static inline bool access_ok(CPUState *cpu, int type,
} while (0)
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
# define __put_user(x, hptr) __put_user_e(x, hptr, be)
# define __get_user(x, hptr) __get_user_e(x, hptr, be)
#else
diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h
index a8fdd6933b23..49978d0c79a1 100644
--- a/linux-user/user-internals.h
+++ b/linux-user/user-internals.h
@@ -115,7 +115,7 @@ static inline int is_error(abi_long ret)
#if TARGET_ABI_BITS == 32
static inline uint64_t target_offset64(uint32_t word0, uint32_t word1)
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
return ((uint64_t)word0 << 32) | word1;
#else
return ((uint64_t)word1 << 32) | word0;
diff --git a/linux-user/xtensa/target_structs.h b/linux-user/xtensa/target_structs.h
index 9cde6844b8fc..cb1b3411cf08 100644
--- a/linux-user/xtensa/target_structs.h
+++ b/linux-user/xtensa/target_structs.h
@@ -15,7 +15,7 @@ struct target_ipc_perm {
struct target_semid64_ds {
struct target_ipc_perm sem_perm;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
abi_ulong __unused1;
abi_ulong sem_otime;
abi_ulong __unused2;
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 816aa0394e9f..ccf635ac5cbc 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -3549,12 +3549,12 @@ static inline int cpu_mmu_index(CPUARMState *env, bool ifetch)
static inline bool bswap_code(bool sctlr_b)
{
#ifdef CONFIG_USER_ONLY
- /* BE8 (SCTLR.B = 0, TARGET_WORDS_BIGENDIAN = 1) is mixed endian.
- * The invalid combination SCTLR.B=1/CPSR.E=1/TARGET_WORDS_BIGENDIAN=0
+ /* BE8 (SCTLR.B = 0, TARGET_BIG_ENDIAN = 1) is mixed endian.
+ * The invalid combination SCTLR.B=1/CPSR.E=1/TARGET_BIG_ENDIAN=0
* would also end up as a mixed-endian mode with BE code, LE data.
*/
return
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
1 ^
#endif
sctlr_b;
@@ -3570,7 +3570,7 @@ static inline bool bswap_code(bool sctlr_b)
static inline bool arm_cpu_bswap_data(CPUARMState *env)
{
return
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
1 ^
#endif
arm_cpu_data_is_big_endian(env);
diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index a572e831aebf..f10cfabdc35c 100644
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -590,7 +590,7 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
#define XTENSA_CPU_TYPE_NAME(model) model XTENSA_CPU_TYPE_SUFFIX
#define CPU_RESOLVING_TYPE TYPE_XTENSA_CPU
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define XTENSA_DEFAULT_CPU_MODEL "fsf"
#define XTENSA_DEFAULT_CPU_NOMMU_MODEL "fsf"
#else
diff --git a/target/xtensa/overlay_tool.h b/target/xtensa/overlay_tool.h
index 78720734fe92..701c00eed20a 100644
--- a/target/xtensa/overlay_tool.h
+++ b/target/xtensa/overlay_tool.h
@@ -449,7 +449,7 @@
#endif
-#if (defined(TARGET_WORDS_BIGENDIAN) != 0) == (XCHAL_HAVE_BE != 0)
+#if TARGET_BIG_ENDIAN == (XCHAL_HAVE_BE != 0)
#define REGISTER_CORE(core) \
static void __attribute__((constructor)) register_core(void) \
{ \
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 1c129dc90c8b..8d9d2367ee02 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1202,7 +1202,7 @@ void kvm_hwpoison_page_add(ram_addr_t ram_addr)
static uint32_t adjust_ioeventfd_endianness(uint32_t val, uint32_t size)
{
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
/* The kernel expects ioeventfd values in HOST_BIG_ENDIAN
* endianness, but the memory core hands them in target endianness.
* For example, PPC is always treated as big-endian even if running
diff --git a/cpu.c b/cpu.c
index be1f8b074ce4..d34c3439bbf3 100644
--- a/cpu.c
+++ b/cpu.c
@@ -469,7 +469,7 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
bool target_words_bigendian(void)
{
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
return true;
#else
return false;
diff --git a/disas.c b/disas.c
index 2d2565ac5774..8c16e55c7e72 100644
--- a/disas.c
+++ b/disas.c
@@ -126,7 +126,7 @@ static void initialize_debug_target(CPUDebug *s, CPUState *cpu)
s->cpu = cpu;
s->info.read_memory_func = target_read_memory;
s->info.print_address_func = print_address;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->info.endian = BFD_ENDIAN_BIG;
#else
s->info.endian = BFD_ENDIAN_LITTLE;
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 41cfca0f2236..32349ec94b17 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -577,7 +577,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size)
int asidx;
CPUState *cs = CPU(cpu);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#else
big_endian = 0;
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 737cfbde98ce..5dca2d15284e 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2242,7 +2242,7 @@ bool vga_common_init(VGACommonState *s, Object *obj, Error **errp)
* into a device attribute set by the machine/platform to remove
* all target endian dependencies from this file.
*/
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->default_endian_fb = true;
#else
s->default_endian_fb = false;
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 8821d009f1a9..03c030aa2cf0 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -138,7 +138,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
uint32_t base32;
int big_endian = 0;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#endif
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index e0ff1b556603..19d0d9889f5e 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -986,7 +986,7 @@ static void gt64120_reset(DeviceState *dev)
/* FIXME: Malta specific hw assumptions ahead */
/* CPU Configuration */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->regs[GT_CPU] = 0x00000000;
#else
s->regs[GT_CPU] = 0x00001000;
@@ -1097,7 +1097,7 @@ static void gt64120_reset(DeviceState *dev)
s->regs[GT_TC_CONTROL] = 0x00000000;
/* PCI Internal */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->regs[GT_PCI0_CMD] = 0x00000000;
#else
s->regs[GT_PCI0_CMD] = 0x00010001;
@@ -1118,7 +1118,7 @@ static void gt64120_reset(DeviceState *dev)
s->regs[GT_PCI0_SSCS10_BAR] = 0x00000000;
s->regs[GT_PCI0_SSCS32_BAR] = 0x01000000;
s->regs[GT_PCI0_SCS3BT_BAR] = 0x1f000000;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->regs[GT_PCI1_CMD] = 0x00000000;
#else
s->regs[GT_PCI1_CMD] = 0x00010001;
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 44f0d48bfd75..4d6b44de342e 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -158,7 +158,7 @@ static void mips_jazz_init(MachineState *machine,
[JAZZ_PICA61] = {33333333, 4},
};
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#else
big_endian = 0;
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 6288511723e1..c4474b927c46 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -367,7 +367,7 @@ static uint64_t malta_fpga_read(void *opaque, hwaddr addr,
/* STATUS Register */
case 0x00208:
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
val = 0x00000012;
#else
val = 0x00000010;
@@ -695,7 +695,7 @@ static void write_bootloader_nanomips(uint8_t *base, uint64_t run_addr,
stw_p(p++, 0xe040); stw_p(p++, 0x0681);
/* lui t1, %hi(0xb4000000) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stw_p(p++, 0xe020); stw_p(p++, 0x0be1);
/* lui t0, %hi(0xdf000000) */
@@ -894,7 +894,7 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,
/* Load BAR registers as done by YAMON */
stl_p(p++, 0x3c09b400); /* lui t1, 0xb400 */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c08df00); /* lui t0, 0xdf00 */
#else
stl_p(p++, 0x340800df); /* ori t0, r0, 0x00df */
@@ -903,39 +903,39 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,
stl_p(p++, 0x3c09bbe0); /* lui t1, 0xbbe0 */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c08c000); /* lui t0, 0xc000 */
#else
stl_p(p++, 0x340800c0); /* ori t0, r0, 0x00c0 */
#endif
stl_p(p++, 0xad280048); /* sw t0, 0x0048(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c084000); /* lui t0, 0x4000 */
#else
stl_p(p++, 0x34080040); /* ori t0, r0, 0x0040 */
#endif
stl_p(p++, 0xad280050); /* sw t0, 0x0050(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c088000); /* lui t0, 0x8000 */
#else
stl_p(p++, 0x34080080); /* ori t0, r0, 0x0080 */
#endif
stl_p(p++, 0xad280058); /* sw t0, 0x0058(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c083f00); /* lui t0, 0x3f00 */
#else
stl_p(p++, 0x3408003f); /* ori t0, r0, 0x003f */
#endif
stl_p(p++, 0xad280060); /* sw t0, 0x0060(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c08c100); /* lui t0, 0xc100 */
#else
stl_p(p++, 0x340800c1); /* ori t0, r0, 0x00c1 */
#endif
stl_p(p++, 0xad280080); /* sw t0, 0x0080(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c085e00); /* lui t0, 0x5e00 */
#else
stl_p(p++, 0x3408005e); /* ori t0, r0, 0x005e */
@@ -1030,7 +1030,7 @@ static uint64_t load_kernel(void)
int prom_index = 0;
uint64_t (*xlate_to_kseg0) (void *opaque, uint64_t addr);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#else
big_endian = 0;
@@ -1272,7 +1272,7 @@ void mips_malta_init(MachineState *machine)
ram_low_postio);
}
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
be = 1;
#else
be = 0;
@@ -1353,7 +1353,7 @@ void mips_malta_init(MachineState *machine)
* In little endian mode the 32bit words in the bios are swapped,
* a neat trick which allows bi-endian firmware.
*/
-#ifndef TARGET_WORDS_BIGENDIAN
+#if !TARGET_BIG_ENDIAN
{
uint32_t *end, *addr;
const size_t swapsize = MIN(bios_size, 0x3e0000);
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index 27a46bd5380b..30bc1c4f086f 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -65,7 +65,7 @@ static uint64_t load_kernel(void)
ram_addr_t initrd_offset;
int big_endian;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#else
big_endian = 0;
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index 5b3e4efed5be..e889595d5c2b 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -140,7 +140,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,
uint64_t entry, high;
int big_endian = 0;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#endif
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 2028fe793d9b..946c71cb5b5c 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -96,7 +96,7 @@ XtensaCPU *xtensa_sim_common_init(MachineState *machine)
void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine)
{
const char *kernel_filename = machine->kernel_filename;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
int big_endian = true;
#else
int big_endian = false;
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index c1e004e8822d..2a5556a35f50 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -219,7 +219,7 @@ static const MemoryRegionOps xtfpga_io_ops = {
static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
int be = 1;
#else
int be = 0;
@@ -430,7 +430,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
}
if (entry_point != env->pc) {
uint8_t boot[] = {
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
0x60, 0x00, 0x08, /* j 1f */
0x00, /* .literal_position */
0x00, 0x00, 0x00, 0x00, /* .literal entry_pc */
diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
index 1737e2ea655a..31a66a4fa07c 100644
--- a/linux-user/aarch64/cpu_loop.c
+++ b/linux-user/aarch64/cpu_loop.c
@@ -202,7 +202,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
}
env->pc = regs->pc;
env->xregs[31] = regs->sp;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
env->cp15.sctlr_el[1] |= SCTLR_E0E;
for (i = 1; i < 4; ++i) {
env->cp15.sctlr_el[i] |= SCTLR_EE;
diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c
index df9e39a4ba04..7de4c96eb9d0 100644
--- a/linux-user/aarch64/signal.c
+++ b/linux-user/aarch64/signal.c
@@ -147,7 +147,7 @@ static void target_setup_fpsimd_record(struct target_fpsimd_context *fpsimd,
for (i = 0; i < 32; i++) {
uint64_t *q = aa64_vfp_qreg(env, i);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
__put_user(q[0], &fpsimd->vregs[i * 2 + 1]);
__put_user(q[1], &fpsimd->vregs[i * 2]);
#else
@@ -233,7 +233,7 @@ static void target_restore_fpsimd_record(CPUARMState *env,
for (i = 0; i < 32; i++) {
uint64_t *q = aa64_vfp_qreg(env, i);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
__get_user(q[0], &fpsimd->vregs[i * 2 + 1]);
__get_user(q[1], &fpsimd->vregs[i * 2]);
#else
diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index 032e1ffddfbd..9dcb2e024eb0 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -485,7 +485,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
for(i = 0; i < 16; i++) {
env->regs[i] = regs->uregs[i];
}
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
/* Enable BE8. */
if (EF_ARM_EABI_VERSION(info->elf_flags) >= EF_ARM_EABI_VER4
&& (info->elf_flags & EF_ARM_BE8)) {
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 9628a38361cb..796acdcdbd2c 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -105,7 +105,7 @@ int info_is_fdpic(struct image_info *info)
#define ELIBBAD 80
#endif
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define ELF_DATA ELFDATA2MSB
#else
#define ELF_DATA ELFDATA2LSB
@@ -483,7 +483,7 @@ static const char *get_elf_platform(void)
{
CPUARMState *env = thread_cpu->env_ptr;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
# define END "b"
#else
# define END "l"
@@ -514,7 +514,7 @@ static const char *get_elf_platform(void)
#define ELF_ARCH EM_AARCH64
#define ELF_CLASS ELFCLASS64
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
# define ELF_PLATFORM "aarch64_be"
#else
# define ELF_PLATFORM "aarch64"
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index 2550b8f8c069..accf5aa199c8 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -215,7 +215,7 @@ static target_ulong get_sigframe(struct target_sigaction *ka,
return (oldsp - frame_size) & ~0xFUL;
}
-#if defined(TARGET_WORDS_BIGENDIAN) == HOST_BIG_ENDIAN
+#if TARGET_BIG_ENDIAN == HOST_BIG_ENDIAN
#define PPC_VEC_HI 0
#define PPC_VEC_LO 1
#else
@@ -542,7 +542,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
env->nip = (target_ulong) ka->_sa_handler;
#endif
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
/* Signal handlers are entered in big-endian mode. */
ppc_store_msr(env, env->msr & ~(1ull << MSR_LE));
#else
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7182dbd9796d..dc7b513c3cbb 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8152,7 +8152,7 @@ static int is_proc_myself(const char *filename, const char *entry)
return 0;
}
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) || \
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN || \
defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA)
static int is_proc(const char *filename, const char *entry)
{
@@ -8160,7 +8160,7 @@ static int is_proc(const char *filename, const char *entry)
}
#endif
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
static int open_net_route(void *cpu_env, int fd)
{
FILE *fp;
@@ -8246,7 +8246,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
{ "stat", open_self_stat, is_proc_myself },
{ "auxv", open_self_auxv, is_proc_myself },
{ "cmdline", open_self_cmdline, is_proc_myself },
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
{ "/proc/net/route", open_net_route, is_proc },
#endif
#if defined(TARGET_SPARC) || defined(TARGET_HPPA)
diff --git a/linux-user/uname.c b/linux-user/uname.c
index 1d82608c100f..0856783b2190 100644
--- a/linux-user/uname.c
+++ b/linux-user/uname.c
@@ -41,7 +41,7 @@ const char *cpu_to_uname_machine(void *cpu_env)
/* in theory, endianness is configurable on some ARM CPUs, but this isn't
* used in user mode emulation */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define utsname_suffix "b"
#else
#define utsname_suffix "l"
diff --git a/linux-user/xtensa/signal.c b/linux-user/xtensa/signal.c
index 06d91a37ecee..f5fb8b5cbebe 100644
--- a/linux-user/xtensa/signal.c
+++ b/linux-user/xtensa/signal.c
@@ -130,7 +130,7 @@ static int setup_sigcontext(struct target_rt_sigframe *frame,
static void install_sigtramp(uint8_t *tramp)
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
/* Generate instruction: MOVI a2, __NR_rt_sigreturn */
__put_user(0x22, &tramp[0]);
__put_user(0x0a, &tramp[1]);
diff --git a/softmmu/memory.c b/softmmu/memory.c
index 8060c6de7802..0456a6c051eb 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -350,7 +350,7 @@ static void flatview_simplify(FlatView *view)
static bool memory_region_big_endian(MemoryRegion *mr)
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
return mr->ops->endianness != DEVICE_LITTLE_ENDIAN;
#else
return mr->ops->endianness == DEVICE_BIG_ENDIAN;
diff --git a/softmmu/qtest.c b/softmmu/qtest.c
index cc586233a974..6a0edd733b79 100644
--- a/softmmu/qtest.c
+++ b/softmmu/qtest.c
@@ -732,7 +732,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
qtest_send(chr, "OK\n");
} else if (strcmp(words[0], "endianness") == 0) {
qtest_send_prefix(chr);
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
qtest_sendf(chr, "OK big\n");
#else
qtest_sendf(chr, "OK little\n");
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 5d4ca7a22700..0980d3390112 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -812,7 +812,7 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info)
sctlr_b = arm_sctlr_b(env);
if (bswap_code(sctlr_b)) {
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
info->endian = BFD_ENDIAN_LITTLE;
#else
info->endian = BFD_ENDIAN_BIG;
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index af287177d5af..ad74fbe636af 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -189,7 +189,7 @@ static void mips_cpu_reset(DeviceState *dev)
/* Reset registers to their default values */
env->CP0_PRid = env->cpu_model->CP0_PRid;
env->CP0_Config0 = env->cpu_model->CP0_Config0;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
env->CP0_Config0 |= (1 << CP0C0_BE);
#endif
env->CP0_Config1 = env->cpu_model->CP0_Config1;
@@ -418,7 +418,7 @@ static void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info)
CPUMIPSState *env = &cpu->env;
if (!(env->insn_flags & ISA_NANOMIPS32)) {
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
info->print_insn = print_insn_big_mips;
#else
info->print_insn = print_insn_little_mips;
diff --git a/target/mips/tcg/msa_helper.c b/target/mips/tcg/msa_helper.c
index 389c42e4baa3..4dde5d639ad4 100644
--- a/target/mips/tcg/msa_helper.c
+++ b/target/mips/tcg/msa_helper.c
@@ -8218,7 +8218,7 @@ void helper_msa_ffint_u_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
#define MEMOP_IDX(DF)
#endif
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
static inline uint64_t bswap16x4(uint64_t x)
{
uint64_t m = 0x00ff00ff00ff00ffull;
@@ -8258,7 +8258,7 @@ void helper_msa_ld_h(CPUMIPSState *env, uint32_t wd,
*/
d0 = cpu_ldq_le_data_ra(env, addr + 0, ra);
d1 = cpu_ldq_le_data_ra(env, addr + 8, ra);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
d0 = bswap16x4(d0);
d1 = bswap16x4(d1);
#endif
@@ -8279,7 +8279,7 @@ void helper_msa_ld_w(CPUMIPSState *env, uint32_t wd,
*/
d0 = cpu_ldq_le_data_ra(env, addr + 0, ra);
d1 = cpu_ldq_le_data_ra(env, addr + 8, ra);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
d0 = bswap32x2(d0);
d1 = bswap32x2(d1);
#endif
@@ -8345,7 +8345,7 @@ void helper_msa_st_h(CPUMIPSState *env, uint32_t wd,
/* Store 8 bytes at a time. See helper_msa_ld_h. */
d0 = pwd->d[0];
d1 = pwd->d[1];
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
d0 = bswap16x4(d0);
d1 = bswap16x4(d1);
#endif
@@ -8366,7 +8366,7 @@ void helper_msa_st_w(CPUMIPSState *env, uint32_t wd,
/* Store 8 bytes at a time. See helper_msa_ld_w. */
d0 = pwd->d[0];
d1 = pwd->d[1];
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
d0 = bswap32x2(d0);
d1 = bswap32x2(d1);
#endif
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 073fd101687c..5062d0e4782a 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -7150,7 +7150,7 @@ static void ppc_cpu_reset(DeviceState *dev)
#if defined(TARGET_PPC64)
msr |= (target_ulong)1 << MSR_TM; /* Transactional memory */
#endif
-#if !defined(TARGET_WORDS_BIGENDIAN)
+#if !TARGET_BIG_ENDIAN
msr |= (target_ulong)1 << MSR_LE; /* Little-endian user mode */
if (!((env->msr_mask >> MSR_LE) & 1)) {
fprintf(stderr, "Selected CPU does not support little-endian.\n");
diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c
index 105c2f7dd13f..1252429a2ad5 100644
--- a/target/ppc/gdbstub.c
+++ b/target/ppc/gdbstub.c
@@ -87,9 +87,9 @@ static int ppc_gdb_register_len(int n)
/*
* We need to present the registers to gdb in the "current" memory
* ordering. For user-only mode we get this for free;
- * TARGET_WORDS_BIGENDIAN is set to the proper ordering for the
+ * TARGET_BIG_ENDIAN is set to the proper ordering for the
* binary, and cannot be changed. For system mode,
- * TARGET_WORDS_BIGENDIAN is always set, and we must check the current
+ * TARGET_BIG_ENDIAN is always set, and we must check the current
* mode of the chip to see if we're running in little-endian.
*/
void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len)
diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c
index f1c76a7750ab..c4ff8fd632ce 100644
--- a/target/ppc/mem_helper.c
+++ b/target/ppc/mem_helper.c
@@ -32,7 +32,7 @@
static inline bool needs_byteswap(const CPUPPCState *env)
{
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
return msr_le;
#else
return !msr_le;
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 408ae26173de..f14f8d7309ba 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -193,7 +193,7 @@ struct DisasContext {
/* Return true iff byteswap is needed in a scalar memop */
static inline bool need_byteswap(const DisasContext *ctx)
{
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
return ctx->le_mode;
#else
return !ctx->le_mode;
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index b1491ed625e5..fc4e9d2c9a86 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -1471,14 +1471,14 @@ static void translate_b(DisasContext *dc, const OpcodeArg arg[],
static void translate_bb(DisasContext *dc, const OpcodeArg arg[],
const uint32_t par[])
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
TCGv_i32 bit = tcg_const_i32(0x80000000u);
#else
TCGv_i32 bit = tcg_const_i32(0x00000001u);
#endif
TCGv_i32 tmp = tcg_temp_new_i32();
tcg_gen_andi_i32(tmp, arg[1].in, 0x1f);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
tcg_gen_shr_i32(bit, bit, tmp);
#else
tcg_gen_shl_i32(bit, bit, tmp);
@@ -1493,7 +1493,7 @@ static void translate_bbi(DisasContext *dc, const OpcodeArg arg[],
const uint32_t par[])
{
TCGv_i32 tmp = tcg_temp_new_i32();
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
tcg_gen_andi_i32(tmp, arg[0].in, 0x80000000u >> arg[1].imm);
#else
tcg_gen_andi_i32(tmp, arg[0].in, 0x00000001u << arg[1].imm);
diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target
index 9530cac2ad95..973e55298ee4 100644
--- a/tests/tcg/xtensa/Makefile.softmmu-target
+++ b/tests/tcg/xtensa/Makefile.softmmu-target
@@ -2,7 +2,7 @@
# Xtensa softmmu tests
#
-ifneq ($(TARGET_WORDS_BIGENDIAN),y)
+ifneq ($(TARGET_BIG_ENDIAN),y)
XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa
XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(wildcard $(XTENSA_SRC)/*.S))
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 07/32] Replace TARGET_WORDS_BIGENDIAN
@ 2022-03-23 15:57 ` marcandre.lureau
0 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Daniel Henrique Barboza,
open list:Overall KVM CPUs, David Hildenbrand, Thomas Huth,
Peter Xu, Philippe Mathieu-Daudé,
Yanan Wang, Max Filippov, Gerd Hoffmann, Edgar E. Iglesias,
Warner Losh, Marek Vasut, Michael S. Tsirkin,
Hervé Poussineau, Marc-André Lureau, Aleksandar Rikalo,
Kyle Evans, Richard Henderson, Greg Kurz, open list:ARM TCG CPUs,
Alex Bennée, David Gibson, Eduardo Habkost, Chris Wulff,
Laurent Vivier, open list:PowerPC TCG CPUs, Paolo Bonzini,
Aurelien Jarno, Cédric Le Goater
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Convert the TARGET_WORDS_BIGENDIAN macro, similarly to what was done
with HOST_BIG_ENDIAN. The new TARGET_BIG_ENDIAN macro is either 0 or 1,
and thus should always be defined to prevent misuse.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: Halil Pasic <pasic@linux.ibm.com>
---
docs/devel/loads-stores.rst | 2 +-
configs/targets/aarch64_be-linux-user.mak | 2 +-
configs/targets/armeb-linux-user.mak | 2 +-
configs/targets/hppa-linux-user.mak | 2 +-
configs/targets/hppa-softmmu.mak | 2 +-
configs/targets/m68k-linux-user.mak | 2 +-
configs/targets/m68k-softmmu.mak | 2 +-
configs/targets/microblaze-linux-user.mak | 2 +-
configs/targets/microblaze-softmmu.mak | 2 +-
configs/targets/mips-linux-user.mak | 2 +-
configs/targets/mips-softmmu.mak | 2 +-
configs/targets/mips64-linux-user.mak | 2 +-
configs/targets/mips64-softmmu.mak | 2 +-
configs/targets/mipsn32-linux-user.mak | 2 +-
configs/targets/or1k-linux-user.mak | 2 +-
configs/targets/or1k-softmmu.mak | 2 +-
configs/targets/ppc-linux-user.mak | 2 +-
configs/targets/ppc-softmmu.mak | 2 +-
configs/targets/ppc64-linux-user.mak | 2 +-
configs/targets/ppc64-softmmu.mak | 2 +-
configs/targets/s390x-linux-user.mak | 2 +-
configs/targets/s390x-softmmu.mak | 2 +-
configs/targets/sh4eb-linux-user.mak | 2 +-
configs/targets/sh4eb-softmmu.mak | 2 +-
configs/targets/sparc-linux-user.mak | 2 +-
configs/targets/sparc-softmmu.mak | 2 +-
configs/targets/sparc32plus-linux-user.mak | 2 +-
configs/targets/sparc64-linux-user.mak | 2 +-
configs/targets/sparc64-softmmu.mak | 2 +-
configs/targets/xtensaeb-linux-user.mak | 2 +-
configs/targets/xtensaeb-softmmu.mak | 2 +-
meson.build | 5 +++++
bsd-user/qemu.h | 2 +-
include/exec/cpu-all.h | 7 +++----
include/exec/cpu_ldst.h | 2 +-
include/exec/gdbstub.h | 2 +-
include/exec/memop.h | 2 +-
include/exec/memory.h | 2 +-
include/exec/poison.h | 2 +-
include/hw/core/cpu.h | 2 +-
include/hw/mips/bios.h | 2 +-
include/hw/virtio/virtio-access.h | 2 +-
linux-user/aarch64/target_syscall.h | 2 +-
linux-user/arm/target_syscall.h | 2 +-
linux-user/ppc/target_syscall.h | 2 +-
linux-user/qemu.h | 2 +-
linux-user/user-internals.h | 2 +-
linux-user/xtensa/target_structs.h | 2 +-
target/arm/cpu.h | 8 ++++----
target/xtensa/cpu.h | 2 +-
target/xtensa/overlay_tool.h | 2 +-
accel/kvm/kvm-all.c | 2 +-
cpu.c | 2 +-
disas.c | 2 +-
hw/arm/armv7m.c | 2 +-
hw/display/vga.c | 2 +-
hw/microblaze/boot.c | 2 +-
hw/mips/gt64xxx_pci.c | 6 +++---
hw/mips/jazz.c | 2 +-
hw/mips/malta.c | 24 +++++++++++-----------
hw/mips/mipssim.c | 2 +-
hw/nios2/boot.c | 2 +-
hw/xtensa/sim.c | 2 +-
hw/xtensa/xtfpga.c | 4 ++--
linux-user/aarch64/cpu_loop.c | 2 +-
linux-user/aarch64/signal.c | 4 ++--
linux-user/arm/cpu_loop.c | 2 +-
linux-user/elfload.c | 6 +++---
linux-user/ppc/signal.c | 4 ++--
linux-user/syscall.c | 6 +++---
linux-user/uname.c | 2 +-
linux-user/xtensa/signal.c | 2 +-
softmmu/memory.c | 2 +-
softmmu/qtest.c | 2 +-
target/arm/cpu.c | 2 +-
target/mips/cpu.c | 4 ++--
target/mips/tcg/msa_helper.c | 10 ++++-----
target/ppc/cpu_init.c | 2 +-
target/ppc/gdbstub.c | 4 ++--
target/ppc/mem_helper.c | 2 +-
target/ppc/translate.c | 2 +-
target/xtensa/translate.c | 6 +++---
tests/tcg/xtensa/Makefile.softmmu-target | 2 +-
83 files changed, 120 insertions(+), 116 deletions(-)
diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst
index 8f0035c821bf..ad5dfe133e15 100644
--- a/docs/devel/loads-stores.rst
+++ b/docs/devel/loads-stores.rst
@@ -275,7 +275,7 @@ called during the translator callback ``translate_insn``.
There is a set of functions ending in ``_swap`` which, if the parameter
is true, returns the value in the endianness that is the reverse of
-the guest native endianness, as determined by ``TARGET_WORDS_BIGENDIAN``.
+the guest native endianness, as determined by ``TARGET_BIG_ENDIAN``.
Function names follow the pattern:
diff --git a/configs/targets/aarch64_be-linux-user.mak b/configs/targets/aarch64_be-linux-user.mak
index d3ee10c00f31..77944247459b 100644
--- a/configs/targets/aarch64_be-linux-user.mak
+++ b/configs/targets/aarch64_be-linux-user.mak
@@ -1,6 +1,6 @@
TARGET_ARCH=aarch64
TARGET_BASE_ARCH=arm
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml
TARGET_HAS_BFLT=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/configs/targets/armeb-linux-user.mak b/configs/targets/armeb-linux-user.mak
index f81e5bf1fe4b..a249cc2e29d6 100644
--- a/configs/targets/armeb-linux-user.mak
+++ b/configs/targets/armeb-linux-user.mak
@@ -1,7 +1,7 @@
TARGET_ARCH=arm
TARGET_SYSTBL_ABI=common,oabi
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-vfp-sysregs.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml gdb-xml/arm-m-profile-mve.xml
TARGET_HAS_BFLT=y
CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/configs/targets/hppa-linux-user.mak b/configs/targets/hppa-linux-user.mak
index f01e0a7b9ed8..db873a879688 100644
--- a/configs/targets/hppa-linux-user.mak
+++ b/configs/targets/hppa-linux-user.mak
@@ -2,4 +2,4 @@ TARGET_ARCH=hppa
TARGET_SYSTBL_ABI=common,32
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/hppa-softmmu.mak b/configs/targets/hppa-softmmu.mak
index e3e71eb21b9a..44f07b033238 100644
--- a/configs/targets/hppa-softmmu.mak
+++ b/configs/targets/hppa-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=hppa
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
diff --git a/configs/targets/m68k-linux-user.mak b/configs/targets/m68k-linux-user.mak
index 805d16c6ab2d..579b5d299ccf 100644
--- a/configs/targets/m68k-linux-user.mak
+++ b/configs/targets/m68k-linux-user.mak
@@ -1,6 +1,6 @@
TARGET_ARCH=m68k
TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml
TARGET_HAS_BFLT=y
diff --git a/configs/targets/m68k-softmmu.mak b/configs/targets/m68k-softmmu.mak
index 5df1a2b7d76c..bbcd0bada698 100644
--- a/configs/targets/m68k-softmmu.mak
+++ b/configs/targets/m68k-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=m68k
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml
diff --git a/configs/targets/microblaze-linux-user.mak b/configs/targets/microblaze-linux-user.mak
index 2a25bf2fa39a..4249a37f6528 100644
--- a/configs/targets/microblaze-linux-user.mak
+++ b/configs/targets/microblaze-linux-user.mak
@@ -1,5 +1,5 @@
TARGET_ARCH=microblaze
TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_HAS_BFLT=y
diff --git a/configs/targets/microblaze-softmmu.mak b/configs/targets/microblaze-softmmu.mak
index 33f2a004029f..8385e2d33363 100644
--- a/configs/targets/microblaze-softmmu.mak
+++ b/configs/targets/microblaze-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=microblaze
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
TARGET_NEED_FDT=y
diff --git a/configs/targets/mips-linux-user.mak b/configs/targets/mips-linux-user.mak
index 19f5779831ae..71fa77d464dd 100644
--- a/configs/targets/mips-linux-user.mak
+++ b/configs/targets/mips-linux-user.mak
@@ -3,4 +3,4 @@ TARGET_ABI_MIPSO32=y
TARGET_SYSTBL_ABI=o32
TARGET_SYSTBL=syscall_o32.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/mips-softmmu.mak b/configs/targets/mips-softmmu.mak
index 8a49999a47dd..7787a4d94cf6 100644
--- a/configs/targets/mips-softmmu.mak
+++ b/configs/targets/mips-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=mips
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
diff --git a/configs/targets/mips64-linux-user.mak b/configs/targets/mips64-linux-user.mak
index 32fd1acdf254..5a4771f22dba 100644
--- a/configs/targets/mips64-linux-user.mak
+++ b/configs/targets/mips64-linux-user.mak
@@ -4,4 +4,4 @@ TARGET_BASE_ARCH=mips
TARGET_SYSTBL_ABI=n64
TARGET_SYSTBL=syscall_n64.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/mips64-softmmu.mak b/configs/targets/mips64-softmmu.mak
index ece25b96242e..568d66650c88 100644
--- a/configs/targets/mips64-softmmu.mak
+++ b/configs/targets/mips64-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=mips64
TARGET_BASE_ARCH=mips
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/mipsn32-linux-user.mak b/configs/targets/mipsn32-linux-user.mak
index b8c2441ad076..1e80b302fcb5 100644
--- a/configs/targets/mipsn32-linux-user.mak
+++ b/configs/targets/mipsn32-linux-user.mak
@@ -5,4 +5,4 @@ TARGET_BASE_ARCH=mips
TARGET_SYSTBL_ABI=n32
TARGET_SYSTBL=syscall_n32.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/or1k-linux-user.mak b/configs/targets/or1k-linux-user.mak
index 1dfb93e46dc8..39558f77ecfe 100644
--- a/configs/targets/or1k-linux-user.mak
+++ b/configs/targets/or1k-linux-user.mak
@@ -1,2 +1,2 @@
TARGET_ARCH=openrisc
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/or1k-softmmu.mak b/configs/targets/or1k-softmmu.mak
index 9e1d4a1fb1e5..263e97087094 100644
--- a/configs/targets/or1k-softmmu.mak
+++ b/configs/targets/or1k-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=openrisc
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_NEED_FDT=y
diff --git a/configs/targets/ppc-linux-user.mak b/configs/targets/ppc-linux-user.mak
index ca4187e4aaca..cc0439a52857 100644
--- a/configs/targets/ppc-linux-user.mak
+++ b/configs/targets/ppc-linux-user.mak
@@ -1,5 +1,5 @@
TARGET_ARCH=ppc
TARGET_SYSTBL_ABI=common,nospu,32
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
diff --git a/configs/targets/ppc-softmmu.mak b/configs/targets/ppc-softmmu.mak
index f4eef1819a66..774440108f7f 100644
--- a/configs/targets/ppc-softmmu.mak
+++ b/configs/targets/ppc-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=ppc
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
TARGET_NEED_FDT=y
diff --git a/configs/targets/ppc64-linux-user.mak b/configs/targets/ppc64-linux-user.mak
index 3133346676cf..4d81969f4a2d 100644
--- a/configs/targets/ppc64-linux-user.mak
+++ b/configs/targets/ppc64-linux-user.mak
@@ -3,5 +3,5 @@ TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc
TARGET_SYSTBL_ABI=common,nospu,64
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
diff --git a/configs/targets/ppc64-softmmu.mak b/configs/targets/ppc64-softmmu.mak
index 84fbf46be9e0..ddf0c39617f4 100644
--- a/configs/targets/ppc64-softmmu.mak
+++ b/configs/targets/ppc64-softmmu.mak
@@ -1,6 +1,6 @@
TARGET_ARCH=ppc64
TARGET_BASE_ARCH=ppc
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
TARGET_NEED_FDT=y
diff --git a/configs/targets/s390x-linux-user.mak b/configs/targets/s390x-linux-user.mak
index 9e31ce6457e9..e2978248eded 100644
--- a/configs/targets/s390x-linux-user.mak
+++ b/configs/targets/s390x-linux-user.mak
@@ -1,5 +1,5 @@
TARGET_ARCH=s390x
TARGET_SYSTBL_ABI=common,64
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml
diff --git a/configs/targets/s390x-softmmu.mak b/configs/targets/s390x-softmmu.mak
index fd9fbd870d32..258b4cf35824 100644
--- a/configs/targets/s390x-softmmu.mak
+++ b/configs/targets/s390x-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=s390x
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml
diff --git a/configs/targets/sh4eb-linux-user.mak b/configs/targets/sh4eb-linux-user.mak
index 9b6fb4c1bbed..6724165efee2 100644
--- a/configs/targets/sh4eb-linux-user.mak
+++ b/configs/targets/sh4eb-linux-user.mak
@@ -2,5 +2,5 @@ TARGET_ARCH=sh4
TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_HAS_BFLT=y
diff --git a/configs/targets/sh4eb-softmmu.mak b/configs/targets/sh4eb-softmmu.mak
index 382e9a80f8d2..dc8b30bf7a22 100644
--- a/configs/targets/sh4eb-softmmu.mak
+++ b/configs/targets/sh4eb-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=sh4
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc-linux-user.mak b/configs/targets/sparc-linux-user.mak
index 53dc7aaed5a6..00e7bc1f076a 100644
--- a/configs/targets/sparc-linux-user.mak
+++ b/configs/targets/sparc-linux-user.mak
@@ -2,4 +2,4 @@ TARGET_ARCH=sparc
TARGET_SYSTBL_ABI=common,32
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc-softmmu.mak b/configs/targets/sparc-softmmu.mak
index 9ba3d7b07f19..a849190f0108 100644
--- a/configs/targets/sparc-softmmu.mak
+++ b/configs/targets/sparc-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=sparc
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc32plus-linux-user.mak b/configs/targets/sparc32plus-linux-user.mak
index e4c51df3dcad..a65c0951a18b 100644
--- a/configs/targets/sparc32plus-linux-user.mak
+++ b/configs/targets/sparc32plus-linux-user.mak
@@ -5,4 +5,4 @@ TARGET_ABI_DIR=sparc
TARGET_SYSTBL_ABI=common,32
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc64-linux-user.mak b/configs/targets/sparc64-linux-user.mak
index 9d23ab4a266e..20fcb93fa4b1 100644
--- a/configs/targets/sparc64-linux-user.mak
+++ b/configs/targets/sparc64-linux-user.mak
@@ -4,4 +4,4 @@ TARGET_ABI_DIR=sparc
TARGET_SYSTBL_ABI=common,64
TARGET_SYSTBL=syscall.tbl
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/sparc64-softmmu.mak b/configs/targets/sparc64-softmmu.mak
index 8dd321780042..c626ac3eae67 100644
--- a/configs/targets/sparc64-softmmu.mak
+++ b/configs/targets/sparc64-softmmu.mak
@@ -1,4 +1,4 @@
TARGET_ARCH=sparc64
TARGET_BASE_ARCH=sparc
TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
diff --git a/configs/targets/xtensaeb-linux-user.mak b/configs/targets/xtensaeb-linux-user.mak
index 1ea0f1ba9156..bce2d1d65d23 100644
--- a/configs/targets/xtensaeb-linux-user.mak
+++ b/configs/targets/xtensaeb-linux-user.mak
@@ -1,5 +1,5 @@
TARGET_ARCH=xtensa
TARGET_SYSTBL_ABI=common
TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_HAS_BFLT=y
diff --git a/configs/targets/xtensaeb-softmmu.mak b/configs/targets/xtensaeb-softmmu.mak
index 405cf5acbb4a..b02e11b82008 100644
--- a/configs/targets/xtensaeb-softmmu.mak
+++ b/configs/targets/xtensaeb-softmmu.mak
@@ -1,3 +1,3 @@
TARGET_ARCH=xtensa
-TARGET_WORDS_BIGENDIAN=y
+TARGET_BIG_ENDIAN=y
TARGET_SUPPORTS_MTTCG=y
diff --git a/meson.build b/meson.build
index 7828f6537813..e03a1b50cc11 100644
--- a/meson.build
+++ b/meson.build
@@ -2186,6 +2186,9 @@ foreach target : target_dirs
if 'TARGET_ABI_DIR' not in config_target
config_target += {'TARGET_ABI_DIR': config_target['TARGET_ARCH']}
endif
+ if 'TARGET_BIG_ENDIAN' not in config_target
+ config_target += {'TARGET_BIG_ENDIAN': 'n'}
+ endif
foreach k, v: disassemblers
if host_arch.startswith(k) or config_target['TARGET_BASE_ARCH'].startswith(k)
@@ -2210,6 +2213,8 @@ foreach target : target_dirs
config_target_data.set_quoted(k, v)
elif v == 'y'
config_target_data.set(k, 1)
+ elif v == 'n'
+ config_target_data.set(k, 0)
else
config_target_data.set(k, v)
endif
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 21c06f2e7003..be6105385e8c 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -465,7 +465,7 @@ static inline void *lock_user_string(abi_ulong guest_addr)
static inline uint64_t target_arg64(uint32_t word0, uint32_t word1)
{
#if TARGET_ABI_BITS == 32
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
return ((uint64_t)word0 << 32) | word1;
#else
return ((uint64_t)word1 << 32) | word0;
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index f77070da5f7e..5d5290deb5a9 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -37,11 +37,10 @@
* HOST_BIG_ENDIAN : whether the host cpu is big endian and
* otherwise little endian.
*
- * TARGET_WORDS_BIGENDIAN : if defined, the host cpu is big endian and otherwise
- * little endian.
+ * TARGET_BIG_ENDIAN : same for the target cpu
*/
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
#define BSWAP_NEEDED
#endif
@@ -121,7 +120,7 @@ static inline void tswap64s(uint64_t *s)
/* Target-endianness CPU memory access functions. These fit into the
* {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h.
*/
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
#define lduw_p(p) lduw_be_p(p)
#define ldsw_p(p) ldsw_be_p(p)
#define ldl_p(p) ldl_be_p(p)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 6adacf89280d..d0c7c0d5fe8e 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -377,7 +377,7 @@ static inline CPUTLBEntry *tlb_entry(CPUArchState *env, uintptr_t mmu_idx,
#endif /* defined(CONFIG_USER_ONLY) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
# define cpu_lduw_data cpu_lduw_be_data
# define cpu_ldsw_data cpu_ldsw_be_data
# define cpu_ldl_data cpu_ldl_be_data
diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
index 89edf94d2860..c35d7334b494 100644
--- a/include/exec/gdbstub.h
+++ b/include/exec/gdbstub.h
@@ -110,7 +110,7 @@ static inline int gdb_get_reg128(GByteArray *buf, uint64_t val_hi,
uint64_t val_lo)
{
uint64_t to_quad;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
to_quad = tswap64(val_hi);
g_byte_array_append(buf, (uint8_t *) &to_quad, 8);
to_quad = tswap64(val_lo);
diff --git a/include/exec/memop.h b/include/exec/memop.h
index 44f923ed4660..25d027434ad5 100644
--- a/include/exec/memop.h
+++ b/include/exec/memop.h
@@ -36,7 +36,7 @@ typedef enum MemOp {
MO_BE = MO_BSWAP,
#endif
#ifdef NEED_CPU_H
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
MO_TE = MO_BE,
#else
MO_TE = MO_LE,
diff --git a/include/exec/memory.h b/include/exec/memory.h
index e40653f0d19e..f1c19451bcd0 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -2931,7 +2931,7 @@ static inline MemOp devend_memop(enum device_endian end)
QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN &&
DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN);
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
/* Swap if non-host endianness or native (target) endianness */
return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP;
#else
diff --git a/include/exec/poison.h b/include/exec/poison.h
index 7c5c02f03f08..9f1ca3409c25 100644
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -38,7 +38,7 @@
#pragma GCC poison TARGET_HAS_BFLT
#pragma GCC poison TARGET_NAME
#pragma GCC poison TARGET_SUPPORTS_MTTCG
-#pragma GCC poison TARGET_WORDS_BIGENDIAN
+#pragma GCC poison TARGET_BIG_ENDIAN
#pragma GCC poison BSWAP_NEEDED
#pragma GCC poison TARGET_LONG_BITS
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index b0e2e5b9d253..13adb251b2ab 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -1028,7 +1028,7 @@ void cpu_exec_unrealizefn(CPUState *cpu);
* target_words_bigendian:
* Returns true if the (default) endianness of the target is big endian,
* false otherwise. Note that in target-specific code, you can use
- * TARGET_WORDS_BIGENDIAN directly instead. On the other hand, common
+ * TARGET_BIG_ENDIAN directly instead. On the other hand, common
* code should normally never need to know about the endianness of the
* target, so please do *not* use this function unless you know very well
* what you are doing!
diff --git a/include/hw/mips/bios.h b/include/hw/mips/bios.h
index c03007999a03..44acb6815bec 100644
--- a/include/hw/mips/bios.h
+++ b/include/hw/mips/bios.h
@@ -5,7 +5,7 @@
#include "cpu.h"
#define BIOS_SIZE (4 * MiB)
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define BIOS_FILENAME "mips_bios.bin"
#else
#define BIOS_FILENAME "mipsel_bios.bin"
diff --git a/include/hw/virtio/virtio-access.h b/include/hw/virtio/virtio-access.h
index 90cbb77782b5..07aae69042a9 100644
--- a/include/hw/virtio/virtio-access.h
+++ b/include/hw/virtio/virtio-access.h
@@ -28,7 +28,7 @@ static inline bool virtio_access_is_big_endian(VirtIODevice *vdev)
{
#if defined(LEGACY_VIRTIO_IS_BIENDIAN)
return virtio_is_big_endian(vdev);
-#elif defined(TARGET_WORDS_BIGENDIAN)
+#elif TARGET_BIG_ENDIAN
if (virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {
/* Devices conforming to VIRTIO 1.0 or later are always LE. */
return false;
diff --git a/linux-user/aarch64/target_syscall.h b/linux-user/aarch64/target_syscall.h
index a98f568ab4d7..c055133725ec 100644
--- a/linux-user/aarch64/target_syscall.h
+++ b/linux-user/aarch64/target_syscall.h
@@ -8,7 +8,7 @@ struct target_pt_regs {
uint64_t pstate;
};
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
#define UNAME_MACHINE "aarch64_be"
#else
#define UNAME_MACHINE "aarch64"
diff --git a/linux-user/arm/target_syscall.h b/linux-user/arm/target_syscall.h
index f04f9c9e3d75..412ad434cfc2 100644
--- a/linux-user/arm/target_syscall.h
+++ b/linux-user/arm/target_syscall.h
@@ -18,7 +18,7 @@ struct target_pt_regs {
#define ARM_NR_set_tls (ARM_NR_BASE + 5)
#define ARM_NR_get_tls (ARM_NR_BASE + 6)
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
#define UNAME_MACHINE "armv5teb"
#else
#define UNAME_MACHINE "armv5tel"
diff --git a/linux-user/ppc/target_syscall.h b/linux-user/ppc/target_syscall.h
index 7df911893775..77b36d0b46e6 100644
--- a/linux-user/ppc/target_syscall.h
+++ b/linux-user/ppc/target_syscall.h
@@ -59,7 +59,7 @@ struct target_revectored_struct {
*/
#if defined(TARGET_PPC64)
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define UNAME_MACHINE "ppc64"
#else
#define UNAME_MACHINE "ppc64le"
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 98dfbf20962b..46550f5e2178 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -236,7 +236,7 @@ static inline bool access_ok(CPUState *cpu, int type,
} while (0)
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
# define __put_user(x, hptr) __put_user_e(x, hptr, be)
# define __get_user(x, hptr) __get_user_e(x, hptr, be)
#else
diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h
index a8fdd6933b23..49978d0c79a1 100644
--- a/linux-user/user-internals.h
+++ b/linux-user/user-internals.h
@@ -115,7 +115,7 @@ static inline int is_error(abi_long ret)
#if TARGET_ABI_BITS == 32
static inline uint64_t target_offset64(uint32_t word0, uint32_t word1)
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
return ((uint64_t)word0 << 32) | word1;
#else
return ((uint64_t)word1 << 32) | word0;
diff --git a/linux-user/xtensa/target_structs.h b/linux-user/xtensa/target_structs.h
index 9cde6844b8fc..cb1b3411cf08 100644
--- a/linux-user/xtensa/target_structs.h
+++ b/linux-user/xtensa/target_structs.h
@@ -15,7 +15,7 @@ struct target_ipc_perm {
struct target_semid64_ds {
struct target_ipc_perm sem_perm;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
abi_ulong __unused1;
abi_ulong sem_otime;
abi_ulong __unused2;
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 816aa0394e9f..ccf635ac5cbc 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -3549,12 +3549,12 @@ static inline int cpu_mmu_index(CPUARMState *env, bool ifetch)
static inline bool bswap_code(bool sctlr_b)
{
#ifdef CONFIG_USER_ONLY
- /* BE8 (SCTLR.B = 0, TARGET_WORDS_BIGENDIAN = 1) is mixed endian.
- * The invalid combination SCTLR.B=1/CPSR.E=1/TARGET_WORDS_BIGENDIAN=0
+ /* BE8 (SCTLR.B = 0, TARGET_BIG_ENDIAN = 1) is mixed endian.
+ * The invalid combination SCTLR.B=1/CPSR.E=1/TARGET_BIG_ENDIAN=0
* would also end up as a mixed-endian mode with BE code, LE data.
*/
return
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
1 ^
#endif
sctlr_b;
@@ -3570,7 +3570,7 @@ static inline bool bswap_code(bool sctlr_b)
static inline bool arm_cpu_bswap_data(CPUARMState *env)
{
return
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
1 ^
#endif
arm_cpu_data_is_big_endian(env);
diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index a572e831aebf..f10cfabdc35c 100644
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -590,7 +590,7 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
#define XTENSA_CPU_TYPE_NAME(model) model XTENSA_CPU_TYPE_SUFFIX
#define CPU_RESOLVING_TYPE TYPE_XTENSA_CPU
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define XTENSA_DEFAULT_CPU_MODEL "fsf"
#define XTENSA_DEFAULT_CPU_NOMMU_MODEL "fsf"
#else
diff --git a/target/xtensa/overlay_tool.h b/target/xtensa/overlay_tool.h
index 78720734fe92..701c00eed20a 100644
--- a/target/xtensa/overlay_tool.h
+++ b/target/xtensa/overlay_tool.h
@@ -449,7 +449,7 @@
#endif
-#if (defined(TARGET_WORDS_BIGENDIAN) != 0) == (XCHAL_HAVE_BE != 0)
+#if TARGET_BIG_ENDIAN == (XCHAL_HAVE_BE != 0)
#define REGISTER_CORE(core) \
static void __attribute__((constructor)) register_core(void) \
{ \
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 1c129dc90c8b..8d9d2367ee02 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1202,7 +1202,7 @@ void kvm_hwpoison_page_add(ram_addr_t ram_addr)
static uint32_t adjust_ioeventfd_endianness(uint32_t val, uint32_t size)
{
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
/* The kernel expects ioeventfd values in HOST_BIG_ENDIAN
* endianness, but the memory core hands them in target endianness.
* For example, PPC is always treated as big-endian even if running
diff --git a/cpu.c b/cpu.c
index be1f8b074ce4..d34c3439bbf3 100644
--- a/cpu.c
+++ b/cpu.c
@@ -469,7 +469,7 @@ int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
bool target_words_bigendian(void)
{
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
return true;
#else
return false;
diff --git a/disas.c b/disas.c
index 2d2565ac5774..8c16e55c7e72 100644
--- a/disas.c
+++ b/disas.c
@@ -126,7 +126,7 @@ static void initialize_debug_target(CPUDebug *s, CPUState *cpu)
s->cpu = cpu;
s->info.read_memory_func = target_read_memory;
s->info.print_address_func = print_address;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->info.endian = BFD_ENDIAN_BIG;
#else
s->info.endian = BFD_ENDIAN_LITTLE;
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 41cfca0f2236..32349ec94b17 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -577,7 +577,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size)
int asidx;
CPUState *cs = CPU(cpu);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#else
big_endian = 0;
diff --git a/hw/display/vga.c b/hw/display/vga.c
index 737cfbde98ce..5dca2d15284e 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2242,7 +2242,7 @@ bool vga_common_init(VGACommonState *s, Object *obj, Error **errp)
* into a device attribute set by the machine/platform to remove
* all target endian dependencies from this file.
*/
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->default_endian_fb = true;
#else
s->default_endian_fb = false;
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 8821d009f1a9..03c030aa2cf0 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -138,7 +138,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
uint32_t base32;
int big_endian = 0;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#endif
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index e0ff1b556603..19d0d9889f5e 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -986,7 +986,7 @@ static void gt64120_reset(DeviceState *dev)
/* FIXME: Malta specific hw assumptions ahead */
/* CPU Configuration */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->regs[GT_CPU] = 0x00000000;
#else
s->regs[GT_CPU] = 0x00001000;
@@ -1097,7 +1097,7 @@ static void gt64120_reset(DeviceState *dev)
s->regs[GT_TC_CONTROL] = 0x00000000;
/* PCI Internal */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->regs[GT_PCI0_CMD] = 0x00000000;
#else
s->regs[GT_PCI0_CMD] = 0x00010001;
@@ -1118,7 +1118,7 @@ static void gt64120_reset(DeviceState *dev)
s->regs[GT_PCI0_SSCS10_BAR] = 0x00000000;
s->regs[GT_PCI0_SSCS32_BAR] = 0x01000000;
s->regs[GT_PCI0_SCS3BT_BAR] = 0x1f000000;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
s->regs[GT_PCI1_CMD] = 0x00000000;
#else
s->regs[GT_PCI1_CMD] = 0x00010001;
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 44f0d48bfd75..4d6b44de342e 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -158,7 +158,7 @@ static void mips_jazz_init(MachineState *machine,
[JAZZ_PICA61] = {33333333, 4},
};
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#else
big_endian = 0;
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 6288511723e1..c4474b927c46 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -367,7 +367,7 @@ static uint64_t malta_fpga_read(void *opaque, hwaddr addr,
/* STATUS Register */
case 0x00208:
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
val = 0x00000012;
#else
val = 0x00000010;
@@ -695,7 +695,7 @@ static void write_bootloader_nanomips(uint8_t *base, uint64_t run_addr,
stw_p(p++, 0xe040); stw_p(p++, 0x0681);
/* lui t1, %hi(0xb4000000) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stw_p(p++, 0xe020); stw_p(p++, 0x0be1);
/* lui t0, %hi(0xdf000000) */
@@ -894,7 +894,7 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,
/* Load BAR registers as done by YAMON */
stl_p(p++, 0x3c09b400); /* lui t1, 0xb400 */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c08df00); /* lui t0, 0xdf00 */
#else
stl_p(p++, 0x340800df); /* ori t0, r0, 0x00df */
@@ -903,39 +903,39 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,
stl_p(p++, 0x3c09bbe0); /* lui t1, 0xbbe0 */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c08c000); /* lui t0, 0xc000 */
#else
stl_p(p++, 0x340800c0); /* ori t0, r0, 0x00c0 */
#endif
stl_p(p++, 0xad280048); /* sw t0, 0x0048(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c084000); /* lui t0, 0x4000 */
#else
stl_p(p++, 0x34080040); /* ori t0, r0, 0x0040 */
#endif
stl_p(p++, 0xad280050); /* sw t0, 0x0050(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c088000); /* lui t0, 0x8000 */
#else
stl_p(p++, 0x34080080); /* ori t0, r0, 0x0080 */
#endif
stl_p(p++, 0xad280058); /* sw t0, 0x0058(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c083f00); /* lui t0, 0x3f00 */
#else
stl_p(p++, 0x3408003f); /* ori t0, r0, 0x003f */
#endif
stl_p(p++, 0xad280060); /* sw t0, 0x0060(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c08c100); /* lui t0, 0xc100 */
#else
stl_p(p++, 0x340800c1); /* ori t0, r0, 0x00c1 */
#endif
stl_p(p++, 0xad280080); /* sw t0, 0x0080(t1) */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
stl_p(p++, 0x3c085e00); /* lui t0, 0x5e00 */
#else
stl_p(p++, 0x3408005e); /* ori t0, r0, 0x005e */
@@ -1030,7 +1030,7 @@ static uint64_t load_kernel(void)
int prom_index = 0;
uint64_t (*xlate_to_kseg0) (void *opaque, uint64_t addr);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#else
big_endian = 0;
@@ -1272,7 +1272,7 @@ void mips_malta_init(MachineState *machine)
ram_low_postio);
}
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
be = 1;
#else
be = 0;
@@ -1353,7 +1353,7 @@ void mips_malta_init(MachineState *machine)
* In little endian mode the 32bit words in the bios are swapped,
* a neat trick which allows bi-endian firmware.
*/
-#ifndef TARGET_WORDS_BIGENDIAN
+#if !TARGET_BIG_ENDIAN
{
uint32_t *end, *addr;
const size_t swapsize = MIN(bios_size, 0x3e0000);
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index 27a46bd5380b..30bc1c4f086f 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -65,7 +65,7 @@ static uint64_t load_kernel(void)
ram_addr_t initrd_offset;
int big_endian;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#else
big_endian = 0;
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index 5b3e4efed5be..e889595d5c2b 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -140,7 +140,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,
uint64_t entry, high;
int big_endian = 0;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
big_endian = 1;
#endif
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 2028fe793d9b..946c71cb5b5c 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -96,7 +96,7 @@ XtensaCPU *xtensa_sim_common_init(MachineState *machine)
void xtensa_sim_load_kernel(XtensaCPU *cpu, MachineState *machine)
{
const char *kernel_filename = machine->kernel_filename;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
int big_endian = true;
#else
int big_endian = false;
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index c1e004e8822d..2a5556a35f50 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -219,7 +219,7 @@ static const MemoryRegionOps xtfpga_io_ops = {
static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
int be = 1;
#else
int be = 0;
@@ -430,7 +430,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
}
if (entry_point != env->pc) {
uint8_t boot[] = {
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
0x60, 0x00, 0x08, /* j 1f */
0x00, /* .literal_position */
0x00, 0x00, 0x00, 0x00, /* .literal entry_pc */
diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
index 1737e2ea655a..31a66a4fa07c 100644
--- a/linux-user/aarch64/cpu_loop.c
+++ b/linux-user/aarch64/cpu_loop.c
@@ -202,7 +202,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
}
env->pc = regs->pc;
env->xregs[31] = regs->sp;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
env->cp15.sctlr_el[1] |= SCTLR_E0E;
for (i = 1; i < 4; ++i) {
env->cp15.sctlr_el[i] |= SCTLR_EE;
diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c
index df9e39a4ba04..7de4c96eb9d0 100644
--- a/linux-user/aarch64/signal.c
+++ b/linux-user/aarch64/signal.c
@@ -147,7 +147,7 @@ static void target_setup_fpsimd_record(struct target_fpsimd_context *fpsimd,
for (i = 0; i < 32; i++) {
uint64_t *q = aa64_vfp_qreg(env, i);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
__put_user(q[0], &fpsimd->vregs[i * 2 + 1]);
__put_user(q[1], &fpsimd->vregs[i * 2]);
#else
@@ -233,7 +233,7 @@ static void target_restore_fpsimd_record(CPUARMState *env,
for (i = 0; i < 32; i++) {
uint64_t *q = aa64_vfp_qreg(env, i);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
__get_user(q[0], &fpsimd->vregs[i * 2 + 1]);
__get_user(q[1], &fpsimd->vregs[i * 2]);
#else
diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index 032e1ffddfbd..9dcb2e024eb0 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -485,7 +485,7 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
for(i = 0; i < 16; i++) {
env->regs[i] = regs->uregs[i];
}
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
/* Enable BE8. */
if (EF_ARM_EABI_VERSION(info->elf_flags) >= EF_ARM_EABI_VER4
&& (info->elf_flags & EF_ARM_BE8)) {
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 9628a38361cb..796acdcdbd2c 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -105,7 +105,7 @@ int info_is_fdpic(struct image_info *info)
#define ELIBBAD 80
#endif
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define ELF_DATA ELFDATA2MSB
#else
#define ELF_DATA ELFDATA2LSB
@@ -483,7 +483,7 @@ static const char *get_elf_platform(void)
{
CPUARMState *env = thread_cpu->env_ptr;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
# define END "b"
#else
# define END "l"
@@ -514,7 +514,7 @@ static const char *get_elf_platform(void)
#define ELF_ARCH EM_AARCH64
#define ELF_CLASS ELFCLASS64
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
# define ELF_PLATFORM "aarch64_be"
#else
# define ELF_PLATFORM "aarch64"
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index 2550b8f8c069..accf5aa199c8 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -215,7 +215,7 @@ static target_ulong get_sigframe(struct target_sigaction *ka,
return (oldsp - frame_size) & ~0xFUL;
}
-#if defined(TARGET_WORDS_BIGENDIAN) == HOST_BIG_ENDIAN
+#if TARGET_BIG_ENDIAN == HOST_BIG_ENDIAN
#define PPC_VEC_HI 0
#define PPC_VEC_LO 1
#else
@@ -542,7 +542,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
env->nip = (target_ulong) ka->_sa_handler;
#endif
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
/* Signal handlers are entered in big-endian mode. */
ppc_store_msr(env, env->msr & ~(1ull << MSR_LE));
#else
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7182dbd9796d..dc7b513c3cbb 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8152,7 +8152,7 @@ static int is_proc_myself(const char *filename, const char *entry)
return 0;
}
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN) || \
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN || \
defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA)
static int is_proc(const char *filename, const char *entry)
{
@@ -8160,7 +8160,7 @@ static int is_proc(const char *filename, const char *entry)
}
#endif
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
static int open_net_route(void *cpu_env, int fd)
{
FILE *fp;
@@ -8246,7 +8246,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
{ "stat", open_self_stat, is_proc_myself },
{ "auxv", open_self_auxv, is_proc_myself },
{ "cmdline", open_self_cmdline, is_proc_myself },
-#if HOST_BIG_ENDIAN != defined(TARGET_WORDS_BIGENDIAN)
+#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN
{ "/proc/net/route", open_net_route, is_proc },
#endif
#if defined(TARGET_SPARC) || defined(TARGET_HPPA)
diff --git a/linux-user/uname.c b/linux-user/uname.c
index 1d82608c100f..0856783b2190 100644
--- a/linux-user/uname.c
+++ b/linux-user/uname.c
@@ -41,7 +41,7 @@ const char *cpu_to_uname_machine(void *cpu_env)
/* in theory, endianness is configurable on some ARM CPUs, but this isn't
* used in user mode emulation */
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
#define utsname_suffix "b"
#else
#define utsname_suffix "l"
diff --git a/linux-user/xtensa/signal.c b/linux-user/xtensa/signal.c
index 06d91a37ecee..f5fb8b5cbebe 100644
--- a/linux-user/xtensa/signal.c
+++ b/linux-user/xtensa/signal.c
@@ -130,7 +130,7 @@ static int setup_sigcontext(struct target_rt_sigframe *frame,
static void install_sigtramp(uint8_t *tramp)
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
/* Generate instruction: MOVI a2, __NR_rt_sigreturn */
__put_user(0x22, &tramp[0]);
__put_user(0x0a, &tramp[1]);
diff --git a/softmmu/memory.c b/softmmu/memory.c
index 8060c6de7802..0456a6c051eb 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -350,7 +350,7 @@ static void flatview_simplify(FlatView *view)
static bool memory_region_big_endian(MemoryRegion *mr)
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
return mr->ops->endianness != DEVICE_LITTLE_ENDIAN;
#else
return mr->ops->endianness == DEVICE_BIG_ENDIAN;
diff --git a/softmmu/qtest.c b/softmmu/qtest.c
index cc586233a974..6a0edd733b79 100644
--- a/softmmu/qtest.c
+++ b/softmmu/qtest.c
@@ -732,7 +732,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
qtest_send(chr, "OK\n");
} else if (strcmp(words[0], "endianness") == 0) {
qtest_send_prefix(chr);
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
qtest_sendf(chr, "OK big\n");
#else
qtest_sendf(chr, "OK little\n");
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 5d4ca7a22700..0980d3390112 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -812,7 +812,7 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info)
sctlr_b = arm_sctlr_b(env);
if (bswap_code(sctlr_b)) {
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
info->endian = BFD_ENDIAN_LITTLE;
#else
info->endian = BFD_ENDIAN_BIG;
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index af287177d5af..ad74fbe636af 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -189,7 +189,7 @@ static void mips_cpu_reset(DeviceState *dev)
/* Reset registers to their default values */
env->CP0_PRid = env->cpu_model->CP0_PRid;
env->CP0_Config0 = env->cpu_model->CP0_Config0;
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
env->CP0_Config0 |= (1 << CP0C0_BE);
#endif
env->CP0_Config1 = env->cpu_model->CP0_Config1;
@@ -418,7 +418,7 @@ static void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info)
CPUMIPSState *env = &cpu->env;
if (!(env->insn_flags & ISA_NANOMIPS32)) {
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
info->print_insn = print_insn_big_mips;
#else
info->print_insn = print_insn_little_mips;
diff --git a/target/mips/tcg/msa_helper.c b/target/mips/tcg/msa_helper.c
index 389c42e4baa3..4dde5d639ad4 100644
--- a/target/mips/tcg/msa_helper.c
+++ b/target/mips/tcg/msa_helper.c
@@ -8218,7 +8218,7 @@ void helper_msa_ffint_u_df(CPUMIPSState *env, uint32_t df, uint32_t wd,
#define MEMOP_IDX(DF)
#endif
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
static inline uint64_t bswap16x4(uint64_t x)
{
uint64_t m = 0x00ff00ff00ff00ffull;
@@ -8258,7 +8258,7 @@ void helper_msa_ld_h(CPUMIPSState *env, uint32_t wd,
*/
d0 = cpu_ldq_le_data_ra(env, addr + 0, ra);
d1 = cpu_ldq_le_data_ra(env, addr + 8, ra);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
d0 = bswap16x4(d0);
d1 = bswap16x4(d1);
#endif
@@ -8279,7 +8279,7 @@ void helper_msa_ld_w(CPUMIPSState *env, uint32_t wd,
*/
d0 = cpu_ldq_le_data_ra(env, addr + 0, ra);
d1 = cpu_ldq_le_data_ra(env, addr + 8, ra);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
d0 = bswap32x2(d0);
d1 = bswap32x2(d1);
#endif
@@ -8345,7 +8345,7 @@ void helper_msa_st_h(CPUMIPSState *env, uint32_t wd,
/* Store 8 bytes at a time. See helper_msa_ld_h. */
d0 = pwd->d[0];
d1 = pwd->d[1];
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
d0 = bswap16x4(d0);
d1 = bswap16x4(d1);
#endif
@@ -8366,7 +8366,7 @@ void helper_msa_st_w(CPUMIPSState *env, uint32_t wd,
/* Store 8 bytes at a time. See helper_msa_ld_w. */
d0 = pwd->d[0];
d1 = pwd->d[1];
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
d0 = bswap32x2(d0);
d1 = bswap32x2(d1);
#endif
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 073fd101687c..5062d0e4782a 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -7150,7 +7150,7 @@ static void ppc_cpu_reset(DeviceState *dev)
#if defined(TARGET_PPC64)
msr |= (target_ulong)1 << MSR_TM; /* Transactional memory */
#endif
-#if !defined(TARGET_WORDS_BIGENDIAN)
+#if !TARGET_BIG_ENDIAN
msr |= (target_ulong)1 << MSR_LE; /* Little-endian user mode */
if (!((env->msr_mask >> MSR_LE) & 1)) {
fprintf(stderr, "Selected CPU does not support little-endian.\n");
diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c
index 105c2f7dd13f..1252429a2ad5 100644
--- a/target/ppc/gdbstub.c
+++ b/target/ppc/gdbstub.c
@@ -87,9 +87,9 @@ static int ppc_gdb_register_len(int n)
/*
* We need to present the registers to gdb in the "current" memory
* ordering. For user-only mode we get this for free;
- * TARGET_WORDS_BIGENDIAN is set to the proper ordering for the
+ * TARGET_BIG_ENDIAN is set to the proper ordering for the
* binary, and cannot be changed. For system mode,
- * TARGET_WORDS_BIGENDIAN is always set, and we must check the current
+ * TARGET_BIG_ENDIAN is always set, and we must check the current
* mode of the chip to see if we're running in little-endian.
*/
void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len)
diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c
index f1c76a7750ab..c4ff8fd632ce 100644
--- a/target/ppc/mem_helper.c
+++ b/target/ppc/mem_helper.c
@@ -32,7 +32,7 @@
static inline bool needs_byteswap(const CPUPPCState *env)
{
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
return msr_le;
#else
return !msr_le;
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 408ae26173de..f14f8d7309ba 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -193,7 +193,7 @@ struct DisasContext {
/* Return true iff byteswap is needed in a scalar memop */
static inline bool need_byteswap(const DisasContext *ctx)
{
-#if defined(TARGET_WORDS_BIGENDIAN)
+#if TARGET_BIG_ENDIAN
return ctx->le_mode;
#else
return !ctx->le_mode;
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index b1491ed625e5..fc4e9d2c9a86 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -1471,14 +1471,14 @@ static void translate_b(DisasContext *dc, const OpcodeArg arg[],
static void translate_bb(DisasContext *dc, const OpcodeArg arg[],
const uint32_t par[])
{
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
TCGv_i32 bit = tcg_const_i32(0x80000000u);
#else
TCGv_i32 bit = tcg_const_i32(0x00000001u);
#endif
TCGv_i32 tmp = tcg_temp_new_i32();
tcg_gen_andi_i32(tmp, arg[1].in, 0x1f);
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
tcg_gen_shr_i32(bit, bit, tmp);
#else
tcg_gen_shl_i32(bit, bit, tmp);
@@ -1493,7 +1493,7 @@ static void translate_bbi(DisasContext *dc, const OpcodeArg arg[],
const uint32_t par[])
{
TCGv_i32 tmp = tcg_temp_new_i32();
-#ifdef TARGET_WORDS_BIGENDIAN
+#if TARGET_BIG_ENDIAN
tcg_gen_andi_i32(tmp, arg[0].in, 0x80000000u >> arg[1].imm);
#else
tcg_gen_andi_i32(tmp, arg[0].in, 0x00000001u << arg[1].imm);
diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target
index 9530cac2ad95..973e55298ee4 100644
--- a/tests/tcg/xtensa/Makefile.softmmu-target
+++ b/tests/tcg/xtensa/Makefile.softmmu-target
@@ -2,7 +2,7 @@
# Xtensa softmmu tests
#
-ifneq ($(TARGET_WORDS_BIGENDIAN),y)
+ifneq ($(TARGET_BIG_ENDIAN),y)
XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa
XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(wildcard $(XTENSA_SRC)/*.S))
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 07/32] Replace TARGET_WORDS_BIGENDIAN
2022-03-23 15:57 ` marcandre.lureau
(?)
@ 2022-03-23 17:12 ` Richard Henderson
-1 siblings, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 17:12 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> Convert the TARGET_WORDS_BIGENDIAN macro, similarly to what was done
> with HOST_BIG_ENDIAN. The new TARGET_BIG_ENDIAN macro is either 0 or 1,
> and thus should always be defined to prevent misuse.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> Suggested-by: Halil Pasic<pasic@linux.ibm.com>
> ---
Ah, poison in here, so perhaps I had asked for it wrt target not host.
But still HOST_WORDS_BIGENDIAN needs poisoning.
Anyway, for this one,
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 08/32] osdep: poison {HOST,TARGET}_WORDS_BIGENDIAN
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (6 preceding siblings ...)
2022-03-23 15:57 ` marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 17:14 ` Richard Henderson
2022-03-23 15:57 ` [PATCH 09/32] include/qapi: add g_autoptr support for qobject types marcandre.lureau
` (24 subsequent siblings)
32 siblings, 1 reply; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/qemu/osdep.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 9f06bf536fb1..95a14914d13b 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -34,6 +34,18 @@
#include "exec/poison.h"
#endif
+/*
+ * HOST_WORDS_BIGENDIAN was replaced with HOST_BIG_ENDIAN. Prevent it from
+ * creeping back in.
+ */
+#pragma GCC poison HOST_WORDS_BIGENDIAN
+
+/*
+ * TARGET_WORDS_BIGENDIAN was replaced with TARGET_BIG_ENDIAN. Prevent it from
+ * creeping back in.
+ */
+#pragma GCC poison TARGET_WORDS_BIGENDIAN
+
#include "qemu/compiler.h"
/* Older versions of C++ don't get definitions of various macros from
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 08/32] osdep: poison {HOST,TARGET}_WORDS_BIGENDIAN
2022-03-23 15:57 ` [PATCH 08/32] osdep: poison {HOST,TARGET}_WORDS_BIGENDIAN marcandre.lureau
@ 2022-03-23 17:14 ` Richard Henderson
0 siblings, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 17:14 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Suggested-by: Richard Henderson <richard.henderson@linaro.org>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> include/qemu/osdep.h | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
> index 9f06bf536fb1..95a14914d13b 100644
> --- a/include/qemu/osdep.h
> +++ b/include/qemu/osdep.h
> @@ -34,6 +34,18 @@
> #include "exec/poison.h"
> #endif
>
> +/*
> + * HOST_WORDS_BIGENDIAN was replaced with HOST_BIG_ENDIAN. Prevent it from
> + * creeping back in.
> + */
> +#pragma GCC poison HOST_WORDS_BIGENDIAN
> +
> +/*
> + * TARGET_WORDS_BIGENDIAN was replaced with TARGET_BIG_ENDIAN. Prevent it from
> + * creeping back in.
> + */
> +#pragma GCC poison TARGET_WORDS_BIGENDIAN
Oh, I see.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 09/32] include/qapi: add g_autoptr support for qobject types
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (7 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 08/32] osdep: poison {HOST,TARGET}_WORDS_BIGENDIAN marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 18:11 ` Richard Henderson
2022-03-24 16:00 ` Markus Armbruster
2022-03-23 15:57 ` [PATCH 10/32] tests: replace free_all() usage with g_auto marcandre.lureau
` (23 subsequent siblings)
32 siblings, 2 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Markus Armbruster
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Need wrappers for qobject_unref() calls, which is a macro.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qapi/qmp/qbool.h | 4 ++++
include/qapi/qmp/qdict.h | 4 ++++
include/qapi/qmp/qlist.h | 4 ++++
include/qapi/qmp/qnull.h | 4 ++++
include/qapi/qmp/qnum.h | 4 ++++
include/qapi/qmp/qstring.h | 4 ++++
qobject/qbool.c | 5 +++++
qobject/qdict.c | 5 +++++
qobject/qlist.c | 5 +++++
qobject/qnull.c | 5 +++++
qobject/qnum.c | 5 +++++
qobject/qstring.c | 5 +++++
12 files changed, 54 insertions(+)
diff --git a/include/qapi/qmp/qbool.h b/include/qapi/qmp/qbool.h
index 2f888d10573f..0d09726939b9 100644
--- a/include/qapi/qmp/qbool.h
+++ b/include/qapi/qmp/qbool.h
@@ -21,6 +21,10 @@ struct QBool {
bool value;
};
+void qbool_unref(QBool *q);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(QBool, qbool_unref)
+
QBool *qbool_from_bool(bool value);
bool qbool_get_bool(const QBool *qb);
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index d5b5430e21a9..882d950bde89 100644
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -30,6 +30,10 @@ struct QDict {
QLIST_HEAD(,QDictEntry) table[QDICT_BUCKET_MAX];
};
+void qdict_unref(QDict *q);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(QDict, qdict_unref)
+
/* Object API */
QDict *qdict_new(void);
const char *qdict_entry_key(const QDictEntry *entry);
diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h
index 06e98ad5f498..e4e985d4356d 100644
--- a/include/qapi/qmp/qlist.h
+++ b/include/qapi/qmp/qlist.h
@@ -26,6 +26,10 @@ struct QList {
QTAILQ_HEAD(,QListEntry) head;
};
+void qlist_unref(QList *q);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(QList, qlist_unref)
+
#define qlist_append(qlist, obj) \
qlist_append_obj(qlist, QOBJECT(obj))
diff --git a/include/qapi/qmp/qnull.h b/include/qapi/qmp/qnull.h
index e84ecceedbcb..7feb7c7d830d 100644
--- a/include/qapi/qmp/qnull.h
+++ b/include/qapi/qmp/qnull.h
@@ -26,4 +26,8 @@ static inline QNull *qnull(void)
return qobject_ref(&qnull_);
}
+void qnull_unref(QNull *q);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(QNull, qnull_unref)
+
#endif /* QNULL_H */
diff --git a/include/qapi/qmp/qnum.h b/include/qapi/qmp/qnum.h
index 7f84e20bfb2c..e86788dd2e3a 100644
--- a/include/qapi/qmp/qnum.h
+++ b/include/qapi/qmp/qnum.h
@@ -54,6 +54,10 @@ struct QNum {
} u;
};
+void qnum_unref(QNum *q);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(QNum, qnum_unref)
+
QNum *qnum_from_int(int64_t value);
QNum *qnum_from_uint(uint64_t value);
QNum *qnum_from_double(double value);
diff --git a/include/qapi/qmp/qstring.h b/include/qapi/qmp/qstring.h
index 1d8ba469368f..318d815d6a43 100644
--- a/include/qapi/qmp/qstring.h
+++ b/include/qapi/qmp/qstring.h
@@ -20,6 +20,10 @@ struct QString {
const char *string;
};
+void qstring_unref(QString *q);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(QString, qstring_unref)
+
QString *qstring_new(void);
QString *qstring_from_str(const char *str);
QString *qstring_from_substr(const char *str, size_t start, size_t end);
diff --git a/qobject/qbool.c b/qobject/qbool.c
index 16a600abb93f..c7049c0c501b 100644
--- a/qobject/qbool.c
+++ b/qobject/qbool.c
@@ -56,3 +56,8 @@ void qbool_destroy_obj(QObject *obj)
assert(obj != NULL);
g_free(qobject_to(QBool, obj));
}
+
+void qbool_unref(QBool *q)
+{
+ qobject_unref(q);
+}
diff --git a/qobject/qdict.c b/qobject/qdict.c
index 0216ca7ac168..8faff230d391 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -442,3 +442,8 @@ void qdict_destroy_obj(QObject *obj)
g_free(qdict);
}
+
+void qdict_unref(QDict *q)
+{
+ qobject_unref(q);
+}
diff --git a/qobject/qlist.c b/qobject/qlist.c
index 60562a1f5269..356ad946b00c 100644
--- a/qobject/qlist.c
+++ b/qobject/qlist.c
@@ -182,3 +182,8 @@ void qlist_destroy_obj(QObject *obj)
g_free(qlist);
}
+
+void qlist_unref(QList *q)
+{
+ qobject_unref(q);
+}
diff --git a/qobject/qnull.c b/qobject/qnull.c
index b26b36821905..445a5db7f36f 100644
--- a/qobject/qnull.c
+++ b/qobject/qnull.c
@@ -29,3 +29,8 @@ bool qnull_is_equal(const QObject *x, const QObject *y)
{
return true;
}
+
+void qnull_unref(QNull *q)
+{
+ qobject_unref(q);
+}
diff --git a/qobject/qnum.c b/qobject/qnum.c
index 5dd66938dd84..2bbeaedc7b44 100644
--- a/qobject/qnum.c
+++ b/qobject/qnum.c
@@ -239,3 +239,8 @@ void qnum_destroy_obj(QObject *obj)
assert(obj != NULL);
g_free(qobject_to(QNum, obj));
}
+
+void qnum_unref(QNum *q)
+{
+ qobject_unref(q);
+}
diff --git a/qobject/qstring.c b/qobject/qstring.c
index b4613899b979..794f8c93578a 100644
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -100,3 +100,8 @@ void qstring_destroy_obj(QObject *obj)
g_free((char *)qs->string);
g_free(qs);
}
+
+void qstring_unref(QString *q)
+{
+ qobject_unref(q);
+}
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 09/32] include/qapi: add g_autoptr support for qobject types
2022-03-23 15:57 ` [PATCH 09/32] include/qapi: add g_autoptr support for qobject types marcandre.lureau
@ 2022-03-23 18:11 ` Richard Henderson
2022-03-24 16:00 ` Markus Armbruster
1 sibling, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 18:11 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: Markus Armbruster
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> Need wrappers for qobject_unref() calls, which is a macro.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> ---
> include/qapi/qmp/qbool.h | 4 ++++
> include/qapi/qmp/qdict.h | 4 ++++
> include/qapi/qmp/qlist.h | 4 ++++
> include/qapi/qmp/qnull.h | 4 ++++
> include/qapi/qmp/qnum.h | 4 ++++
> include/qapi/qmp/qstring.h | 4 ++++
> qobject/qbool.c | 5 +++++
> qobject/qdict.c | 5 +++++
> qobject/qlist.c | 5 +++++
> qobject/qnull.c | 5 +++++
> qobject/qnum.c | 5 +++++
> qobject/qstring.c | 5 +++++
> 12 files changed, 54 insertions(+)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PATCH 09/32] include/qapi: add g_autoptr support for qobject types
2022-03-23 15:57 ` [PATCH 09/32] include/qapi: add g_autoptr support for qobject types marcandre.lureau
2022-03-23 18:11 ` Richard Henderson
@ 2022-03-24 16:00 ` Markus Armbruster
1 sibling, 0 replies; 79+ messages in thread
From: Markus Armbruster @ 2022-03-24 16:00 UTC (permalink / raw)
To: marcandre.lureau; +Cc: qemu-devel
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Need wrappers for qobject_unref() calls, which is a macro.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 10/32] tests: replace free_all() usage with g_auto
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (8 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 09/32] include/qapi: add g_autoptr support for qobject types marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 18:13 ` Richard Henderson
2022-03-23 15:57 ` marcandre.lureau
` (22 subsequent siblings)
32 siblings, 1 reply; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Markus Armbruster
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Use more idiomatic glib/auto-style code.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/unit/check-qobject.c | 127 ++++++++++++-------------------------
1 file changed, 40 insertions(+), 87 deletions(-)
diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c
index c3d50e99949a..7903ebf4cf80 100644
--- a/tests/unit/check-qobject.c
+++ b/tests/unit/check-qobject.c
@@ -74,21 +74,6 @@ static void do_test_equality(bool expected, int _, ...)
#define check_unequal(...) \
do_test_equality(false, 0, __VA_ARGS__, &test_equality_end_of_arguments)
-static void do_free_all(int _, ...)
-{
- va_list ap;
- QObject *obj;
-
- va_start(ap, _);
- while ((obj = va_arg(ap, QObject *)) != NULL) {
- qobject_unref(obj);
- }
- va_end(ap);
-}
-
-#define free_all(...) \
- do_free_all(0, __VA_ARGS__, NULL)
-
static void qobject_is_equal_null_test(void)
{
check_unequal(qnull(), NULL);
@@ -96,15 +81,14 @@ static void qobject_is_equal_null_test(void)
static void qobject_is_equal_num_test(void)
{
- QNum *u0, *i0, *d0, *dnan, *um42, *im42, *dm42;
+ g_autoptr(QNum) u0 = qnum_from_uint(0u);
+ g_autoptr(QNum) i0 = qnum_from_int(0);
+ g_autoptr(QNum) d0 = qnum_from_double(0.0);
+ g_autoptr(QNum) dnan = qnum_from_double(NAN);
+ g_autoptr(QNum) um42 = qnum_from_uint((uint64_t)-42);
+ g_autoptr(QNum) im42 = qnum_from_int(-42);
+ g_autoptr(QNum) dm42 = qnum_from_double(-42.0);
- u0 = qnum_from_uint(0u);
- i0 = qnum_from_int(0);
- d0 = qnum_from_double(0.0);
- dnan = qnum_from_double(NAN);
- um42 = qnum_from_uint((uint64_t)-42);
- im42 = qnum_from_int(-42);
- dm42 = qnum_from_double(-42.0);
/* Integers representing a mathematically equal number should
* compare equal */
@@ -121,60 +105,45 @@ static void qobject_is_equal_num_test(void)
check_unequal(um42, im42);
check_unequal(um42, dm42);
check_unequal(im42, dm42);
-
- free_all(u0, i0, d0, dnan, um42, im42, dm42);
}
static void qobject_is_equal_bool_test(void)
{
- QBool *btrue_0, *btrue_1, *bfalse_0, *bfalse_1;
-
- btrue_0 = qbool_from_bool(true);
- btrue_1 = qbool_from_bool(true);
- bfalse_0 = qbool_from_bool(false);
- bfalse_1 = qbool_from_bool(false);
+ g_autoptr(QBool) btrue_0 = qbool_from_bool(true);
+ g_autoptr(QBool) btrue_1 = qbool_from_bool(true);
+ g_autoptr(QBool) bfalse_0 = qbool_from_bool(false);
+ g_autoptr(QBool) bfalse_1 = qbool_from_bool(false);
check_equal(btrue_0, btrue_1);
check_equal(bfalse_0, bfalse_1);
check_unequal(btrue_0, bfalse_0);
-
- free_all(btrue_0, btrue_1, bfalse_0, bfalse_1);
}
static void qobject_is_equal_string_test(void)
{
- QString *str_base, *str_whitespace_0, *str_whitespace_1, *str_whitespace_2;
- QString *str_whitespace_3, *str_case, *str_built;
-
- str_base = qstring_from_str("foo");
- str_whitespace_0 = qstring_from_str(" foo");
- str_whitespace_1 = qstring_from_str("foo ");
- str_whitespace_2 = qstring_from_str("foo\b");
- str_whitespace_3 = qstring_from_str("fooo\b");
- str_case = qstring_from_str("Foo");
-
+ g_autoptr(QString) str_base = qstring_from_str("foo");
+ g_autoptr(QString) str_whitespace_0 = qstring_from_str(" foo");
+ g_autoptr(QString) str_whitespace_1 = qstring_from_str("foo ");
+ g_autoptr(QString) str_whitespace_2 = qstring_from_str("foo\b");
+ g_autoptr(QString) str_whitespace_3 = qstring_from_str("fooo\b");
+ g_autoptr(QString) str_case = qstring_from_str("Foo");
/* Should yield "foo" */
- str_built = qstring_from_substr("buffoon", 3, 6);
+ g_autoptr(QString) str_built = qstring_from_substr("buffoon", 3, 6);
check_unequal(str_base, str_whitespace_0, str_whitespace_1,
str_whitespace_2, str_whitespace_3, str_case);
check_equal(str_base, str_built);
-
- free_all(str_base, str_whitespace_0, str_whitespace_1, str_whitespace_2,
- str_whitespace_3, str_case, str_built);
}
static void qobject_is_equal_list_test(void)
{
- QList *list_0, *list_1, *list_cloned;
- QList *list_reordered, *list_longer, *list_shorter;
-
- list_0 = qlist_new();
- list_1 = qlist_new();
- list_reordered = qlist_new();
- list_longer = qlist_new();
- list_shorter = qlist_new();
+ g_autoptr(QList) list_0 = qlist_new();
+ g_autoptr(QList) list_1 = qlist_new();
+ g_autoptr(QList) list_reordered = qlist_new();
+ g_autoptr(QList) list_longer = qlist_new();
+ g_autoptr(QList) list_shorter = qlist_new();
+ g_autoptr(QList) list_cloned = NULL;
qlist_append_int(list_0, 1);
qlist_append_int(list_0, 2);
@@ -205,26 +174,20 @@ static void qobject_is_equal_list_test(void)
* itself */
qlist_append(list_0, qnum_from_double(NAN));
g_assert(qobject_is_equal(QOBJECT(list_0), QOBJECT(list_0)) == false);
-
- free_all(list_0, list_1, list_cloned, list_reordered, list_longer,
- list_shorter);
}
static void qobject_is_equal_dict_test(void)
{
- QDict *dict_0, *dict_1, *dict_cloned;
- QDict *dict_different_key, *dict_different_value, *dict_different_null_key;
- QDict *dict_longer, *dict_shorter, *dict_nested;
- QDict *dict_crumpled;
-
- dict_0 = qdict_new();
- dict_1 = qdict_new();
- dict_different_key = qdict_new();
- dict_different_value = qdict_new();
- dict_different_null_key = qdict_new();
- dict_longer = qdict_new();
- dict_shorter = qdict_new();
- dict_nested = qdict_new();
+ g_autoptr(QDict) dict_cloned = NULL;
+ g_autoptr(QDict) dict_crumpled = NULL;
+ g_autoptr(QDict) dict_0 = qdict_new();
+ g_autoptr(QDict) dict_1 = qdict_new();
+ g_autoptr(QDict) dict_different_key = qdict_new();
+ g_autoptr(QDict) dict_different_value = qdict_new();
+ g_autoptr(QDict) dict_different_null_key = qdict_new();
+ g_autoptr(QDict) dict_longer = qdict_new();
+ g_autoptr(QDict) dict_shorter = qdict_new();
+ g_autoptr(QDict) dict_nested = qdict_new();
qdict_put_int(dict_0, "f.o", 1);
qdict_put_int(dict_0, "bar", 2);
@@ -284,31 +247,21 @@ static void qobject_is_equal_dict_test(void)
* itself */
qdict_put(dict_0, "NaN", qnum_from_double(NAN));
g_assert(qobject_is_equal(QOBJECT(dict_0), QOBJECT(dict_0)) == false);
-
- free_all(dict_0, dict_1, dict_cloned, dict_different_key,
- dict_different_value, dict_different_null_key, dict_longer,
- dict_shorter, dict_nested, dict_crumpled);
}
static void qobject_is_equal_conversion_test(void)
{
- QNum *u0, *i0, *d0;
- QString *s0, *s_empty;
- QBool *bfalse;
-
- u0 = qnum_from_uint(0u);
- i0 = qnum_from_int(0);
- d0 = qnum_from_double(0.0);
- s0 = qstring_from_str("0");
- s_empty = qstring_new();
- bfalse = qbool_from_bool(false);
+ g_autoptr(QNum) u0 = qnum_from_uint(0u);
+ g_autoptr(QNum) i0 = qnum_from_int(0);
+ g_autoptr(QNum) d0 = qnum_from_double(0.0);
+ g_autoptr(QString) s0 = qstring_from_str("0");
+ g_autoptr(QString) s_empty = qstring_new();
+ g_autoptr(QBool) bfalse = qbool_from_bool(false);
/* No automatic type conversion */
check_unequal(u0, s0, s_empty, bfalse, qnull(), NULL);
check_unequal(i0, s0, s_empty, bfalse, qnull(), NULL);
check_unequal(d0, s0, s_empty, bfalse, qnull(), NULL);
-
- free_all(u0, i0, d0, s0, s_empty, bfalse);
}
int main(int argc, char **argv)
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 10/32] tests: replace free_all() usage with g_auto
2022-03-23 15:57 ` [PATCH 10/32] tests: replace free_all() usage with g_auto marcandre.lureau
@ 2022-03-23 18:13 ` Richard Henderson
0 siblings, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 18:13 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: Markus Armbruster
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> Use more idiomatic glib/auto-style code.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> ---
> tests/unit/check-qobject.c | 127 ++++++++++++-------------------------
> 1 file changed, 40 insertions(+), 87 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 11/32] Replace qemu_real_host_page variables with inlined functions
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 02/32] meson: add util dependency for oslib-posix on freebsd marcandre.lureau
` (31 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Cameron Esfahani, Roman Bolshakov,
Paolo Bonzini, David Hildenbrand, Igor Mammedov, Kevin Wolf,
Hanna Reitz, Stefan Hajnoczi, Fam Zheng,
Philippe Mathieu-Daudé,
Denis V. Lunev, Vladimir Sementsov-Ogievskiy, Warner Losh,
Kyle Evans, Michael S. Tsirkin, Gerd Hoffmann, Eduardo Habkost,
Marcel Apfelbaum, Yanan Wang, Cornelia Huck, Thomas Huth,
Halil Pasic, Christian Borntraeger, Mark Cave-Ayland,
Cédric Le Goater, Daniel Henrique Barboza, David Gibson,
Greg Kurz, Yuval Shaia, Stefan Berger, Alex Williamson,
Richard Henderson, Peter Xu, Laurent Vivier, Juan Quintela,
Dr. David Alan Gilbert, Markus Armbruster, Wenchao Wang,
Colin Xu, Kamil Rytarowski, Reinoud Zandijk, Sunil Muthuswamy,
Stefan Weil, open list:Overall KVM CPUs,
open list:Block layer core, open list:S390 general arch...,
open list:New World (mac99),
open list:X86 HAXM CPUs
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Replace the global variables with inlined helper functions. getpagesize() is very
likely annotated with a "const" function attribute (at least with glibc), and thus
optimization should apply even better.
This avoids the need for a constructor initialization too.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/exec/cpu-common.h | 2 +-
include/exec/ram_addr.h | 2 +-
include/qemu/osdep.h | 15 +++++++++++----
accel/hvf/hvf-accel-ops.c | 2 +-
accel/kvm/kvm-all.c | 20 ++++++++++----------
backends/hostmem.c | 2 +-
block.c | 4 ++--
block/file-posix.c | 6 +++---
block/io.c | 2 +-
block/nvme.c | 22 +++++++++++-----------
block/parallels.c | 2 +-
block/qcow2-cache.c | 2 +-
bsd-user/elfload.c | 2 +-
bsd-user/mmap.c | 2 +-
contrib/vhost-user-gpu/vugbm.c | 2 +-
cpu.c | 2 +-
hw/display/qxl.c | 2 +-
hw/intc/s390_flic_kvm.c | 2 +-
hw/nvram/fw_cfg.c | 6 +++---
hw/ppc/mac_newworld.c | 2 +-
hw/ppc/spapr_pci.c | 2 +-
hw/rdma/vmw/pvrdma_main.c | 2 +-
hw/scsi/scsi-generic.c | 2 +-
hw/tpm/tpm_ppi.c | 2 +-
hw/vfio/common.c | 24 ++++++++++++------------
hw/vfio/pci.c | 10 +++++-----
hw/vfio/spapr.c | 8 ++++----
hw/virtio/vhost-iova-tree.c | 4 ++--
hw/virtio/vhost-shadow-virtqueue.c | 8 ++++----
hw/virtio/vhost-user.c | 4 ++--
hw/virtio/vhost-vdpa.c | 6 +++---
hw/virtio/virtio-mem.c | 10 +++++-----
linux-user/elfload.c | 4 ++--
linux-user/mmap.c | 2 +-
migration/migration.c | 2 +-
migration/postcopy-ram.c | 4 ++--
monitor/misc.c | 2 +-
softmmu/physmem.c | 6 +++---
target/i386/hax/hax-mem.c | 10 +++++-----
target/i386/nvmm/nvmm-all.c | 8 ++++----
target/i386/whpx/whpx-all.c | 8 ++++----
target/ppc/kvm.c | 2 +-
tcg/region.c | 8 ++++----
tests/vhost-user-bridge.c | 8 ++++----
util/cutils.c | 4 ++--
util/mmap-alloc.c | 10 +++++-----
util/osdep.c | 4 ++--
util/oslib-posix.c | 8 ++++----
util/oslib-win32.c | 2 +-
util/pagesize.c | 18 ------------------
util/vfio-helpers.c | 14 +++++++-------
scripts/checkpatch.pl | 4 ++--
util/meson.build | 1 -
53 files changed, 150 insertions(+), 162 deletions(-)
delete mode 100644 util/pagesize.c
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index c7d50fac955c..5979fc1f8e1b 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -26,7 +26,7 @@ extern uintptr_t qemu_host_page_size;
extern intptr_t qemu_host_page_mask;
#define HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_host_page_size)
-#define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_size)
+#define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_size())
/* The CPU list lock nests outside page_(un)lock or mmap_(un)lock */
void qemu_init_cpu_list(void);
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index 64fb936c7c74..f3e0c78161d1 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -343,7 +343,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
hwaddr addr;
ram_addr_t ram_addr;
unsigned long len = (pages + HOST_LONG_BITS - 1) / HOST_LONG_BITS;
- unsigned long hpratio = qemu_real_host_page_size / TARGET_PAGE_SIZE;
+ unsigned long hpratio = qemu_real_host_page_size() / TARGET_PAGE_SIZE;
unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);
/* start address is aligned at the start of a word? */
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 95a14914d13b..240b48707ecc 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -431,9 +431,9 @@ extern int madvise(char *, size_t, int);
/* Use 1 MiB (segment size) alignment so gmap can be used by KVM. */
# define QEMU_VMALLOC_ALIGN (256 * 4096)
#elif defined(__linux__) && defined(__sparc__)
-# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)
+# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size(), SHMLBA)
#else
-# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size
+# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size()
#endif
#ifdef CONFIG_POSIX
@@ -590,8 +590,15 @@ pid_t qemu_fork(Error **errp);
/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
* when intptr_t is 32-bit and we are aligning a long long.
*/
-extern uintptr_t qemu_real_host_page_size;
-extern intptr_t qemu_real_host_page_mask;
+static inline uintptr_t qemu_real_host_page_size(void)
+{
+ return getpagesize();
+}
+
+static inline intptr_t qemu_real_host_page_mask(void)
+{
+ return -(intptr_t)qemu_real_host_page_size();
+}
/*
* After using getopt or getopt_long, if you need to parse another set
diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c
index 54457c76c2f3..a70e2eb375dc 100644
--- a/accel/hvf/hvf-accel-ops.c
+++ b/accel/hvf/hvf-accel-ops.c
@@ -122,7 +122,7 @@ static void hvf_set_phys_mem(MemoryRegionSection *section, bool add)
MemoryRegion *area = section->mr;
bool writeable = !area->readonly && !area->rom_device;
hv_memory_flags_t flags;
- uint64_t page_size = qemu_real_host_page_size;
+ uint64_t page_size = qemu_real_host_page_size();
if (!memory_region_is_ram(area)) {
if (writeable) {
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 8d9d2367ee02..32e177bd26b4 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -59,7 +59,7 @@
#ifdef PAGE_SIZE
#undef PAGE_SIZE
#endif
-#define PAGE_SIZE qemu_real_host_page_size
+#define PAGE_SIZE qemu_real_host_page_size()
#ifndef KVM_GUESTDBG_BLOCKIRQ
#define KVM_GUESTDBG_BLOCKIRQ 0
@@ -324,14 +324,14 @@ static hwaddr kvm_align_section(MemoryRegionSection *section,
with sub-page size and unaligned start address. Pad the start
address to next and truncate size to previous page boundary. */
aligned = ROUND_UP(section->offset_within_address_space,
- qemu_real_host_page_size);
+ qemu_real_host_page_size());
delta = aligned - section->offset_within_address_space;
*start = aligned;
if (delta > size) {
return 0;
}
- return (size - delta) & qemu_real_host_page_mask;
+ return (size - delta) & qemu_real_host_page_mask();
}
int kvm_physical_memory_addr_from_host(KVMState *s, void *ram,
@@ -626,7 +626,7 @@ static void kvm_log_stop(MemoryListener *listener,
static void kvm_slot_sync_dirty_pages(KVMSlot *slot)
{
ram_addr_t start = slot->ram_start_offset;
- ram_addr_t pages = slot->memory_size / qemu_real_host_page_size;
+ ram_addr_t pages = slot->memory_size / qemu_real_host_page_size();
cpu_physical_memory_set_dirty_lebitmap(slot->dirty_bmap, start, pages);
}
@@ -662,7 +662,7 @@ static void kvm_slot_init_dirty_bitmap(KVMSlot *mem)
* And mem->memory_size is aligned to it (otherwise this mem can't
* be registered to KVM).
*/
- hwaddr bitmap_size = ALIGN(mem->memory_size / qemu_real_host_page_size,
+ hwaddr bitmap_size = ALIGN(mem->memory_size / qemu_real_host_page_size(),
/*HOST_LONG_BITS*/ 64) / 8;
mem->dirty_bmap = g_malloc0(bitmap_size);
mem->dirty_bmap_size = bitmap_size;
@@ -707,7 +707,7 @@ static void kvm_dirty_ring_mark_page(KVMState *s, uint32_t as_id,
mem = &kml->slots[slot_id];
if (!mem->memory_size || offset >=
- (mem->memory_size / qemu_real_host_page_size)) {
+ (mem->memory_size / qemu_real_host_page_size())) {
return;
}
@@ -895,7 +895,7 @@ static void kvm_physical_sync_dirty_bitmap(KVMMemoryListener *kml,
/* Alignment requirement for KVM_CLEAR_DIRTY_LOG - 64 pages */
#define KVM_CLEAR_LOG_SHIFT 6
-#define KVM_CLEAR_LOG_ALIGN (qemu_real_host_page_size << KVM_CLEAR_LOG_SHIFT)
+#define KVM_CLEAR_LOG_ALIGN (qemu_real_host_page_size() << KVM_CLEAR_LOG_SHIFT)
#define KVM_CLEAR_LOG_MASK (-KVM_CLEAR_LOG_ALIGN)
static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
@@ -904,7 +904,7 @@ static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
KVMState *s = kvm_state;
uint64_t end, bmap_start, start_delta, bmap_npages;
struct kvm_clear_dirty_log d;
- unsigned long *bmap_clear = NULL, psize = qemu_real_host_page_size;
+ unsigned long *bmap_clear = NULL, psize = qemu_real_host_page_size();
int ret;
/*
@@ -1335,7 +1335,7 @@ kvm_check_extension_list(KVMState *s, const KVMCapabilityInfo *list)
void kvm_set_max_memslot_size(hwaddr max_slot_size)
{
g_assert(
- ROUND_UP(max_slot_size, qemu_real_host_page_size) == max_slot_size
+ ROUND_UP(max_slot_size, qemu_real_host_page_size()) == max_slot_size
);
kvm_max_slot_size = max_slot_size;
}
@@ -2341,7 +2341,7 @@ static int kvm_init(MachineState *ms)
* even with KVM. TARGET_PAGE_SIZE is assumed to be the minimum
* page size for the system though.
*/
- assert(TARGET_PAGE_SIZE <= qemu_real_host_page_size);
+ assert(TARGET_PAGE_SIZE <= qemu_real_host_page_size());
s->sigmask_len = 8;
diff --git a/backends/hostmem.c b/backends/hostmem.c
index b2a5e905e866..a7bae3d713c9 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -319,7 +319,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
#else
size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
{
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
#endif
diff --git a/block.c b/block.c
index 718e4cae8b3a..8cd16e757e32 100644
--- a/block.c
+++ b/block.c
@@ -135,7 +135,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs)
{
if (!bs || !bs->drv) {
/* page size or 4k (hdd sector size) should be on the safe side */
- return MAX(4096, qemu_real_host_page_size);
+ return MAX(4096, qemu_real_host_page_size());
}
IO_CODE();
@@ -146,7 +146,7 @@ size_t bdrv_min_mem_align(BlockDriverState *bs)
{
if (!bs || !bs->drv) {
/* page size or 4k (hdd sector size) should be on the safe side */
- return MAX(4096, qemu_real_host_page_size);
+ return MAX(4096, qemu_real_host_page_size());
}
IO_CODE();
diff --git a/block/file-posix.c b/block/file-posix.c
index 39a3d6dbe6e2..61b02d85ebf1 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -386,7 +386,7 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp)
{
BDRVRawState *s = bs->opaque;
char *buf;
- size_t max_align = MAX(MAX_BLOCKSIZE, qemu_real_host_page_size);
+ size_t max_align = MAX(MAX_BLOCKSIZE, qemu_real_host_page_size());
size_t alignments[] = {1, 512, 1024, 2048, 4096};
/* For SCSI generic devices the alignment is not really used.
@@ -1261,7 +1261,7 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
raw_probe_alignment(bs, s->fd, errp);
bs->bl.min_mem_alignment = s->buf_align;
- bs->bl.opt_mem_alignment = MAX(s->buf_align, qemu_real_host_page_size);
+ bs->bl.opt_mem_alignment = MAX(s->buf_align, qemu_real_host_page_size());
/*
* Maximum transfers are best effort, so it is okay to ignore any
@@ -1886,7 +1886,7 @@ static int allocate_first_block(int fd, size_t max_size)
size_t write_size = (max_size < MAX_BLOCKSIZE)
? BDRV_SECTOR_SIZE
: MAX_BLOCKSIZE;
- size_t max_align = MAX(MAX_BLOCKSIZE, qemu_real_host_page_size);
+ size_t max_align = MAX(MAX_BLOCKSIZE, qemu_real_host_page_size());
void *buf;
ssize_t n;
int ret;
diff --git a/block/io.c b/block/io.c
index 3280144a17d4..9769ec53b0ee 100644
--- a/block/io.c
+++ b/block/io.c
@@ -201,7 +201,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Transaction *tran, Error **errp)
if (!have_limits) {
bs->bl.min_mem_alignment = 512;
- bs->bl.opt_mem_alignment = qemu_real_host_page_size;
+ bs->bl.opt_mem_alignment = qemu_real_host_page_size();
/* Safe default since most protocols use readv()/writev()/etc */
bs->bl.max_iov = IOV_MAX;
diff --git a/block/nvme.c b/block/nvme.c
index 552029931d59..01fb28aa638b 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -169,9 +169,9 @@ static bool nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q,
size_t bytes;
int r;
- bytes = ROUND_UP(nentries * entry_bytes, qemu_real_host_page_size);
+ bytes = ROUND_UP(nentries * entry_bytes, qemu_real_host_page_size());
q->head = q->tail = 0;
- q->queue = qemu_try_memalign(qemu_real_host_page_size, bytes);
+ q->queue = qemu_try_memalign(qemu_real_host_page_size(), bytes);
if (!q->queue) {
error_setg(errp, "Cannot allocate queue");
return false;
@@ -232,8 +232,8 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState *s,
trace_nvme_create_queue_pair(idx, q, size, aio_context,
event_notifier_get_fd(s->irq_notifier));
bytes = QEMU_ALIGN_UP(s->page_size * NVME_NUM_REQS,
- qemu_real_host_page_size);
- q->prp_list_pages = qemu_try_memalign(qemu_real_host_page_size, bytes);
+ qemu_real_host_page_size());
+ q->prp_list_pages = qemu_try_memalign(qemu_real_host_page_size(), bytes);
if (!q->prp_list_pages) {
error_setg(errp, "Cannot allocate PRP page list");
goto fail;
@@ -533,9 +533,9 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp)
.opcode = NVME_ADM_CMD_IDENTIFY,
.cdw10 = cpu_to_le32(0x1),
};
- size_t id_size = QEMU_ALIGN_UP(sizeof(*id), qemu_real_host_page_size);
+ size_t id_size = QEMU_ALIGN_UP(sizeof(*id), qemu_real_host_page_size());
- id = qemu_try_memalign(qemu_real_host_page_size, id_size);
+ id = qemu_try_memalign(qemu_real_host_page_size(), id_size);
if (!id) {
error_setg(errp, "Cannot allocate buffer for identify response");
goto out;
@@ -1048,7 +1048,7 @@ static coroutine_fn int nvme_cmd_map_qiov(BlockDriverState *bs, NvmeCmd *cmd,
bool retry = true;
uint64_t iova;
size_t len = QEMU_ALIGN_UP(qiov->iov[i].iov_len,
- qemu_real_host_page_size);
+ qemu_real_host_page_size());
try_map:
r = qemu_vfio_dma_map(s->vfio,
qiov->iov[i].iov_base,
@@ -1224,8 +1224,8 @@ static inline bool nvme_qiov_aligned(BlockDriverState *bs,
for (i = 0; i < qiov->niov; ++i) {
if (!QEMU_PTR_IS_ALIGNED(qiov->iov[i].iov_base,
- qemu_real_host_page_size) ||
- !QEMU_IS_ALIGNED(qiov->iov[i].iov_len, qemu_real_host_page_size)) {
+ qemu_real_host_page_size()) ||
+ !QEMU_IS_ALIGNED(qiov->iov[i].iov_len, qemu_real_host_page_size())) {
trace_nvme_qiov_unaligned(qiov, i, qiov->iov[i].iov_base,
qiov->iov[i].iov_len, s->page_size);
return false;
@@ -1241,7 +1241,7 @@ static int nvme_co_prw(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
int r;
QEMU_AUTO_VFREE uint8_t *buf = NULL;
QEMUIOVector local_qiov;
- size_t len = QEMU_ALIGN_UP(bytes, qemu_real_host_page_size);
+ size_t len = QEMU_ALIGN_UP(bytes, qemu_real_host_page_size());
assert(QEMU_IS_ALIGNED(offset, s->page_size));
assert(QEMU_IS_ALIGNED(bytes, s->page_size));
assert(bytes <= s->max_transfer);
@@ -1251,7 +1251,7 @@ static int nvme_co_prw(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
}
s->stats.unaligned_accesses++;
trace_nvme_prw_buffered(s, offset, bytes, qiov->niov, is_write);
- buf = qemu_try_memalign(qemu_real_host_page_size, len);
+ buf = qemu_try_memalign(qemu_real_host_page_size(), len);
if (!buf) {
return -ENOMEM;
diff --git a/block/parallels.c b/block/parallels.c
index cd23e02d06c1..8879b7027a19 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -870,7 +870,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
}
}
- s->bat_dirty_block = 4 * qemu_real_host_page_size;
+ s->bat_dirty_block = 4 * qemu_real_host_page_size();
s->bat_dirty_bmap =
bitmap_new(DIV_ROUND_UP(s->header_size, s->bat_dirty_block));
diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
index 8a0105911f7e..539f9ca2d501 100644
--- a/block/qcow2-cache.c
+++ b/block/qcow2-cache.c
@@ -75,7 +75,7 @@ static void qcow2_cache_table_release(Qcow2Cache *c, int i, int num_tables)
/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */
#ifdef CONFIG_LINUX
void *t = qcow2_cache_get_table_addr(c, i);
- int align = qemu_real_host_page_size;
+ int align = qemu_real_host_page_size();
size_t mem_size = (size_t) c->table_size * num_tables;
size_t offset = QEMU_ALIGN_UP((uintptr_t) t, align) - (uintptr_t) t;
size_t length = QEMU_ALIGN_DOWN(mem_size - offset, align);
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 142a5bfac260..f8edb22f2ab1 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -246,7 +246,7 @@ static void padzero(abi_ulong elf_bss, abi_ulong last_bss)
* patch target_mmap(), but it is more complicated as the file
* size must be known.
*/
- if (qemu_real_host_page_size < qemu_host_page_size) {
+ if (qemu_real_host_page_size() < qemu_host_page_size) {
abi_ulong end_addr, end_addr1;
end_addr1 = REAL_HOST_PAGE_ALIGN(elf_bss);
end_addr = HOST_PAGE_ALIGN(elf_bss);
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 13cb32dba13e..07aa0a634dff 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -515,7 +515,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
* up to the targets page boundary.
*/
- if ((qemu_real_host_page_size < qemu_host_page_size) && fd != -1) {
+ if ((qemu_real_host_page_size() < qemu_host_page_size) && fd != -1) {
struct stat sb;
if (fstat(fd, &sb) == -1) {
diff --git a/contrib/vhost-user-gpu/vugbm.c b/contrib/vhost-user-gpu/vugbm.c
index fb15d0372c25..503d0a4566f8 100644
--- a/contrib/vhost-user-gpu/vugbm.c
+++ b/contrib/vhost-user-gpu/vugbm.c
@@ -53,7 +53,7 @@ struct udmabuf_create {
static size_t
udmabuf_get_size(struct vugbm_buffer *buf)
{
- return ROUND_UP(buf->width * buf->height * 4, qemu_real_host_page_size);
+ return ROUND_UP(buf->width * buf->height * 4, qemu_real_host_page_size());
}
static bool
diff --git a/cpu.c b/cpu.c
index d34c3439bbf3..ab2c7c81e460 100644
--- a/cpu.c
+++ b/cpu.c
@@ -481,7 +481,7 @@ void page_size_init(void)
/* NOTE: we can always suppose that qemu_host_page_size >=
TARGET_PAGE_SIZE */
if (qemu_host_page_size == 0) {
- qemu_host_page_size = qemu_real_host_page_size;
+ qemu_host_page_size = qemu_real_host_page_size();
}
if (qemu_host_page_size < TARGET_PAGE_SIZE) {
qemu_host_page_size = TARGET_PAGE_SIZE;
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index adbdbcaeb612..2db34714fbd9 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -320,7 +320,7 @@ static ram_addr_t qxl_rom_size(void)
#define QXL_ROM_SZ 8192
QEMU_BUILD_BUG_ON(QXL_REQUIRED_SZ > QXL_ROM_SZ);
- return QEMU_ALIGN_UP(QXL_REQUIRED_SZ, qemu_real_host_page_size);
+ return QEMU_ALIGN_UP(QXL_REQUIRED_SZ, qemu_real_host_page_size());
}
static void init_qxl_rom(PCIQXLDevice *d)
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index efe5054182c3..4e86d2d43670 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -24,7 +24,7 @@
#include "trace.h"
#include "qom/object.h"
-#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size
+#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size()
#define FLIC_FAILED (-1UL)
#define FLIC_SAVEVM_VERSION 1
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index e5f3c981841d..ea2d56f9f2af 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -622,9 +622,9 @@ static bool fw_cfg_acpi_mr_restore(void *opaque)
FWCfgState *s = opaque;
bool mr_aligned;
- mr_aligned = QEMU_IS_ALIGNED(s->table_mr_size, qemu_real_host_page_size) &&
- QEMU_IS_ALIGNED(s->linker_mr_size, qemu_real_host_page_size) &&
- QEMU_IS_ALIGNED(s->rsdp_mr_size, qemu_real_host_page_size);
+ mr_aligned = QEMU_IS_ALIGNED(s->table_mr_size, qemu_real_host_page_size()) &&
+ QEMU_IS_ALIGNED(s->linker_mr_size, qemu_real_host_page_size()) &&
+ QEMU_IS_ALIGNED(s->rsdp_mr_size, qemu_real_host_page_size());
return s->acpi_mr_restore && !mr_aligned;
}
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 4bddb529c2a6..7b5a205309af 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -456,7 +456,7 @@ static void ppc_core99_init(MachineState *machine)
}
/* The NewWorld NVRAM is not located in the MacIO device */
- if (kvm_enabled() && qemu_real_host_page_size > 4096) {
+ if (kvm_enabled() && qemu_real_host_page_size() > 4096) {
/* We can't combine read-write and read-only in a single page, so
move the NVRAM out of ROM again for KVM */
nvram_addr = 0xFFE00000;
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 5bfd4aa9e5aa..b2f5fbef0c83 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1978,7 +1978,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
* our memory slot is of page size granularity.
*/
if (kvm_enabled()) {
- msi_window_size = qemu_real_host_page_size;
+ msi_window_size = qemu_real_host_page_size();
}
memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,
diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
index 91206dbb8eb0..27a76224320e 100644
--- a/hw/rdma/vmw/pvrdma_main.c
+++ b/hw/rdma/vmw/pvrdma_main.c
@@ -608,7 +608,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)
rdma_info_report("Initializing device %s %x.%x", pdev->name,
PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
- if (TARGET_PAGE_SIZE != qemu_real_host_page_size) {
+ if (TARGET_PAGE_SIZE != qemu_real_host_page_size()) {
error_setg(errp, "Target page size must be the same as host page size");
return;
}
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index 0306ccc7b1e4..0ab00ef85c95 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -183,7 +183,7 @@ static int scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s, int len)
uint32_t max_iov = blk_get_max_hw_iov(s->conf.blk);
assert(max_transfer);
- max_transfer = MIN_NON_ZERO(max_transfer, max_iov * qemu_real_host_page_size)
+ max_transfer = MIN_NON_ZERO(max_transfer, max_iov * qemu_real_host_page_size())
/ s->blocksize;
stl_be_p(&r->buf[8], max_transfer);
/* Also take care of the opt xfer len. */
diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c
index c89ac53e65e6..7f74e26ec6c9 100644
--- a/hw/tpm/tpm_ppi.c
+++ b/hw/tpm/tpm_ppi.c
@@ -47,7 +47,7 @@ void tpm_ppi_reset(TPMPPI *tpmppi)
void tpm_ppi_init(TPMPPI *tpmppi, MemoryRegion *m,
hwaddr addr, Object *obj)
{
- tpmppi->buf = qemu_memalign(qemu_real_host_page_size,
+ tpmppi->buf = qemu_memalign(qemu_real_host_page_size(),
HOST_PAGE_ALIGN(TPM_PPI_ADDR_SIZE));
memory_region_init_ram_device_ptr(&tpmppi->ram, obj, "tpm-ppi",
TPM_PPI_ADDR_SIZE, tpmppi->buf);
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 080046e3f511..2b1f78fdfaeb 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -397,7 +397,7 @@ static int vfio_dma_unmap_bitmap(VFIOContainer *container,
{
struct vfio_iommu_type1_dma_unmap *unmap;
struct vfio_bitmap *bitmap;
- uint64_t pages = REAL_HOST_PAGE_ALIGN(size) / qemu_real_host_page_size;
+ uint64_t pages = REAL_HOST_PAGE_ALIGN(size) / qemu_real_host_page_size();
int ret;
unmap = g_malloc0(sizeof(*unmap) + sizeof(*bitmap));
@@ -414,7 +414,7 @@ static int vfio_dma_unmap_bitmap(VFIOContainer *container,
* to qemu_real_host_page_size.
*/
- bitmap->pgsize = qemu_real_host_page_size;
+ bitmap->pgsize = qemu_real_host_page_size();
bitmap->size = ROUND_UP(pages, sizeof(__u64) * BITS_PER_BYTE) /
BITS_PER_BYTE;
@@ -882,8 +882,8 @@ static void vfio_listener_region_add(MemoryListener *listener,
}
if (unlikely((section->offset_within_address_space &
- ~qemu_real_host_page_mask) !=
- (section->offset_within_region & ~qemu_real_host_page_mask))) {
+ ~qemu_real_host_page_mask()) !=
+ (section->offset_within_region & ~qemu_real_host_page_mask()))) {
error_report("%s received unaligned region", __func__);
return;
}
@@ -891,7 +891,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
iova = REAL_HOST_PAGE_ALIGN(section->offset_within_address_space);
llend = int128_make64(section->offset_within_address_space);
llend = int128_add(llend, section->size);
- llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask));
+ llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask()));
if (int128_ge(int128_make64(iova), llend)) {
if (memory_region_is_ram_device(section->mr)) {
@@ -899,7 +899,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
memory_region_name(section->mr),
section->offset_within_address_space,
int128_getlo(section->size),
- qemu_real_host_page_size);
+ qemu_real_host_page_size());
}
return;
}
@@ -1118,8 +1118,8 @@ static void vfio_listener_region_del(MemoryListener *listener,
}
if (unlikely((section->offset_within_address_space &
- ~qemu_real_host_page_mask) !=
- (section->offset_within_region & ~qemu_real_host_page_mask))) {
+ ~qemu_real_host_page_mask()) !=
+ (section->offset_within_region & ~qemu_real_host_page_mask()))) {
error_report("%s received unaligned region", __func__);
return;
}
@@ -1150,7 +1150,7 @@ static void vfio_listener_region_del(MemoryListener *listener,
iova = REAL_HOST_PAGE_ALIGN(section->offset_within_address_space);
llend = int128_make64(section->offset_within_address_space);
llend = int128_add(llend, section->size);
- llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask));
+ llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask()));
if (int128_ge(int128_make64(iova), llend)) {
return;
@@ -1272,9 +1272,9 @@ static int vfio_get_dirty_bitmap(VFIOContainer *container, uint64_t iova,
* qemu_real_host_page_size to mark those dirty. Hence set bitmap's pgsize
* to qemu_real_host_page_size.
*/
- range->bitmap.pgsize = qemu_real_host_page_size;
+ range->bitmap.pgsize = qemu_real_host_page_size();
- pages = REAL_HOST_PAGE_ALIGN(range->size) / qemu_real_host_page_size;
+ pages = REAL_HOST_PAGE_ALIGN(range->size) / qemu_real_host_page_size();
range->bitmap.size = ROUND_UP(pages, sizeof(__u64) * BITS_PER_BYTE) /
BITS_PER_BYTE;
range->bitmap.data = g_try_malloc0(range->bitmap.size);
@@ -1970,7 +1970,7 @@ static void vfio_get_iommu_info_migration(VFIOContainer *container,
* cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
* qemu_real_host_page_size to mark those dirty.
*/
- if (cap_mig->pgsize_bitmap & qemu_real_host_page_size) {
+ if (cap_mig->pgsize_bitmap & qemu_real_host_page_size()) {
container->dirty_pages_supported = true;
container->max_dirty_bitmap_size = cap_mig->max_dirty_bitmap_size;
container->dirty_pgsizes = cap_mig->pgsize_bitmap;
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 67a183f17bff..9fd9faee1d14 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -1087,8 +1087,8 @@ static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar)
/* If BAR is mapped and page aligned, update to fill PAGE_SIZE */
if (bar_addr != PCI_BAR_UNMAPPED &&
- !(bar_addr & ~qemu_real_host_page_mask)) {
- size = qemu_real_host_page_size;
+ !(bar_addr & ~qemu_real_host_page_mask())) {
+ size = qemu_real_host_page_size();
}
memory_region_transaction_begin();
@@ -1204,7 +1204,7 @@ void vfio_pci_write_config(PCIDevice *pdev,
for (bar = 0; bar < PCI_ROM_SLOT; bar++) {
if (old_addr[bar] != pdev->io_regions[bar].addr &&
vdev->bars[bar].region.size > 0 &&
- vdev->bars[bar].region.size < qemu_real_host_page_size) {
+ vdev->bars[bar].region.size < qemu_real_host_page_size()) {
vfio_sub_page_bar_update_mapping(pdev, bar);
}
}
@@ -1292,7 +1292,7 @@ static void vfio_pci_fixup_msix_region(VFIOPCIDevice *vdev)
}
/* MSI-X table start and end aligned to host page size */
- start = vdev->msix->table_offset & qemu_real_host_page_mask;
+ start = vdev->msix->table_offset & qemu_real_host_page_mask();
end = REAL_HOST_PAGE_ALIGN((uint64_t)vdev->msix->table_offset +
(vdev->msix->entries * PCI_MSIX_ENTRY_SIZE));
@@ -2478,7 +2478,7 @@ static int vfio_pci_load_config(VFIODevice *vbasedev, QEMUFile *f)
*/
if (old_addr[bar] != pdev->io_regions[bar].addr &&
vdev->bars[bar].region.size > 0 &&
- vdev->bars[bar].region.size < qemu_real_host_page_size) {
+ vdev->bars[bar].region.size < qemu_real_host_page_size()) {
vfio_sub_page_bar_update_mapping(pdev, bar);
}
}
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index 04c6e67f8fba..9ec1e95f6da7 100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -44,7 +44,7 @@ static void vfio_prereg_listener_region_add(MemoryListener *listener,
const hwaddr gpa = section->offset_within_address_space;
hwaddr end;
int ret;
- hwaddr page_mask = qemu_real_host_page_mask;
+ hwaddr page_mask = qemu_real_host_page_mask();
struct vfio_iommu_spapr_register_memory reg = {
.argsz = sizeof(reg),
.flags = 0,
@@ -102,7 +102,7 @@ static void vfio_prereg_listener_region_del(MemoryListener *listener,
const hwaddr gpa = section->offset_within_address_space;
hwaddr end;
int ret;
- hwaddr page_mask = qemu_real_host_page_mask;
+ hwaddr page_mask = qemu_real_host_page_mask();
struct vfio_iommu_spapr_register_memory reg = {
.argsz = sizeof(reg),
.flags = 0,
@@ -199,12 +199,12 @@ int vfio_spapr_create_window(VFIOContainer *container,
* Below we look at qemu_real_host_page_size as TCEs are allocated from
* system pages.
*/
- bits_per_level = ctz64(qemu_real_host_page_size) + 8;
+ bits_per_level = ctz64(qemu_real_host_page_size()) + 8;
create.levels = bits_total / bits_per_level;
if (bits_total % bits_per_level) {
++create.levels;
}
- max_levels = (64 - create.page_shift) / ctz64(qemu_real_host_page_size);
+ max_levels = (64 - create.page_shift) / ctz64(qemu_real_host_page_size());
for ( ; create.levels <= max_levels; ++create.levels) {
ret = ioctl(container->fd, VFIO_IOMMU_SPAPR_TCE_CREATE, &create);
if (!ret) {
diff --git a/hw/virtio/vhost-iova-tree.c b/hw/virtio/vhost-iova-tree.c
index 55fed1fefb43..67bf6d57ab9c 100644
--- a/hw/virtio/vhost-iova-tree.c
+++ b/hw/virtio/vhost-iova-tree.c
@@ -11,7 +11,7 @@
#include "qemu/iova-tree.h"
#include "vhost-iova-tree.h"
-#define iova_min_addr qemu_real_host_page_size
+#define iova_min_addr qemu_real_host_page_size()
/**
* VhostIOVATree, able to:
@@ -86,7 +86,7 @@ const DMAMap *vhost_iova_tree_find_iova(const VhostIOVATree *tree,
int vhost_iova_tree_map_alloc(VhostIOVATree *tree, DMAMap *map)
{
/* Some vhost devices do not like addr 0. Skip first page */
- hwaddr iova_first = tree->iova_first ?: qemu_real_host_page_size;
+ hwaddr iova_first = tree->iova_first ?: qemu_real_host_page_size();
if (map->translated_addr + map->size < map->translated_addr ||
map->perm == IOMMU_NONE) {
diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c
index b232803d1b19..1e5cfe2af63e 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -471,14 +471,14 @@ size_t vhost_svq_driver_area_size(const VhostShadowVirtqueue *svq)
size_t avail_size = offsetof(vring_avail_t, ring) +
sizeof(uint16_t) * svq->vring.num;
- return ROUND_UP(desc_size + avail_size, qemu_real_host_page_size);
+ return ROUND_UP(desc_size + avail_size, qemu_real_host_page_size());
}
size_t vhost_svq_device_area_size(const VhostShadowVirtqueue *svq)
{
size_t used_size = offsetof(vring_used_t, ring) +
sizeof(vring_used_elem_t) * svq->vring.num;
- return ROUND_UP(used_size, qemu_real_host_page_size);
+ return ROUND_UP(used_size, qemu_real_host_page_size());
}
/**
@@ -533,11 +533,11 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIODevice *vdev,
svq->vring.num = virtio_queue_get_num(vdev, virtio_get_queue_index(vq));
driver_size = vhost_svq_driver_area_size(svq);
device_size = vhost_svq_device_area_size(svq);
- svq->vring.desc = qemu_memalign(qemu_real_host_page_size, driver_size);
+ svq->vring.desc = qemu_memalign(qemu_real_host_page_size(), driver_size);
desc_size = sizeof(vring_desc_t) * svq->vring.num;
svq->vring.avail = (void *)((char *)svq->vring.desc + desc_size);
memset(svq->vring.desc, 0, driver_size);
- svq->vring.used = qemu_memalign(qemu_real_host_page_size, device_size);
+ svq->vring.used = qemu_memalign(qemu_real_host_page_size(), device_size);
memset(svq->vring.used, 0, device_size);
svq->ring_id_maps = g_new0(VirtQueueElement *, svq->vring.num);
for (unsigned i = 0; i < svq->vring.num - 1; i++) {
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 6abbc9da3202..9c4f84f35f61 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -1166,7 +1166,7 @@ static int vhost_user_set_vring_num(struct vhost_dev *dev,
static void vhost_user_host_notifier_free(VhostUserHostNotifier *n)
{
assert(n && n->unmap_addr);
- munmap(n->unmap_addr, qemu_real_host_page_size);
+ munmap(n->unmap_addr, qemu_real_host_page_size());
n->unmap_addr = NULL;
}
@@ -1503,7 +1503,7 @@ static int vhost_user_slave_handle_vring_host_notifier(struct vhost_dev *dev,
int fd)
{
int queue_idx = area->u64 & VHOST_USER_VRING_IDX_MASK;
- size_t page_size = qemu_real_host_page_size;
+ size_t page_size = qemu_real_host_page_size();
struct vhost_user *u = dev->opaque;
VhostUserState *user = u->user;
VirtIODevice *vdev = dev->vdev;
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index c5ed7a377939..2075f336e2ad 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -468,7 +468,7 @@ err:
static void vhost_vdpa_host_notifier_uninit(struct vhost_dev *dev,
int queue_index)
{
- size_t page_size = qemu_real_host_page_size;
+ size_t page_size = qemu_real_host_page_size();
struct vhost_vdpa *v = dev->opaque;
VirtIODevice *vdev = dev->vdev;
VhostVDPAHostNotifier *n;
@@ -485,7 +485,7 @@ static void vhost_vdpa_host_notifier_uninit(struct vhost_dev *dev,
static int vhost_vdpa_host_notifier_init(struct vhost_dev *dev, int queue_index)
{
- size_t page_size = qemu_real_host_page_size;
+ size_t page_size = qemu_real_host_page_size();
struct vhost_vdpa *v = dev->opaque;
VirtIODevice *vdev = dev->vdev;
VhostVDPAHostNotifier *n;
@@ -875,7 +875,7 @@ static bool vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v,
return false;
}
- size = ROUND_UP(result->size, qemu_real_host_page_size);
+ size = ROUND_UP(result->size, qemu_real_host_page_size());
r = vhost_vdpa_dma_unmap(v, result->iova, size);
return r == 0;
}
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index f55dcf61f203..35cbf1f21946 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -53,11 +53,11 @@ static uint32_t virtio_mem_default_thp_size(void)
#if defined(__x86_64__) || defined(__arm__) || defined(__powerpc64__)
default_thp_size = 2 * MiB;
#elif defined(__aarch64__)
- if (qemu_real_host_page_size == 4 * KiB) {
+ if (qemu_real_host_page_size() == 4 * KiB) {
default_thp_size = 2 * MiB;
- } else if (qemu_real_host_page_size == 16 * KiB) {
+ } else if (qemu_real_host_page_size() == 16 * KiB) {
default_thp_size = 32 * MiB;
- } else if (qemu_real_host_page_size == 64 * KiB) {
+ } else if (qemu_real_host_page_size() == 64 * KiB) {
default_thp_size = 512 * MiB;
}
#endif
@@ -120,7 +120,7 @@ static uint64_t virtio_mem_default_block_size(RAMBlock *rb)
const uint64_t page_size = qemu_ram_pagesize(rb);
/* We can have hugetlbfs with a page size smaller than the THP size. */
- if (page_size == qemu_real_host_page_size) {
+ if (page_size == qemu_real_host_page_size()) {
return MAX(page_size, virtio_mem_thp_size());
}
return MAX(page_size, VIRTIO_MEM_MIN_BLOCK_SIZE);
@@ -135,7 +135,7 @@ static bool virtio_mem_has_shared_zeropage(RAMBlock *rb)
* fresh page, consuming actual memory.
*/
return !qemu_ram_is_shared(rb) && rb->fd < 0 &&
- qemu_ram_pagesize(rb) == qemu_real_host_page_size;
+ qemu_ram_pagesize(rb) == qemu_real_host_page_size();
}
#endif /* VIRTIO_MEM_HAS_LEGACY_GUESTS */
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 796acdcdbd2c..0b130b83c99f 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1916,8 +1916,8 @@ static abi_ulong setup_arg_pages(struct linux_binprm *bprm,
size = STACK_LOWER_LIMIT;
}
guard = TARGET_PAGE_SIZE;
- if (guard < qemu_real_host_page_size) {
- guard = qemu_real_host_page_size;
+ if (guard < qemu_real_host_page_size()) {
+ guard = qemu_real_host_page_size();
}
error = target_mmap(0, size + guard, PROT_READ | PROT_WRITE,
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index c125031b9046..a861f1e1d144 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -494,7 +494,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot,
may need to truncate file maps at EOF and add extra anonymous pages
up to the targets page boundary. */
- if ((qemu_real_host_page_size < qemu_host_page_size) &&
+ if ((qemu_real_host_page_size() < qemu_host_page_size) &&
!(flags & MAP_ANONYMOUS)) {
struct stat sb;
diff --git a/migration/migration.c b/migration/migration.c
index 695f0f29000c..4dcb511bb60d 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2652,7 +2652,7 @@ static struct rp_cmd_args {
static void migrate_handle_rp_req_pages(MigrationState *ms, const char* rbname,
ram_addr_t start, size_t len)
{
- long our_host_ps = qemu_real_host_page_size;
+ long our_host_ps = qemu_real_host_page_size();
trace_migrate_handle_rp_req_pages(rbname, start, len);
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 32c52f4b1d9e..a66dd536d939 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -319,7 +319,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)
return false;
}
- if (qemu_real_host_page_size != ram_pagesize_summary()) {
+ if (qemu_real_host_page_size() != ram_pagesize_summary()) {
bool have_hp = false;
/* We've got a huge page */
#ifdef UFFD_FEATURE_MISSING_HUGETLBFS
@@ -357,7 +357,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)
*/
bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
{
- long pagesize = qemu_real_host_page_size;
+ long pagesize = qemu_real_host_page_size();
int ufd = -1;
bool ret = false; /* Error unless we change it */
void *testarea = NULL;
diff --git a/monitor/misc.c b/monitor/misc.c
index a756dbd6db0c..b0fc0e5843a4 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -720,7 +720,7 @@ static uint64_t vtop(void *ptr, Error **errp)
uint64_t pinfo;
uint64_t ret = -1;
uintptr_t addr = (uintptr_t) ptr;
- uintptr_t pagesize = qemu_real_host_page_size;
+ uintptr_t pagesize = qemu_real_host_page_size();
off_t offset = addr / pagesize * sizeof(pinfo);
int fd;
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 4e1b27a20ecc..cdf0db733e57 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -1383,11 +1383,11 @@ long qemu_maxrampagesize(void)
#else
long qemu_minrampagesize(void)
{
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
long qemu_maxrampagesize(void)
{
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
#endif
@@ -2163,7 +2163,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
new_block->max_length = max_size;
assert(max_size >= size);
new_block->fd = -1;
- new_block->page_size = qemu_real_host_page_size;
+ new_block->page_size = qemu_real_host_page_size();
new_block->host = host;
new_block->flags = ram_flags;
ram_block_add(new_block, &local_err);
diff --git a/target/i386/hax/hax-mem.c b/target/i386/hax/hax-mem.c
index a226d174d8ef..05dbe8cce3ae 100644
--- a/target/i386/hax/hax-mem.c
+++ b/target/i386/hax/hax-mem.c
@@ -188,15 +188,15 @@ static void hax_process_section(MemoryRegionSection *section, uint8_t flags)
/* Adjust start_pa and size so that they are page-aligned. (Cf
* kvm_set_phys_mem() in kvm-all.c).
*/
- delta = qemu_real_host_page_size - (start_pa & ~qemu_real_host_page_mask);
- delta &= ~qemu_real_host_page_mask;
+ delta = qemu_real_host_page_size() - (start_pa & ~qemu_real_host_page_mask());
+ delta &= ~qemu_real_host_page_mask();
if (delta > size) {
return;
}
start_pa += delta;
size -= delta;
- size &= qemu_real_host_page_mask;
- if (!size || (start_pa & ~qemu_real_host_page_mask)) {
+ size &= qemu_real_host_page_mask();
+ if (!size || (start_pa & ~qemu_real_host_page_mask())) {
return;
}
@@ -214,7 +214,7 @@ static void hax_process_section(MemoryRegionSection *section, uint8_t flags)
* call into the kernel. Instead, we split the mapping into smaller ones,
* and call hax_update_mapping() on each.
*/
- max_mapping_size = UINT32_MAX & qemu_real_host_page_mask;
+ max_mapping_size = UINT32_MAX & qemu_real_host_page_mask();
while (size > max_mapping_size) {
hax_update_mapping(start_pa, max_mapping_size, host_va, flags);
start_pa += max_mapping_size;
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index b97d091a502d..9f940413318c 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -1075,15 +1075,15 @@ nvmm_process_section(MemoryRegionSection *section, int add)
}
/* Adjust start_pa and size so that they are page-aligned. */
- delta = qemu_real_host_page_size - (start_pa & ~qemu_real_host_page_mask);
- delta &= ~qemu_real_host_page_mask;
+ delta = qemu_real_host_page_size() - (start_pa & ~qemu_real_host_page_mask());
+ delta &= ~qemu_real_host_page_mask();
if (delta > size) {
return;
}
start_pa += delta;
size -= delta;
- size &= qemu_real_host_page_mask;
- if (!size || (start_pa & ~qemu_real_host_page_mask)) {
+ size &= qemu_real_host_page_mask();
+ if (!size || (start_pa & ~qemu_real_host_page_mask())) {
return;
}
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 03ba52da89fb..68a4ebe909ad 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -1572,15 +1572,15 @@ static void whpx_process_section(MemoryRegionSection *section, int add)
return;
}
- delta = qemu_real_host_page_size - (start_pa & ~qemu_real_host_page_mask);
- delta &= ~qemu_real_host_page_mask;
+ delta = qemu_real_host_page_size() - (start_pa & ~qemu_real_host_page_mask());
+ delta &= ~qemu_real_host_page_mask();
if (delta > size) {
return;
}
start_pa += delta;
size -= delta;
- size &= qemu_real_host_page_mask;
- if (!size || (start_pa & ~qemu_real_host_page_mask)) {
+ size &= qemu_real_host_page_mask();
+ if (!size || (start_pa & ~qemu_real_host_page_mask())) {
return;
}
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index d1f07c4f41d4..8644b85de847 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -418,7 +418,7 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp)
* will be a normal mapping, not a special hugepage one used
* for RAM.
*/
- if (qemu_real_host_page_size < 0x10000) {
+ if (qemu_real_host_page_size() < 0x10000) {
error_setg(errp,
"KVM can't supply 64kiB CI pages, which guest expects");
}
diff --git a/tcg/region.c b/tcg/region.c
index 97ca5291d52f..71ea81d6713f 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -488,14 +488,14 @@ static int alloc_code_gen_buffer(size_t tb_size, int splitwx, Error **errp)
/* page-align the beginning and end of the buffer */
buf = static_code_gen_buffer;
end = static_code_gen_buffer + sizeof(static_code_gen_buffer);
- buf = QEMU_ALIGN_PTR_UP(buf, qemu_real_host_page_size);
- end = QEMU_ALIGN_PTR_DOWN(end, qemu_real_host_page_size);
+ buf = QEMU_ALIGN_PTR_UP(buf, qemu_real_host_page_size());
+ end = QEMU_ALIGN_PTR_DOWN(end, qemu_real_host_page_size());
size = end - buf;
/* Honor a command-line option limiting the size of the buffer. */
if (size > tb_size) {
- size = QEMU_ALIGN_DOWN(tb_size, qemu_real_host_page_size);
+ size = QEMU_ALIGN_DOWN(tb_size, qemu_real_host_page_size());
}
region.start_aligned = buf;
@@ -729,7 +729,7 @@ static int alloc_code_gen_buffer(size_t size, int splitwx, Error **errp)
*/
void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus)
{
- const size_t page_size = qemu_real_host_page_size;
+ const size_t page_size = qemu_real_host_page_size();
size_t region_size;
int have_prot, need_prot;
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
index 35088dd67f78..9b1dab2f2883 100644
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -468,8 +468,8 @@ vubr_queue_set_started(VuDev *dev, int qidx, bool started)
if (started && vubr->notifier.fd >= 0) {
vu_set_queue_host_notifier(dev, vq, vubr->notifier.fd,
- qemu_real_host_page_size,
- qidx * qemu_real_host_page_size);
+ qemu_real_host_page_size(),
+ qidx * qemu_real_host_page_size());
}
if (qidx % 2 == 1) {
@@ -601,7 +601,7 @@ static void *notifier_thread(void *arg)
{
VuDev *dev = (VuDev *)arg;
VubrDev *vubr = container_of(dev, VubrDev, vudev);
- int pagesize = qemu_real_host_page_size;
+ int pagesize = qemu_real_host_page_size();
int qidx;
while (true) {
@@ -637,7 +637,7 @@ vubr_host_notifier_setup(VubrDev *dev)
void *addr;
int fd;
- length = qemu_real_host_page_size * VHOST_USER_BRIDGE_MAX_QUEUES;
+ length = qemu_real_host_page_size() * VHOST_USER_BRIDGE_MAX_QUEUES;
fd = mkstemp(template);
if (fd < 0) {
diff --git a/util/cutils.c b/util/cutils.c
index 0d475ec4cddd..1173ce3b88f3 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -175,7 +175,7 @@ int qemu_fdatasync(int fd)
int qemu_msync(void *addr, size_t length, int fd)
{
#ifdef CONFIG_POSIX
- size_t align_mask = ~(qemu_real_host_page_size - 1);
+ size_t align_mask = ~(qemu_real_host_page_size() - 1);
/**
* There are no strict reqs as per the length of mapping
@@ -183,7 +183,7 @@ int qemu_msync(void *addr, size_t length, int fd)
* alignment changes. Additionally - round the size to the multiple
* of PAGE_SIZE
*/
- length += ((uintptr_t)addr & (qemu_real_host_page_size - 1));
+ length += ((uintptr_t)addr & (qemu_real_host_page_size() - 1));
length = (length + ~align_mask) & align_mask;
addr = (void *)((uintptr_t)addr & align_mask);
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 893d864354a1..5b90cb68ea7d 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -50,7 +50,7 @@ size_t qemu_fd_getpagesize(int fd)
#endif
#endif
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
size_t qemu_mempath_getpagesize(const char *mem_path)
@@ -81,7 +81,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path)
#endif
#endif
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
#define OVERCOMMIT_MEMORY_PATH "/proc/sys/vm/overcommit_memory"
@@ -101,7 +101,7 @@ static bool map_noreserve_effective(int fd, uint32_t qemu_map_flags)
* MAP_NORESERVE.
* b) MAP_NORESERVE is not affected by /proc/sys/vm/overcommit_memory.
*/
- if (qemu_fd_getpagesize(fd) != qemu_real_host_page_size) {
+ if (qemu_fd_getpagesize(fd) != qemu_real_host_page_size()) {
return true;
}
@@ -166,7 +166,7 @@ static void *mmap_reserve(size_t size, int fd)
* We do this unless we are using the system page size, in which case
* anonymous memory is OK.
*/
- if (fd == -1 || qemu_fd_getpagesize(fd) == qemu_real_host_page_size) {
+ if (fd == -1 || qemu_fd_getpagesize(fd) == qemu_real_host_page_size()) {
fd = -1;
flags |= MAP_ANONYMOUS;
} else {
@@ -243,7 +243,7 @@ static inline size_t mmap_guard_pagesize(int fd)
/* Mappings in the same segment must share the same page size */
return qemu_fd_getpagesize(fd);
#else
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
#endif
}
diff --git a/util/osdep.c b/util/osdep.c
index 84575ec21881..97dc9bc65b45 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -69,8 +69,8 @@ int qemu_madvise(void *addr, size_t len, int advice)
static int qemu_mprotect__osdep(void *addr, size_t size, int prot)
{
- g_assert(!((uintptr_t)addr & ~qemu_real_host_page_mask));
- g_assert(!(size & ~qemu_real_host_page_mask));
+ g_assert(!((uintptr_t)addr & ~qemu_real_host_page_mask()));
+ g_assert(!(size & ~qemu_real_host_page_mask()));
#ifdef _WIN32
DWORD old_protect;
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 2ebfb7505787..577c855612cb 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -767,7 +767,7 @@ void *qemu_alloc_stack(size_t *sz)
#ifdef CONFIG_DEBUG_STACK_USAGE
void *ptr2;
#endif
- size_t pagesz = qemu_real_host_page_size;
+ size_t pagesz = qemu_real_host_page_size();
#ifdef _SC_THREAD_STACK_MIN
/* avoid stacks smaller than _SC_THREAD_STACK_MIN */
long min_stack_sz = sysconf(_SC_THREAD_STACK_MIN);
@@ -829,7 +829,7 @@ void qemu_free_stack(void *stack, size_t sz)
unsigned int usage;
void *ptr;
- for (ptr = stack + qemu_real_host_page_size; ptr < stack + sz;
+ for (ptr = stack + qemu_real_host_page_size(); ptr < stack + sz;
ptr += sizeof(uint32_t)) {
if (*(uint32_t *)ptr != 0xdeadbeaf) {
break;
@@ -927,10 +927,10 @@ size_t qemu_get_host_physmem(void)
#ifdef _SC_PHYS_PAGES
long pages = sysconf(_SC_PHYS_PAGES);
if (pages > 0) {
- if (pages > SIZE_MAX / qemu_real_host_page_size) {
+ if (pages > SIZE_MAX / qemu_real_host_page_size()) {
return SIZE_MAX;
} else {
- return pages * qemu_real_host_page_size;
+ return pages * qemu_real_host_page_size();
}
}
#endif
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 4b1ce0be4b0e..91d2f45cfe1f 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -339,7 +339,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus,
Error **errp)
{
int i;
- size_t pagesize = qemu_real_host_page_size;
+ size_t pagesize = qemu_real_host_page_size();
memory = (memory + pagesize - 1) & -pagesize;
for (i = 0; i < memory / pagesize; i++) {
diff --git a/util/pagesize.c b/util/pagesize.c
deleted file mode 100644
index 998632cf6ee6..000000000000
--- a/util/pagesize.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * pagesize.c - query the host about its page size
- *
- * Copyright (C) 2017, Emilio G. Cota <cota@braap.org>
- * License: GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#include "qemu/osdep.h"
-
-uintptr_t qemu_real_host_page_size;
-intptr_t qemu_real_host_page_mask;
-
-static void __attribute__((constructor)) init_real_host_page_size(void)
-{
- qemu_real_host_page_size = getpagesize();
- qemu_real_host_page_mask = -(intptr_t)qemu_real_host_page_size;
-}
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index b037d5faa51e..5ba01177bf9d 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -163,7 +163,7 @@ void *qemu_vfio_pci_map_bar(QEMUVFIOState *s, int index,
Error **errp)
{
void *p;
- assert(QEMU_IS_ALIGNED(offset, qemu_real_host_page_size));
+ assert(QEMU_IS_ALIGNED(offset, qemu_real_host_page_size()));
assert_bar_index_valid(s, index);
p = mmap(NULL, MIN(size, s->bar_region_info[index].size - offset),
prot, MAP_SHARED,
@@ -591,9 +591,9 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,
IOVAMapping m = {.host = host, .size = size, .iova = iova};
IOVAMapping *insert;
- assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size));
- assert(QEMU_IS_ALIGNED(s->low_water_mark, qemu_real_host_page_size));
- assert(QEMU_IS_ALIGNED(s->high_water_mark, qemu_real_host_page_size));
+ assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size()));
+ assert(QEMU_IS_ALIGNED(s->low_water_mark, qemu_real_host_page_size()));
+ assert(QEMU_IS_ALIGNED(s->high_water_mark, qemu_real_host_page_size()));
trace_qemu_vfio_new_mapping(s, host, size, index, iova);
assert(index >= 0);
@@ -644,7 +644,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping,
index = mapping - s->mappings;
assert(mapping->size > 0);
- assert(QEMU_IS_ALIGNED(mapping->size, qemu_real_host_page_size));
+ assert(QEMU_IS_ALIGNED(mapping->size, qemu_real_host_page_size()));
assert(index >= 0 && index < s->nr_mappings);
if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
error_setg_errno(errp, errno, "VFIO_UNMAP_DMA failed");
@@ -752,8 +752,8 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,
IOVAMapping *mapping;
uint64_t iova0;
- assert(QEMU_PTR_IS_ALIGNED(host, qemu_real_host_page_size));
- assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size));
+ assert(QEMU_PTR_IS_ALIGNED(host, qemu_real_host_page_size()));
+ assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size()));
trace_qemu_vfio_dma_map(s, host, size, temporary, iova);
QEMU_LOCK_GUARD(&s->lock);
mapping = qemu_vfio_find_mapping(s, host, &index);
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ddc6003de280..910a6c74dff9 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2974,10 +2974,10 @@ sub process {
ERROR("use memset() instead of bzero()\n" . $herecurr);
}
if ($line =~ /\bgetpagesize\(\)/) {
- ERROR("use qemu_real_host_page_size instead of getpagesize()\n" . $herecurr);
+ ERROR("use qemu_real_host_page_size() instead of getpagesize()\n" . $herecurr);
}
if ($line =~ /\bsysconf\(_SC_PAGESIZE\)/) {
- ERROR("use qemu_real_host_page_size instead of sysconf(_SC_PAGESIZE)\n" . $herecurr);
+ ERROR("use qemu_real_host_page_size() instead of sysconf(_SC_PAGESIZE)\n" . $herecurr);
}
my $non_exit_glib_asserts = qr{g_assert_cmpstr|
g_assert_cmpint|
diff --git a/util/meson.build b/util/meson.build
index f8f0643318c3..2d71ab57a42e 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -42,7 +42,6 @@ if have_membarrier
util_ss.add(files('sys_membarrier.c'))
endif
util_ss.add(files('log.c'))
-util_ss.add(files('pagesize.c'))
util_ss.add(files('qdist.c'))
util_ss.add(files('qht.c'))
util_ss.add(files('qsp.c'))
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 11/32] Replace qemu_real_host_page variables with inlined functions
@ 2022-03-23 15:57 ` marcandre.lureau
0 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Daniel Henrique Barboza, open list:Overall KVM CPUs,
David Hildenbrand, Mark Cave-Ayland, Yuval Shaia, Peter Xu,
Laurent Vivier, Yanan Wang, Juan Quintela,
open list:X86 HAXM CPUs, Gerd Hoffmann, Denis V. Lunev,
Warner Losh, Alex Williamson, open list:Block layer core,
Stefan Berger, Michael S. Tsirkin, Markus Armbruster,
Halil Pasic, Kamil Rytarowski, Reinoud Zandijk, Stefan Weil,
Marc-André Lureau, Christian Borntraeger, Eduardo Habkost,
Thomas Huth, Vladimir Sementsov-Ogievskiy, Kyle Evans,
Richard Henderson, Greg Kurz, Cameron Esfahani,
Dr. David Alan Gilbert, Roman Bolshakov, Cédric Le Goater,
Stefan Hajnoczi, Igor Mammedov, Sunil Muthuswamy, David Gibson,
Kevin Wolf, open list:S390 general arch...,
Cornelia Huck, Philippe Mathieu-Daudé,
Hanna Reitz, open list:New World mac99, Wenchao Wang,
Paolo Bonzini, Colin Xu
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Replace the global variables with inlined helper functions. getpagesize() is very
likely annotated with a "const" function attribute (at least with glibc), and thus
optimization should apply even better.
This avoids the need for a constructor initialization too.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/exec/cpu-common.h | 2 +-
include/exec/ram_addr.h | 2 +-
include/qemu/osdep.h | 15 +++++++++++----
accel/hvf/hvf-accel-ops.c | 2 +-
accel/kvm/kvm-all.c | 20 ++++++++++----------
backends/hostmem.c | 2 +-
block.c | 4 ++--
block/file-posix.c | 6 +++---
block/io.c | 2 +-
block/nvme.c | 22 +++++++++++-----------
block/parallels.c | 2 +-
block/qcow2-cache.c | 2 +-
bsd-user/elfload.c | 2 +-
bsd-user/mmap.c | 2 +-
contrib/vhost-user-gpu/vugbm.c | 2 +-
cpu.c | 2 +-
hw/display/qxl.c | 2 +-
hw/intc/s390_flic_kvm.c | 2 +-
hw/nvram/fw_cfg.c | 6 +++---
hw/ppc/mac_newworld.c | 2 +-
hw/ppc/spapr_pci.c | 2 +-
hw/rdma/vmw/pvrdma_main.c | 2 +-
hw/scsi/scsi-generic.c | 2 +-
hw/tpm/tpm_ppi.c | 2 +-
hw/vfio/common.c | 24 ++++++++++++------------
hw/vfio/pci.c | 10 +++++-----
hw/vfio/spapr.c | 8 ++++----
hw/virtio/vhost-iova-tree.c | 4 ++--
hw/virtio/vhost-shadow-virtqueue.c | 8 ++++----
hw/virtio/vhost-user.c | 4 ++--
hw/virtio/vhost-vdpa.c | 6 +++---
hw/virtio/virtio-mem.c | 10 +++++-----
linux-user/elfload.c | 4 ++--
linux-user/mmap.c | 2 +-
migration/migration.c | 2 +-
migration/postcopy-ram.c | 4 ++--
monitor/misc.c | 2 +-
softmmu/physmem.c | 6 +++---
target/i386/hax/hax-mem.c | 10 +++++-----
target/i386/nvmm/nvmm-all.c | 8 ++++----
target/i386/whpx/whpx-all.c | 8 ++++----
target/ppc/kvm.c | 2 +-
tcg/region.c | 8 ++++----
tests/vhost-user-bridge.c | 8 ++++----
util/cutils.c | 4 ++--
util/mmap-alloc.c | 10 +++++-----
util/osdep.c | 4 ++--
util/oslib-posix.c | 8 ++++----
util/oslib-win32.c | 2 +-
util/pagesize.c | 18 ------------------
util/vfio-helpers.c | 14 +++++++-------
scripts/checkpatch.pl | 4 ++--
util/meson.build | 1 -
53 files changed, 150 insertions(+), 162 deletions(-)
delete mode 100644 util/pagesize.c
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index c7d50fac955c..5979fc1f8e1b 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -26,7 +26,7 @@ extern uintptr_t qemu_host_page_size;
extern intptr_t qemu_host_page_mask;
#define HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_host_page_size)
-#define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_size)
+#define REAL_HOST_PAGE_ALIGN(addr) ROUND_UP((addr), qemu_real_host_page_size())
/* The CPU list lock nests outside page_(un)lock or mmap_(un)lock */
void qemu_init_cpu_list(void);
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index 64fb936c7c74..f3e0c78161d1 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -343,7 +343,7 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
hwaddr addr;
ram_addr_t ram_addr;
unsigned long len = (pages + HOST_LONG_BITS - 1) / HOST_LONG_BITS;
- unsigned long hpratio = qemu_real_host_page_size / TARGET_PAGE_SIZE;
+ unsigned long hpratio = qemu_real_host_page_size() / TARGET_PAGE_SIZE;
unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);
/* start address is aligned at the start of a word? */
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 95a14914d13b..240b48707ecc 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -431,9 +431,9 @@ extern int madvise(char *, size_t, int);
/* Use 1 MiB (segment size) alignment so gmap can be used by KVM. */
# define QEMU_VMALLOC_ALIGN (256 * 4096)
#elif defined(__linux__) && defined(__sparc__)
-# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size, SHMLBA)
+# define QEMU_VMALLOC_ALIGN MAX(qemu_real_host_page_size(), SHMLBA)
#else
-# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size
+# define QEMU_VMALLOC_ALIGN qemu_real_host_page_size()
#endif
#ifdef CONFIG_POSIX
@@ -590,8 +590,15 @@ pid_t qemu_fork(Error **errp);
/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
* when intptr_t is 32-bit and we are aligning a long long.
*/
-extern uintptr_t qemu_real_host_page_size;
-extern intptr_t qemu_real_host_page_mask;
+static inline uintptr_t qemu_real_host_page_size(void)
+{
+ return getpagesize();
+}
+
+static inline intptr_t qemu_real_host_page_mask(void)
+{
+ return -(intptr_t)qemu_real_host_page_size();
+}
/*
* After using getopt or getopt_long, if you need to parse another set
diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c
index 54457c76c2f3..a70e2eb375dc 100644
--- a/accel/hvf/hvf-accel-ops.c
+++ b/accel/hvf/hvf-accel-ops.c
@@ -122,7 +122,7 @@ static void hvf_set_phys_mem(MemoryRegionSection *section, bool add)
MemoryRegion *area = section->mr;
bool writeable = !area->readonly && !area->rom_device;
hv_memory_flags_t flags;
- uint64_t page_size = qemu_real_host_page_size;
+ uint64_t page_size = qemu_real_host_page_size();
if (!memory_region_is_ram(area)) {
if (writeable) {
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 8d9d2367ee02..32e177bd26b4 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -59,7 +59,7 @@
#ifdef PAGE_SIZE
#undef PAGE_SIZE
#endif
-#define PAGE_SIZE qemu_real_host_page_size
+#define PAGE_SIZE qemu_real_host_page_size()
#ifndef KVM_GUESTDBG_BLOCKIRQ
#define KVM_GUESTDBG_BLOCKIRQ 0
@@ -324,14 +324,14 @@ static hwaddr kvm_align_section(MemoryRegionSection *section,
with sub-page size and unaligned start address. Pad the start
address to next and truncate size to previous page boundary. */
aligned = ROUND_UP(section->offset_within_address_space,
- qemu_real_host_page_size);
+ qemu_real_host_page_size());
delta = aligned - section->offset_within_address_space;
*start = aligned;
if (delta > size) {
return 0;
}
- return (size - delta) & qemu_real_host_page_mask;
+ return (size - delta) & qemu_real_host_page_mask();
}
int kvm_physical_memory_addr_from_host(KVMState *s, void *ram,
@@ -626,7 +626,7 @@ static void kvm_log_stop(MemoryListener *listener,
static void kvm_slot_sync_dirty_pages(KVMSlot *slot)
{
ram_addr_t start = slot->ram_start_offset;
- ram_addr_t pages = slot->memory_size / qemu_real_host_page_size;
+ ram_addr_t pages = slot->memory_size / qemu_real_host_page_size();
cpu_physical_memory_set_dirty_lebitmap(slot->dirty_bmap, start, pages);
}
@@ -662,7 +662,7 @@ static void kvm_slot_init_dirty_bitmap(KVMSlot *mem)
* And mem->memory_size is aligned to it (otherwise this mem can't
* be registered to KVM).
*/
- hwaddr bitmap_size = ALIGN(mem->memory_size / qemu_real_host_page_size,
+ hwaddr bitmap_size = ALIGN(mem->memory_size / qemu_real_host_page_size(),
/*HOST_LONG_BITS*/ 64) / 8;
mem->dirty_bmap = g_malloc0(bitmap_size);
mem->dirty_bmap_size = bitmap_size;
@@ -707,7 +707,7 @@ static void kvm_dirty_ring_mark_page(KVMState *s, uint32_t as_id,
mem = &kml->slots[slot_id];
if (!mem->memory_size || offset >=
- (mem->memory_size / qemu_real_host_page_size)) {
+ (mem->memory_size / qemu_real_host_page_size())) {
return;
}
@@ -895,7 +895,7 @@ static void kvm_physical_sync_dirty_bitmap(KVMMemoryListener *kml,
/* Alignment requirement for KVM_CLEAR_DIRTY_LOG - 64 pages */
#define KVM_CLEAR_LOG_SHIFT 6
-#define KVM_CLEAR_LOG_ALIGN (qemu_real_host_page_size << KVM_CLEAR_LOG_SHIFT)
+#define KVM_CLEAR_LOG_ALIGN (qemu_real_host_page_size() << KVM_CLEAR_LOG_SHIFT)
#define KVM_CLEAR_LOG_MASK (-KVM_CLEAR_LOG_ALIGN)
static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
@@ -904,7 +904,7 @@ static int kvm_log_clear_one_slot(KVMSlot *mem, int as_id, uint64_t start,
KVMState *s = kvm_state;
uint64_t end, bmap_start, start_delta, bmap_npages;
struct kvm_clear_dirty_log d;
- unsigned long *bmap_clear = NULL, psize = qemu_real_host_page_size;
+ unsigned long *bmap_clear = NULL, psize = qemu_real_host_page_size();
int ret;
/*
@@ -1335,7 +1335,7 @@ kvm_check_extension_list(KVMState *s, const KVMCapabilityInfo *list)
void kvm_set_max_memslot_size(hwaddr max_slot_size)
{
g_assert(
- ROUND_UP(max_slot_size, qemu_real_host_page_size) == max_slot_size
+ ROUND_UP(max_slot_size, qemu_real_host_page_size()) == max_slot_size
);
kvm_max_slot_size = max_slot_size;
}
@@ -2341,7 +2341,7 @@ static int kvm_init(MachineState *ms)
* even with KVM. TARGET_PAGE_SIZE is assumed to be the minimum
* page size for the system though.
*/
- assert(TARGET_PAGE_SIZE <= qemu_real_host_page_size);
+ assert(TARGET_PAGE_SIZE <= qemu_real_host_page_size());
s->sigmask_len = 8;
diff --git a/backends/hostmem.c b/backends/hostmem.c
index b2a5e905e866..a7bae3d713c9 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -319,7 +319,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
#else
size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
{
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
#endif
diff --git a/block.c b/block.c
index 718e4cae8b3a..8cd16e757e32 100644
--- a/block.c
+++ b/block.c
@@ -135,7 +135,7 @@ size_t bdrv_opt_mem_align(BlockDriverState *bs)
{
if (!bs || !bs->drv) {
/* page size or 4k (hdd sector size) should be on the safe side */
- return MAX(4096, qemu_real_host_page_size);
+ return MAX(4096, qemu_real_host_page_size());
}
IO_CODE();
@@ -146,7 +146,7 @@ size_t bdrv_min_mem_align(BlockDriverState *bs)
{
if (!bs || !bs->drv) {
/* page size or 4k (hdd sector size) should be on the safe side */
- return MAX(4096, qemu_real_host_page_size);
+ return MAX(4096, qemu_real_host_page_size());
}
IO_CODE();
diff --git a/block/file-posix.c b/block/file-posix.c
index 39a3d6dbe6e2..61b02d85ebf1 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -386,7 +386,7 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp)
{
BDRVRawState *s = bs->opaque;
char *buf;
- size_t max_align = MAX(MAX_BLOCKSIZE, qemu_real_host_page_size);
+ size_t max_align = MAX(MAX_BLOCKSIZE, qemu_real_host_page_size());
size_t alignments[] = {1, 512, 1024, 2048, 4096};
/* For SCSI generic devices the alignment is not really used.
@@ -1261,7 +1261,7 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
raw_probe_alignment(bs, s->fd, errp);
bs->bl.min_mem_alignment = s->buf_align;
- bs->bl.opt_mem_alignment = MAX(s->buf_align, qemu_real_host_page_size);
+ bs->bl.opt_mem_alignment = MAX(s->buf_align, qemu_real_host_page_size());
/*
* Maximum transfers are best effort, so it is okay to ignore any
@@ -1886,7 +1886,7 @@ static int allocate_first_block(int fd, size_t max_size)
size_t write_size = (max_size < MAX_BLOCKSIZE)
? BDRV_SECTOR_SIZE
: MAX_BLOCKSIZE;
- size_t max_align = MAX(MAX_BLOCKSIZE, qemu_real_host_page_size);
+ size_t max_align = MAX(MAX_BLOCKSIZE, qemu_real_host_page_size());
void *buf;
ssize_t n;
int ret;
diff --git a/block/io.c b/block/io.c
index 3280144a17d4..9769ec53b0ee 100644
--- a/block/io.c
+++ b/block/io.c
@@ -201,7 +201,7 @@ void bdrv_refresh_limits(BlockDriverState *bs, Transaction *tran, Error **errp)
if (!have_limits) {
bs->bl.min_mem_alignment = 512;
- bs->bl.opt_mem_alignment = qemu_real_host_page_size;
+ bs->bl.opt_mem_alignment = qemu_real_host_page_size();
/* Safe default since most protocols use readv()/writev()/etc */
bs->bl.max_iov = IOV_MAX;
diff --git a/block/nvme.c b/block/nvme.c
index 552029931d59..01fb28aa638b 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -169,9 +169,9 @@ static bool nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q,
size_t bytes;
int r;
- bytes = ROUND_UP(nentries * entry_bytes, qemu_real_host_page_size);
+ bytes = ROUND_UP(nentries * entry_bytes, qemu_real_host_page_size());
q->head = q->tail = 0;
- q->queue = qemu_try_memalign(qemu_real_host_page_size, bytes);
+ q->queue = qemu_try_memalign(qemu_real_host_page_size(), bytes);
if (!q->queue) {
error_setg(errp, "Cannot allocate queue");
return false;
@@ -232,8 +232,8 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState *s,
trace_nvme_create_queue_pair(idx, q, size, aio_context,
event_notifier_get_fd(s->irq_notifier));
bytes = QEMU_ALIGN_UP(s->page_size * NVME_NUM_REQS,
- qemu_real_host_page_size);
- q->prp_list_pages = qemu_try_memalign(qemu_real_host_page_size, bytes);
+ qemu_real_host_page_size());
+ q->prp_list_pages = qemu_try_memalign(qemu_real_host_page_size(), bytes);
if (!q->prp_list_pages) {
error_setg(errp, "Cannot allocate PRP page list");
goto fail;
@@ -533,9 +533,9 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp)
.opcode = NVME_ADM_CMD_IDENTIFY,
.cdw10 = cpu_to_le32(0x1),
};
- size_t id_size = QEMU_ALIGN_UP(sizeof(*id), qemu_real_host_page_size);
+ size_t id_size = QEMU_ALIGN_UP(sizeof(*id), qemu_real_host_page_size());
- id = qemu_try_memalign(qemu_real_host_page_size, id_size);
+ id = qemu_try_memalign(qemu_real_host_page_size(), id_size);
if (!id) {
error_setg(errp, "Cannot allocate buffer for identify response");
goto out;
@@ -1048,7 +1048,7 @@ static coroutine_fn int nvme_cmd_map_qiov(BlockDriverState *bs, NvmeCmd *cmd,
bool retry = true;
uint64_t iova;
size_t len = QEMU_ALIGN_UP(qiov->iov[i].iov_len,
- qemu_real_host_page_size);
+ qemu_real_host_page_size());
try_map:
r = qemu_vfio_dma_map(s->vfio,
qiov->iov[i].iov_base,
@@ -1224,8 +1224,8 @@ static inline bool nvme_qiov_aligned(BlockDriverState *bs,
for (i = 0; i < qiov->niov; ++i) {
if (!QEMU_PTR_IS_ALIGNED(qiov->iov[i].iov_base,
- qemu_real_host_page_size) ||
- !QEMU_IS_ALIGNED(qiov->iov[i].iov_len, qemu_real_host_page_size)) {
+ qemu_real_host_page_size()) ||
+ !QEMU_IS_ALIGNED(qiov->iov[i].iov_len, qemu_real_host_page_size())) {
trace_nvme_qiov_unaligned(qiov, i, qiov->iov[i].iov_base,
qiov->iov[i].iov_len, s->page_size);
return false;
@@ -1241,7 +1241,7 @@ static int nvme_co_prw(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
int r;
QEMU_AUTO_VFREE uint8_t *buf = NULL;
QEMUIOVector local_qiov;
- size_t len = QEMU_ALIGN_UP(bytes, qemu_real_host_page_size);
+ size_t len = QEMU_ALIGN_UP(bytes, qemu_real_host_page_size());
assert(QEMU_IS_ALIGNED(offset, s->page_size));
assert(QEMU_IS_ALIGNED(bytes, s->page_size));
assert(bytes <= s->max_transfer);
@@ -1251,7 +1251,7 @@ static int nvme_co_prw(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
}
s->stats.unaligned_accesses++;
trace_nvme_prw_buffered(s, offset, bytes, qiov->niov, is_write);
- buf = qemu_try_memalign(qemu_real_host_page_size, len);
+ buf = qemu_try_memalign(qemu_real_host_page_size(), len);
if (!buf) {
return -ENOMEM;
diff --git a/block/parallels.c b/block/parallels.c
index cd23e02d06c1..8879b7027a19 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -870,7 +870,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
}
}
- s->bat_dirty_block = 4 * qemu_real_host_page_size;
+ s->bat_dirty_block = 4 * qemu_real_host_page_size();
s->bat_dirty_bmap =
bitmap_new(DIV_ROUND_UP(s->header_size, s->bat_dirty_block));
diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
index 8a0105911f7e..539f9ca2d501 100644
--- a/block/qcow2-cache.c
+++ b/block/qcow2-cache.c
@@ -75,7 +75,7 @@ static void qcow2_cache_table_release(Qcow2Cache *c, int i, int num_tables)
/* Using MADV_DONTNEED to discard memory is a Linux-specific feature */
#ifdef CONFIG_LINUX
void *t = qcow2_cache_get_table_addr(c, i);
- int align = qemu_real_host_page_size;
+ int align = qemu_real_host_page_size();
size_t mem_size = (size_t) c->table_size * num_tables;
size_t offset = QEMU_ALIGN_UP((uintptr_t) t, align) - (uintptr_t) t;
size_t length = QEMU_ALIGN_DOWN(mem_size - offset, align);
diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c
index 142a5bfac260..f8edb22f2ab1 100644
--- a/bsd-user/elfload.c
+++ b/bsd-user/elfload.c
@@ -246,7 +246,7 @@ static void padzero(abi_ulong elf_bss, abi_ulong last_bss)
* patch target_mmap(), but it is more complicated as the file
* size must be known.
*/
- if (qemu_real_host_page_size < qemu_host_page_size) {
+ if (qemu_real_host_page_size() < qemu_host_page_size) {
abi_ulong end_addr, end_addr1;
end_addr1 = REAL_HOST_PAGE_ALIGN(elf_bss);
end_addr = HOST_PAGE_ALIGN(elf_bss);
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 13cb32dba13e..07aa0a634dff 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -515,7 +515,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
* up to the targets page boundary.
*/
- if ((qemu_real_host_page_size < qemu_host_page_size) && fd != -1) {
+ if ((qemu_real_host_page_size() < qemu_host_page_size) && fd != -1) {
struct stat sb;
if (fstat(fd, &sb) == -1) {
diff --git a/contrib/vhost-user-gpu/vugbm.c b/contrib/vhost-user-gpu/vugbm.c
index fb15d0372c25..503d0a4566f8 100644
--- a/contrib/vhost-user-gpu/vugbm.c
+++ b/contrib/vhost-user-gpu/vugbm.c
@@ -53,7 +53,7 @@ struct udmabuf_create {
static size_t
udmabuf_get_size(struct vugbm_buffer *buf)
{
- return ROUND_UP(buf->width * buf->height * 4, qemu_real_host_page_size);
+ return ROUND_UP(buf->width * buf->height * 4, qemu_real_host_page_size());
}
static bool
diff --git a/cpu.c b/cpu.c
index d34c3439bbf3..ab2c7c81e460 100644
--- a/cpu.c
+++ b/cpu.c
@@ -481,7 +481,7 @@ void page_size_init(void)
/* NOTE: we can always suppose that qemu_host_page_size >=
TARGET_PAGE_SIZE */
if (qemu_host_page_size == 0) {
- qemu_host_page_size = qemu_real_host_page_size;
+ qemu_host_page_size = qemu_real_host_page_size();
}
if (qemu_host_page_size < TARGET_PAGE_SIZE) {
qemu_host_page_size = TARGET_PAGE_SIZE;
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index adbdbcaeb612..2db34714fbd9 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -320,7 +320,7 @@ static ram_addr_t qxl_rom_size(void)
#define QXL_ROM_SZ 8192
QEMU_BUILD_BUG_ON(QXL_REQUIRED_SZ > QXL_ROM_SZ);
- return QEMU_ALIGN_UP(QXL_REQUIRED_SZ, qemu_real_host_page_size);
+ return QEMU_ALIGN_UP(QXL_REQUIRED_SZ, qemu_real_host_page_size());
}
static void init_qxl_rom(PCIQXLDevice *d)
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index efe5054182c3..4e86d2d43670 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -24,7 +24,7 @@
#include "trace.h"
#include "qom/object.h"
-#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size
+#define FLIC_SAVE_INITIAL_SIZE qemu_real_host_page_size()
#define FLIC_FAILED (-1UL)
#define FLIC_SAVEVM_VERSION 1
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index e5f3c981841d..ea2d56f9f2af 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -622,9 +622,9 @@ static bool fw_cfg_acpi_mr_restore(void *opaque)
FWCfgState *s = opaque;
bool mr_aligned;
- mr_aligned = QEMU_IS_ALIGNED(s->table_mr_size, qemu_real_host_page_size) &&
- QEMU_IS_ALIGNED(s->linker_mr_size, qemu_real_host_page_size) &&
- QEMU_IS_ALIGNED(s->rsdp_mr_size, qemu_real_host_page_size);
+ mr_aligned = QEMU_IS_ALIGNED(s->table_mr_size, qemu_real_host_page_size()) &&
+ QEMU_IS_ALIGNED(s->linker_mr_size, qemu_real_host_page_size()) &&
+ QEMU_IS_ALIGNED(s->rsdp_mr_size, qemu_real_host_page_size());
return s->acpi_mr_restore && !mr_aligned;
}
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 4bddb529c2a6..7b5a205309af 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -456,7 +456,7 @@ static void ppc_core99_init(MachineState *machine)
}
/* The NewWorld NVRAM is not located in the MacIO device */
- if (kvm_enabled() && qemu_real_host_page_size > 4096) {
+ if (kvm_enabled() && qemu_real_host_page_size() > 4096) {
/* We can't combine read-write and read-only in a single page, so
move the NVRAM out of ROM again for KVM */
nvram_addr = 0xFFE00000;
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 5bfd4aa9e5aa..b2f5fbef0c83 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -1978,7 +1978,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
* our memory slot is of page size granularity.
*/
if (kvm_enabled()) {
- msi_window_size = qemu_real_host_page_size;
+ msi_window_size = qemu_real_host_page_size();
}
memory_region_init_io(&sphb->msiwindow, OBJECT(sphb), &spapr_msi_ops, spapr,
diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
index 91206dbb8eb0..27a76224320e 100644
--- a/hw/rdma/vmw/pvrdma_main.c
+++ b/hw/rdma/vmw/pvrdma_main.c
@@ -608,7 +608,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp)
rdma_info_report("Initializing device %s %x.%x", pdev->name,
PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
- if (TARGET_PAGE_SIZE != qemu_real_host_page_size) {
+ if (TARGET_PAGE_SIZE != qemu_real_host_page_size()) {
error_setg(errp, "Target page size must be the same as host page size");
return;
}
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index 0306ccc7b1e4..0ab00ef85c95 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -183,7 +183,7 @@ static int scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s, int len)
uint32_t max_iov = blk_get_max_hw_iov(s->conf.blk);
assert(max_transfer);
- max_transfer = MIN_NON_ZERO(max_transfer, max_iov * qemu_real_host_page_size)
+ max_transfer = MIN_NON_ZERO(max_transfer, max_iov * qemu_real_host_page_size())
/ s->blocksize;
stl_be_p(&r->buf[8], max_transfer);
/* Also take care of the opt xfer len. */
diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c
index c89ac53e65e6..7f74e26ec6c9 100644
--- a/hw/tpm/tpm_ppi.c
+++ b/hw/tpm/tpm_ppi.c
@@ -47,7 +47,7 @@ void tpm_ppi_reset(TPMPPI *tpmppi)
void tpm_ppi_init(TPMPPI *tpmppi, MemoryRegion *m,
hwaddr addr, Object *obj)
{
- tpmppi->buf = qemu_memalign(qemu_real_host_page_size,
+ tpmppi->buf = qemu_memalign(qemu_real_host_page_size(),
HOST_PAGE_ALIGN(TPM_PPI_ADDR_SIZE));
memory_region_init_ram_device_ptr(&tpmppi->ram, obj, "tpm-ppi",
TPM_PPI_ADDR_SIZE, tpmppi->buf);
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 080046e3f511..2b1f78fdfaeb 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -397,7 +397,7 @@ static int vfio_dma_unmap_bitmap(VFIOContainer *container,
{
struct vfio_iommu_type1_dma_unmap *unmap;
struct vfio_bitmap *bitmap;
- uint64_t pages = REAL_HOST_PAGE_ALIGN(size) / qemu_real_host_page_size;
+ uint64_t pages = REAL_HOST_PAGE_ALIGN(size) / qemu_real_host_page_size();
int ret;
unmap = g_malloc0(sizeof(*unmap) + sizeof(*bitmap));
@@ -414,7 +414,7 @@ static int vfio_dma_unmap_bitmap(VFIOContainer *container,
* to qemu_real_host_page_size.
*/
- bitmap->pgsize = qemu_real_host_page_size;
+ bitmap->pgsize = qemu_real_host_page_size();
bitmap->size = ROUND_UP(pages, sizeof(__u64) * BITS_PER_BYTE) /
BITS_PER_BYTE;
@@ -882,8 +882,8 @@ static void vfio_listener_region_add(MemoryListener *listener,
}
if (unlikely((section->offset_within_address_space &
- ~qemu_real_host_page_mask) !=
- (section->offset_within_region & ~qemu_real_host_page_mask))) {
+ ~qemu_real_host_page_mask()) !=
+ (section->offset_within_region & ~qemu_real_host_page_mask()))) {
error_report("%s received unaligned region", __func__);
return;
}
@@ -891,7 +891,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
iova = REAL_HOST_PAGE_ALIGN(section->offset_within_address_space);
llend = int128_make64(section->offset_within_address_space);
llend = int128_add(llend, section->size);
- llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask));
+ llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask()));
if (int128_ge(int128_make64(iova), llend)) {
if (memory_region_is_ram_device(section->mr)) {
@@ -899,7 +899,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
memory_region_name(section->mr),
section->offset_within_address_space,
int128_getlo(section->size),
- qemu_real_host_page_size);
+ qemu_real_host_page_size());
}
return;
}
@@ -1118,8 +1118,8 @@ static void vfio_listener_region_del(MemoryListener *listener,
}
if (unlikely((section->offset_within_address_space &
- ~qemu_real_host_page_mask) !=
- (section->offset_within_region & ~qemu_real_host_page_mask))) {
+ ~qemu_real_host_page_mask()) !=
+ (section->offset_within_region & ~qemu_real_host_page_mask()))) {
error_report("%s received unaligned region", __func__);
return;
}
@@ -1150,7 +1150,7 @@ static void vfio_listener_region_del(MemoryListener *listener,
iova = REAL_HOST_PAGE_ALIGN(section->offset_within_address_space);
llend = int128_make64(section->offset_within_address_space);
llend = int128_add(llend, section->size);
- llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask));
+ llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask()));
if (int128_ge(int128_make64(iova), llend)) {
return;
@@ -1272,9 +1272,9 @@ static int vfio_get_dirty_bitmap(VFIOContainer *container, uint64_t iova,
* qemu_real_host_page_size to mark those dirty. Hence set bitmap's pgsize
* to qemu_real_host_page_size.
*/
- range->bitmap.pgsize = qemu_real_host_page_size;
+ range->bitmap.pgsize = qemu_real_host_page_size();
- pages = REAL_HOST_PAGE_ALIGN(range->size) / qemu_real_host_page_size;
+ pages = REAL_HOST_PAGE_ALIGN(range->size) / qemu_real_host_page_size();
range->bitmap.size = ROUND_UP(pages, sizeof(__u64) * BITS_PER_BYTE) /
BITS_PER_BYTE;
range->bitmap.data = g_try_malloc0(range->bitmap.size);
@@ -1970,7 +1970,7 @@ static void vfio_get_iommu_info_migration(VFIOContainer *container,
* cpu_physical_memory_set_dirty_lebitmap() supports pages in bitmap of
* qemu_real_host_page_size to mark those dirty.
*/
- if (cap_mig->pgsize_bitmap & qemu_real_host_page_size) {
+ if (cap_mig->pgsize_bitmap & qemu_real_host_page_size()) {
container->dirty_pages_supported = true;
container->max_dirty_bitmap_size = cap_mig->max_dirty_bitmap_size;
container->dirty_pgsizes = cap_mig->pgsize_bitmap;
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 67a183f17bff..9fd9faee1d14 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -1087,8 +1087,8 @@ static void vfio_sub_page_bar_update_mapping(PCIDevice *pdev, int bar)
/* If BAR is mapped and page aligned, update to fill PAGE_SIZE */
if (bar_addr != PCI_BAR_UNMAPPED &&
- !(bar_addr & ~qemu_real_host_page_mask)) {
- size = qemu_real_host_page_size;
+ !(bar_addr & ~qemu_real_host_page_mask())) {
+ size = qemu_real_host_page_size();
}
memory_region_transaction_begin();
@@ -1204,7 +1204,7 @@ void vfio_pci_write_config(PCIDevice *pdev,
for (bar = 0; bar < PCI_ROM_SLOT; bar++) {
if (old_addr[bar] != pdev->io_regions[bar].addr &&
vdev->bars[bar].region.size > 0 &&
- vdev->bars[bar].region.size < qemu_real_host_page_size) {
+ vdev->bars[bar].region.size < qemu_real_host_page_size()) {
vfio_sub_page_bar_update_mapping(pdev, bar);
}
}
@@ -1292,7 +1292,7 @@ static void vfio_pci_fixup_msix_region(VFIOPCIDevice *vdev)
}
/* MSI-X table start and end aligned to host page size */
- start = vdev->msix->table_offset & qemu_real_host_page_mask;
+ start = vdev->msix->table_offset & qemu_real_host_page_mask();
end = REAL_HOST_PAGE_ALIGN((uint64_t)vdev->msix->table_offset +
(vdev->msix->entries * PCI_MSIX_ENTRY_SIZE));
@@ -2478,7 +2478,7 @@ static int vfio_pci_load_config(VFIODevice *vbasedev, QEMUFile *f)
*/
if (old_addr[bar] != pdev->io_regions[bar].addr &&
vdev->bars[bar].region.size > 0 &&
- vdev->bars[bar].region.size < qemu_real_host_page_size) {
+ vdev->bars[bar].region.size < qemu_real_host_page_size()) {
vfio_sub_page_bar_update_mapping(pdev, bar);
}
}
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index 04c6e67f8fba..9ec1e95f6da7 100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -44,7 +44,7 @@ static void vfio_prereg_listener_region_add(MemoryListener *listener,
const hwaddr gpa = section->offset_within_address_space;
hwaddr end;
int ret;
- hwaddr page_mask = qemu_real_host_page_mask;
+ hwaddr page_mask = qemu_real_host_page_mask();
struct vfio_iommu_spapr_register_memory reg = {
.argsz = sizeof(reg),
.flags = 0,
@@ -102,7 +102,7 @@ static void vfio_prereg_listener_region_del(MemoryListener *listener,
const hwaddr gpa = section->offset_within_address_space;
hwaddr end;
int ret;
- hwaddr page_mask = qemu_real_host_page_mask;
+ hwaddr page_mask = qemu_real_host_page_mask();
struct vfio_iommu_spapr_register_memory reg = {
.argsz = sizeof(reg),
.flags = 0,
@@ -199,12 +199,12 @@ int vfio_spapr_create_window(VFIOContainer *container,
* Below we look at qemu_real_host_page_size as TCEs are allocated from
* system pages.
*/
- bits_per_level = ctz64(qemu_real_host_page_size) + 8;
+ bits_per_level = ctz64(qemu_real_host_page_size()) + 8;
create.levels = bits_total / bits_per_level;
if (bits_total % bits_per_level) {
++create.levels;
}
- max_levels = (64 - create.page_shift) / ctz64(qemu_real_host_page_size);
+ max_levels = (64 - create.page_shift) / ctz64(qemu_real_host_page_size());
for ( ; create.levels <= max_levels; ++create.levels) {
ret = ioctl(container->fd, VFIO_IOMMU_SPAPR_TCE_CREATE, &create);
if (!ret) {
diff --git a/hw/virtio/vhost-iova-tree.c b/hw/virtio/vhost-iova-tree.c
index 55fed1fefb43..67bf6d57ab9c 100644
--- a/hw/virtio/vhost-iova-tree.c
+++ b/hw/virtio/vhost-iova-tree.c
@@ -11,7 +11,7 @@
#include "qemu/iova-tree.h"
#include "vhost-iova-tree.h"
-#define iova_min_addr qemu_real_host_page_size
+#define iova_min_addr qemu_real_host_page_size()
/**
* VhostIOVATree, able to:
@@ -86,7 +86,7 @@ const DMAMap *vhost_iova_tree_find_iova(const VhostIOVATree *tree,
int vhost_iova_tree_map_alloc(VhostIOVATree *tree, DMAMap *map)
{
/* Some vhost devices do not like addr 0. Skip first page */
- hwaddr iova_first = tree->iova_first ?: qemu_real_host_page_size;
+ hwaddr iova_first = tree->iova_first ?: qemu_real_host_page_size();
if (map->translated_addr + map->size < map->translated_addr ||
map->perm == IOMMU_NONE) {
diff --git a/hw/virtio/vhost-shadow-virtqueue.c b/hw/virtio/vhost-shadow-virtqueue.c
index b232803d1b19..1e5cfe2af63e 100644
--- a/hw/virtio/vhost-shadow-virtqueue.c
+++ b/hw/virtio/vhost-shadow-virtqueue.c
@@ -471,14 +471,14 @@ size_t vhost_svq_driver_area_size(const VhostShadowVirtqueue *svq)
size_t avail_size = offsetof(vring_avail_t, ring) +
sizeof(uint16_t) * svq->vring.num;
- return ROUND_UP(desc_size + avail_size, qemu_real_host_page_size);
+ return ROUND_UP(desc_size + avail_size, qemu_real_host_page_size());
}
size_t vhost_svq_device_area_size(const VhostShadowVirtqueue *svq)
{
size_t used_size = offsetof(vring_used_t, ring) +
sizeof(vring_used_elem_t) * svq->vring.num;
- return ROUND_UP(used_size, qemu_real_host_page_size);
+ return ROUND_UP(used_size, qemu_real_host_page_size());
}
/**
@@ -533,11 +533,11 @@ void vhost_svq_start(VhostShadowVirtqueue *svq, VirtIODevice *vdev,
svq->vring.num = virtio_queue_get_num(vdev, virtio_get_queue_index(vq));
driver_size = vhost_svq_driver_area_size(svq);
device_size = vhost_svq_device_area_size(svq);
- svq->vring.desc = qemu_memalign(qemu_real_host_page_size, driver_size);
+ svq->vring.desc = qemu_memalign(qemu_real_host_page_size(), driver_size);
desc_size = sizeof(vring_desc_t) * svq->vring.num;
svq->vring.avail = (void *)((char *)svq->vring.desc + desc_size);
memset(svq->vring.desc, 0, driver_size);
- svq->vring.used = qemu_memalign(qemu_real_host_page_size, device_size);
+ svq->vring.used = qemu_memalign(qemu_real_host_page_size(), device_size);
memset(svq->vring.used, 0, device_size);
svq->ring_id_maps = g_new0(VirtQueueElement *, svq->vring.num);
for (unsigned i = 0; i < svq->vring.num - 1; i++) {
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 6abbc9da3202..9c4f84f35f61 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -1166,7 +1166,7 @@ static int vhost_user_set_vring_num(struct vhost_dev *dev,
static void vhost_user_host_notifier_free(VhostUserHostNotifier *n)
{
assert(n && n->unmap_addr);
- munmap(n->unmap_addr, qemu_real_host_page_size);
+ munmap(n->unmap_addr, qemu_real_host_page_size());
n->unmap_addr = NULL;
}
@@ -1503,7 +1503,7 @@ static int vhost_user_slave_handle_vring_host_notifier(struct vhost_dev *dev,
int fd)
{
int queue_idx = area->u64 & VHOST_USER_VRING_IDX_MASK;
- size_t page_size = qemu_real_host_page_size;
+ size_t page_size = qemu_real_host_page_size();
struct vhost_user *u = dev->opaque;
VhostUserState *user = u->user;
VirtIODevice *vdev = dev->vdev;
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index c5ed7a377939..2075f336e2ad 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -468,7 +468,7 @@ err:
static void vhost_vdpa_host_notifier_uninit(struct vhost_dev *dev,
int queue_index)
{
- size_t page_size = qemu_real_host_page_size;
+ size_t page_size = qemu_real_host_page_size();
struct vhost_vdpa *v = dev->opaque;
VirtIODevice *vdev = dev->vdev;
VhostVDPAHostNotifier *n;
@@ -485,7 +485,7 @@ static void vhost_vdpa_host_notifier_uninit(struct vhost_dev *dev,
static int vhost_vdpa_host_notifier_init(struct vhost_dev *dev, int queue_index)
{
- size_t page_size = qemu_real_host_page_size;
+ size_t page_size = qemu_real_host_page_size();
struct vhost_vdpa *v = dev->opaque;
VirtIODevice *vdev = dev->vdev;
VhostVDPAHostNotifier *n;
@@ -875,7 +875,7 @@ static bool vhost_vdpa_svq_unmap_ring(struct vhost_vdpa *v,
return false;
}
- size = ROUND_UP(result->size, qemu_real_host_page_size);
+ size = ROUND_UP(result->size, qemu_real_host_page_size());
r = vhost_vdpa_dma_unmap(v, result->iova, size);
return r == 0;
}
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index f55dcf61f203..35cbf1f21946 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -53,11 +53,11 @@ static uint32_t virtio_mem_default_thp_size(void)
#if defined(__x86_64__) || defined(__arm__) || defined(__powerpc64__)
default_thp_size = 2 * MiB;
#elif defined(__aarch64__)
- if (qemu_real_host_page_size == 4 * KiB) {
+ if (qemu_real_host_page_size() == 4 * KiB) {
default_thp_size = 2 * MiB;
- } else if (qemu_real_host_page_size == 16 * KiB) {
+ } else if (qemu_real_host_page_size() == 16 * KiB) {
default_thp_size = 32 * MiB;
- } else if (qemu_real_host_page_size == 64 * KiB) {
+ } else if (qemu_real_host_page_size() == 64 * KiB) {
default_thp_size = 512 * MiB;
}
#endif
@@ -120,7 +120,7 @@ static uint64_t virtio_mem_default_block_size(RAMBlock *rb)
const uint64_t page_size = qemu_ram_pagesize(rb);
/* We can have hugetlbfs with a page size smaller than the THP size. */
- if (page_size == qemu_real_host_page_size) {
+ if (page_size == qemu_real_host_page_size()) {
return MAX(page_size, virtio_mem_thp_size());
}
return MAX(page_size, VIRTIO_MEM_MIN_BLOCK_SIZE);
@@ -135,7 +135,7 @@ static bool virtio_mem_has_shared_zeropage(RAMBlock *rb)
* fresh page, consuming actual memory.
*/
return !qemu_ram_is_shared(rb) && rb->fd < 0 &&
- qemu_ram_pagesize(rb) == qemu_real_host_page_size;
+ qemu_ram_pagesize(rb) == qemu_real_host_page_size();
}
#endif /* VIRTIO_MEM_HAS_LEGACY_GUESTS */
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 796acdcdbd2c..0b130b83c99f 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1916,8 +1916,8 @@ static abi_ulong setup_arg_pages(struct linux_binprm *bprm,
size = STACK_LOWER_LIMIT;
}
guard = TARGET_PAGE_SIZE;
- if (guard < qemu_real_host_page_size) {
- guard = qemu_real_host_page_size;
+ if (guard < qemu_real_host_page_size()) {
+ guard = qemu_real_host_page_size();
}
error = target_mmap(0, size + guard, PROT_READ | PROT_WRITE,
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index c125031b9046..a861f1e1d144 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -494,7 +494,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int target_prot,
may need to truncate file maps at EOF and add extra anonymous pages
up to the targets page boundary. */
- if ((qemu_real_host_page_size < qemu_host_page_size) &&
+ if ((qemu_real_host_page_size() < qemu_host_page_size) &&
!(flags & MAP_ANONYMOUS)) {
struct stat sb;
diff --git a/migration/migration.c b/migration/migration.c
index 695f0f29000c..4dcb511bb60d 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2652,7 +2652,7 @@ static struct rp_cmd_args {
static void migrate_handle_rp_req_pages(MigrationState *ms, const char* rbname,
ram_addr_t start, size_t len)
{
- long our_host_ps = qemu_real_host_page_size;
+ long our_host_ps = qemu_real_host_page_size();
trace_migrate_handle_rp_req_pages(rbname, start, len);
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 32c52f4b1d9e..a66dd536d939 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -319,7 +319,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)
return false;
}
- if (qemu_real_host_page_size != ram_pagesize_summary()) {
+ if (qemu_real_host_page_size() != ram_pagesize_summary()) {
bool have_hp = false;
/* We've got a huge page */
#ifdef UFFD_FEATURE_MISSING_HUGETLBFS
@@ -357,7 +357,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)
*/
bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
{
- long pagesize = qemu_real_host_page_size;
+ long pagesize = qemu_real_host_page_size();
int ufd = -1;
bool ret = false; /* Error unless we change it */
void *testarea = NULL;
diff --git a/monitor/misc.c b/monitor/misc.c
index a756dbd6db0c..b0fc0e5843a4 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -720,7 +720,7 @@ static uint64_t vtop(void *ptr, Error **errp)
uint64_t pinfo;
uint64_t ret = -1;
uintptr_t addr = (uintptr_t) ptr;
- uintptr_t pagesize = qemu_real_host_page_size;
+ uintptr_t pagesize = qemu_real_host_page_size();
off_t offset = addr / pagesize * sizeof(pinfo);
int fd;
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 4e1b27a20ecc..cdf0db733e57 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -1383,11 +1383,11 @@ long qemu_maxrampagesize(void)
#else
long qemu_minrampagesize(void)
{
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
long qemu_maxrampagesize(void)
{
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
#endif
@@ -2163,7 +2163,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
new_block->max_length = max_size;
assert(max_size >= size);
new_block->fd = -1;
- new_block->page_size = qemu_real_host_page_size;
+ new_block->page_size = qemu_real_host_page_size();
new_block->host = host;
new_block->flags = ram_flags;
ram_block_add(new_block, &local_err);
diff --git a/target/i386/hax/hax-mem.c b/target/i386/hax/hax-mem.c
index a226d174d8ef..05dbe8cce3ae 100644
--- a/target/i386/hax/hax-mem.c
+++ b/target/i386/hax/hax-mem.c
@@ -188,15 +188,15 @@ static void hax_process_section(MemoryRegionSection *section, uint8_t flags)
/* Adjust start_pa and size so that they are page-aligned. (Cf
* kvm_set_phys_mem() in kvm-all.c).
*/
- delta = qemu_real_host_page_size - (start_pa & ~qemu_real_host_page_mask);
- delta &= ~qemu_real_host_page_mask;
+ delta = qemu_real_host_page_size() - (start_pa & ~qemu_real_host_page_mask());
+ delta &= ~qemu_real_host_page_mask();
if (delta > size) {
return;
}
start_pa += delta;
size -= delta;
- size &= qemu_real_host_page_mask;
- if (!size || (start_pa & ~qemu_real_host_page_mask)) {
+ size &= qemu_real_host_page_mask();
+ if (!size || (start_pa & ~qemu_real_host_page_mask())) {
return;
}
@@ -214,7 +214,7 @@ static void hax_process_section(MemoryRegionSection *section, uint8_t flags)
* call into the kernel. Instead, we split the mapping into smaller ones,
* and call hax_update_mapping() on each.
*/
- max_mapping_size = UINT32_MAX & qemu_real_host_page_mask;
+ max_mapping_size = UINT32_MAX & qemu_real_host_page_mask();
while (size > max_mapping_size) {
hax_update_mapping(start_pa, max_mapping_size, host_va, flags);
start_pa += max_mapping_size;
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index b97d091a502d..9f940413318c 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -1075,15 +1075,15 @@ nvmm_process_section(MemoryRegionSection *section, int add)
}
/* Adjust start_pa and size so that they are page-aligned. */
- delta = qemu_real_host_page_size - (start_pa & ~qemu_real_host_page_mask);
- delta &= ~qemu_real_host_page_mask;
+ delta = qemu_real_host_page_size() - (start_pa & ~qemu_real_host_page_mask());
+ delta &= ~qemu_real_host_page_mask();
if (delta > size) {
return;
}
start_pa += delta;
size -= delta;
- size &= qemu_real_host_page_mask;
- if (!size || (start_pa & ~qemu_real_host_page_mask)) {
+ size &= qemu_real_host_page_mask();
+ if (!size || (start_pa & ~qemu_real_host_page_mask())) {
return;
}
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 03ba52da89fb..68a4ebe909ad 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -1572,15 +1572,15 @@ static void whpx_process_section(MemoryRegionSection *section, int add)
return;
}
- delta = qemu_real_host_page_size - (start_pa & ~qemu_real_host_page_mask);
- delta &= ~qemu_real_host_page_mask;
+ delta = qemu_real_host_page_size() - (start_pa & ~qemu_real_host_page_mask());
+ delta &= ~qemu_real_host_page_mask();
if (delta > size) {
return;
}
start_pa += delta;
size -= delta;
- size &= qemu_real_host_page_mask;
- if (!size || (start_pa & ~qemu_real_host_page_mask)) {
+ size &= qemu_real_host_page_mask();
+ if (!size || (start_pa & ~qemu_real_host_page_mask())) {
return;
}
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index d1f07c4f41d4..8644b85de847 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -418,7 +418,7 @@ void kvm_check_mmu(PowerPCCPU *cpu, Error **errp)
* will be a normal mapping, not a special hugepage one used
* for RAM.
*/
- if (qemu_real_host_page_size < 0x10000) {
+ if (qemu_real_host_page_size() < 0x10000) {
error_setg(errp,
"KVM can't supply 64kiB CI pages, which guest expects");
}
diff --git a/tcg/region.c b/tcg/region.c
index 97ca5291d52f..71ea81d6713f 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -488,14 +488,14 @@ static int alloc_code_gen_buffer(size_t tb_size, int splitwx, Error **errp)
/* page-align the beginning and end of the buffer */
buf = static_code_gen_buffer;
end = static_code_gen_buffer + sizeof(static_code_gen_buffer);
- buf = QEMU_ALIGN_PTR_UP(buf, qemu_real_host_page_size);
- end = QEMU_ALIGN_PTR_DOWN(end, qemu_real_host_page_size);
+ buf = QEMU_ALIGN_PTR_UP(buf, qemu_real_host_page_size());
+ end = QEMU_ALIGN_PTR_DOWN(end, qemu_real_host_page_size());
size = end - buf;
/* Honor a command-line option limiting the size of the buffer. */
if (size > tb_size) {
- size = QEMU_ALIGN_DOWN(tb_size, qemu_real_host_page_size);
+ size = QEMU_ALIGN_DOWN(tb_size, qemu_real_host_page_size());
}
region.start_aligned = buf;
@@ -729,7 +729,7 @@ static int alloc_code_gen_buffer(size_t size, int splitwx, Error **errp)
*/
void tcg_region_init(size_t tb_size, int splitwx, unsigned max_cpus)
{
- const size_t page_size = qemu_real_host_page_size;
+ const size_t page_size = qemu_real_host_page_size();
size_t region_size;
int have_prot, need_prot;
diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c
index 35088dd67f78..9b1dab2f2883 100644
--- a/tests/vhost-user-bridge.c
+++ b/tests/vhost-user-bridge.c
@@ -468,8 +468,8 @@ vubr_queue_set_started(VuDev *dev, int qidx, bool started)
if (started && vubr->notifier.fd >= 0) {
vu_set_queue_host_notifier(dev, vq, vubr->notifier.fd,
- qemu_real_host_page_size,
- qidx * qemu_real_host_page_size);
+ qemu_real_host_page_size(),
+ qidx * qemu_real_host_page_size());
}
if (qidx % 2 == 1) {
@@ -601,7 +601,7 @@ static void *notifier_thread(void *arg)
{
VuDev *dev = (VuDev *)arg;
VubrDev *vubr = container_of(dev, VubrDev, vudev);
- int pagesize = qemu_real_host_page_size;
+ int pagesize = qemu_real_host_page_size();
int qidx;
while (true) {
@@ -637,7 +637,7 @@ vubr_host_notifier_setup(VubrDev *dev)
void *addr;
int fd;
- length = qemu_real_host_page_size * VHOST_USER_BRIDGE_MAX_QUEUES;
+ length = qemu_real_host_page_size() * VHOST_USER_BRIDGE_MAX_QUEUES;
fd = mkstemp(template);
if (fd < 0) {
diff --git a/util/cutils.c b/util/cutils.c
index 0d475ec4cddd..1173ce3b88f3 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -175,7 +175,7 @@ int qemu_fdatasync(int fd)
int qemu_msync(void *addr, size_t length, int fd)
{
#ifdef CONFIG_POSIX
- size_t align_mask = ~(qemu_real_host_page_size - 1);
+ size_t align_mask = ~(qemu_real_host_page_size() - 1);
/**
* There are no strict reqs as per the length of mapping
@@ -183,7 +183,7 @@ int qemu_msync(void *addr, size_t length, int fd)
* alignment changes. Additionally - round the size to the multiple
* of PAGE_SIZE
*/
- length += ((uintptr_t)addr & (qemu_real_host_page_size - 1));
+ length += ((uintptr_t)addr & (qemu_real_host_page_size() - 1));
length = (length + ~align_mask) & align_mask;
addr = (void *)((uintptr_t)addr & align_mask);
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 893d864354a1..5b90cb68ea7d 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -50,7 +50,7 @@ size_t qemu_fd_getpagesize(int fd)
#endif
#endif
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
size_t qemu_mempath_getpagesize(const char *mem_path)
@@ -81,7 +81,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path)
#endif
#endif
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
}
#define OVERCOMMIT_MEMORY_PATH "/proc/sys/vm/overcommit_memory"
@@ -101,7 +101,7 @@ static bool map_noreserve_effective(int fd, uint32_t qemu_map_flags)
* MAP_NORESERVE.
* b) MAP_NORESERVE is not affected by /proc/sys/vm/overcommit_memory.
*/
- if (qemu_fd_getpagesize(fd) != qemu_real_host_page_size) {
+ if (qemu_fd_getpagesize(fd) != qemu_real_host_page_size()) {
return true;
}
@@ -166,7 +166,7 @@ static void *mmap_reserve(size_t size, int fd)
* We do this unless we are using the system page size, in which case
* anonymous memory is OK.
*/
- if (fd == -1 || qemu_fd_getpagesize(fd) == qemu_real_host_page_size) {
+ if (fd == -1 || qemu_fd_getpagesize(fd) == qemu_real_host_page_size()) {
fd = -1;
flags |= MAP_ANONYMOUS;
} else {
@@ -243,7 +243,7 @@ static inline size_t mmap_guard_pagesize(int fd)
/* Mappings in the same segment must share the same page size */
return qemu_fd_getpagesize(fd);
#else
- return qemu_real_host_page_size;
+ return qemu_real_host_page_size();
#endif
}
diff --git a/util/osdep.c b/util/osdep.c
index 84575ec21881..97dc9bc65b45 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -69,8 +69,8 @@ int qemu_madvise(void *addr, size_t len, int advice)
static int qemu_mprotect__osdep(void *addr, size_t size, int prot)
{
- g_assert(!((uintptr_t)addr & ~qemu_real_host_page_mask));
- g_assert(!(size & ~qemu_real_host_page_mask));
+ g_assert(!((uintptr_t)addr & ~qemu_real_host_page_mask()));
+ g_assert(!(size & ~qemu_real_host_page_mask()));
#ifdef _WIN32
DWORD old_protect;
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 2ebfb7505787..577c855612cb 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -767,7 +767,7 @@ void *qemu_alloc_stack(size_t *sz)
#ifdef CONFIG_DEBUG_STACK_USAGE
void *ptr2;
#endif
- size_t pagesz = qemu_real_host_page_size;
+ size_t pagesz = qemu_real_host_page_size();
#ifdef _SC_THREAD_STACK_MIN
/* avoid stacks smaller than _SC_THREAD_STACK_MIN */
long min_stack_sz = sysconf(_SC_THREAD_STACK_MIN);
@@ -829,7 +829,7 @@ void qemu_free_stack(void *stack, size_t sz)
unsigned int usage;
void *ptr;
- for (ptr = stack + qemu_real_host_page_size; ptr < stack + sz;
+ for (ptr = stack + qemu_real_host_page_size(); ptr < stack + sz;
ptr += sizeof(uint32_t)) {
if (*(uint32_t *)ptr != 0xdeadbeaf) {
break;
@@ -927,10 +927,10 @@ size_t qemu_get_host_physmem(void)
#ifdef _SC_PHYS_PAGES
long pages = sysconf(_SC_PHYS_PAGES);
if (pages > 0) {
- if (pages > SIZE_MAX / qemu_real_host_page_size) {
+ if (pages > SIZE_MAX / qemu_real_host_page_size()) {
return SIZE_MAX;
} else {
- return pages * qemu_real_host_page_size;
+ return pages * qemu_real_host_page_size();
}
}
#endif
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 4b1ce0be4b0e..91d2f45cfe1f 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -339,7 +339,7 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus,
Error **errp)
{
int i;
- size_t pagesize = qemu_real_host_page_size;
+ size_t pagesize = qemu_real_host_page_size();
memory = (memory + pagesize - 1) & -pagesize;
for (i = 0; i < memory / pagesize; i++) {
diff --git a/util/pagesize.c b/util/pagesize.c
deleted file mode 100644
index 998632cf6ee6..000000000000
--- a/util/pagesize.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * pagesize.c - query the host about its page size
- *
- * Copyright (C) 2017, Emilio G. Cota <cota@braap.org>
- * License: GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#include "qemu/osdep.h"
-
-uintptr_t qemu_real_host_page_size;
-intptr_t qemu_real_host_page_mask;
-
-static void __attribute__((constructor)) init_real_host_page_size(void)
-{
- qemu_real_host_page_size = getpagesize();
- qemu_real_host_page_mask = -(intptr_t)qemu_real_host_page_size;
-}
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index b037d5faa51e..5ba01177bf9d 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -163,7 +163,7 @@ void *qemu_vfio_pci_map_bar(QEMUVFIOState *s, int index,
Error **errp)
{
void *p;
- assert(QEMU_IS_ALIGNED(offset, qemu_real_host_page_size));
+ assert(QEMU_IS_ALIGNED(offset, qemu_real_host_page_size()));
assert_bar_index_valid(s, index);
p = mmap(NULL, MIN(size, s->bar_region_info[index].size - offset),
prot, MAP_SHARED,
@@ -591,9 +591,9 @@ static IOVAMapping *qemu_vfio_add_mapping(QEMUVFIOState *s,
IOVAMapping m = {.host = host, .size = size, .iova = iova};
IOVAMapping *insert;
- assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size));
- assert(QEMU_IS_ALIGNED(s->low_water_mark, qemu_real_host_page_size));
- assert(QEMU_IS_ALIGNED(s->high_water_mark, qemu_real_host_page_size));
+ assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size()));
+ assert(QEMU_IS_ALIGNED(s->low_water_mark, qemu_real_host_page_size()));
+ assert(QEMU_IS_ALIGNED(s->high_water_mark, qemu_real_host_page_size()));
trace_qemu_vfio_new_mapping(s, host, size, index, iova);
assert(index >= 0);
@@ -644,7 +644,7 @@ static void qemu_vfio_undo_mapping(QEMUVFIOState *s, IOVAMapping *mapping,
index = mapping - s->mappings;
assert(mapping->size > 0);
- assert(QEMU_IS_ALIGNED(mapping->size, qemu_real_host_page_size));
+ assert(QEMU_IS_ALIGNED(mapping->size, qemu_real_host_page_size()));
assert(index >= 0 && index < s->nr_mappings);
if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) {
error_setg_errno(errp, errno, "VFIO_UNMAP_DMA failed");
@@ -752,8 +752,8 @@ int qemu_vfio_dma_map(QEMUVFIOState *s, void *host, size_t size,
IOVAMapping *mapping;
uint64_t iova0;
- assert(QEMU_PTR_IS_ALIGNED(host, qemu_real_host_page_size));
- assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size));
+ assert(QEMU_PTR_IS_ALIGNED(host, qemu_real_host_page_size()));
+ assert(QEMU_IS_ALIGNED(size, qemu_real_host_page_size()));
trace_qemu_vfio_dma_map(s, host, size, temporary, iova);
QEMU_LOCK_GUARD(&s->lock);
mapping = qemu_vfio_find_mapping(s, host, &index);
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ddc6003de280..910a6c74dff9 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2974,10 +2974,10 @@ sub process {
ERROR("use memset() instead of bzero()\n" . $herecurr);
}
if ($line =~ /\bgetpagesize\(\)/) {
- ERROR("use qemu_real_host_page_size instead of getpagesize()\n" . $herecurr);
+ ERROR("use qemu_real_host_page_size() instead of getpagesize()\n" . $herecurr);
}
if ($line =~ /\bsysconf\(_SC_PAGESIZE\)/) {
- ERROR("use qemu_real_host_page_size instead of sysconf(_SC_PAGESIZE)\n" . $herecurr);
+ ERROR("use qemu_real_host_page_size() instead of sysconf(_SC_PAGESIZE)\n" . $herecurr);
}
my $non_exit_glib_asserts = qr{g_assert_cmpstr|
g_assert_cmpint|
diff --git a/util/meson.build b/util/meson.build
index f8f0643318c3..2d71ab57a42e 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -42,7 +42,6 @@ if have_membarrier
util_ss.add(files('sys_membarrier.c'))
endif
util_ss.add(files('log.c'))
-util_ss.add(files('pagesize.c'))
util_ss.add(files('qdist.c'))
util_ss.add(files('qht.c'))
util_ss.add(files('qsp.c'))
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 11/32] Replace qemu_real_host_page variables with inlined functions
2022-03-23 15:57 ` marcandre.lureau
@ 2022-03-25 8:34 ` Juan Quintela
-1 siblings, 0 replies; 79+ messages in thread
From: Juan Quintela @ 2022-03-25 8:34 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, Cameron Esfahani, Roman Bolshakov, Paolo Bonzini,
David Hildenbrand, Igor Mammedov, Kevin Wolf, Hanna Reitz,
Stefan Hajnoczi, Fam Zheng, Philippe Mathieu-Daudé,
Denis V. Lunev, Vladimir Sementsov-Ogievskiy, Warner Losh,
Kyle Evans, Michael S. Tsirkin, Gerd Hoffmann, Eduardo Habkost,
Marcel Apfelbaum, Yanan Wang, Cornelia Huck, Thomas Huth,
Halil Pasic, Christian Borntraeger, Mark Cave-Ayland,
Cédric Le Goater, Daniel Henrique Barboza, David Gibson,
Greg Kurz, Yuval Shaia, Stefan Berger, Alex Williamson,
Richard Henderson, Peter Xu, Laurent Vivier,
Dr. David Alan Gilbert, Markus Armbruster, Wenchao Wang,
Colin Xu, Kamil Rytarowski, Reinoud Zandijk, Sunil Muthuswamy,
Stefan Weil, open list:Overall KVM CPUs,
open list:Block layer core, open list:S390 general arch...,
open list:New World (mac99),
open list:X86 HAXM CPUs
marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Replace the global variables with inlined helper functions. getpagesize() is very
> likely annotated with a "const" function attribute (at least with glibc), and thus
> optimization should apply even better.
>
> This avoids the need for a constructor initialization too.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
I see what you are tyring to do here.
But once here, why aren't we just calling getpagesize() and call it a
day? I can't see what advantage has to have this other name for this
function, and as you are already changing all its uses anyways.
Once there, I can see that qemu_real_host_page_mask is used (almost)
everywhere as (vfio code use the real value):
foo & qemu_real_host_page_mask()
or
foo & ~qemu_real_host_page_mask()
And no, I don't have any good names for this macros.
Anyways, if you don't like the suggestion, your changes are better that
we already have, so ...
Reviewed-by: Juan Quintela <quintela@redhat.com>
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 11/32] Replace qemu_real_host_page variables with inlined functions
@ 2022-03-25 8:34 ` Juan Quintela
0 siblings, 0 replies; 79+ messages in thread
From: Juan Quintela @ 2022-03-25 8:34 UTC (permalink / raw)
To: marcandre.lureau
Cc: Fam Zheng, Daniel Henrique Barboza, open list:Overall KVM CPUs,
David Hildenbrand, Mark Cave-Ayland, qemu-devel, Peter Xu,
Laurent Vivier, Yanan Wang, open list:X86 HAXM CPUs,
Gerd Hoffmann, Denis V. Lunev, Warner Losh, Alex Williamson,
qemu-block, Stefan Berger, Michael S. Tsirkin, Markus Armbruster,
Halil Pasic, Kamil Rytarowski, Reinoud Zandijk, Stefan Weil,
Christian Borntraeger, Eduardo Habkost, Thomas Huth,
Vladimir Sementsov-Ogievskiy, Kyle Evans, Richard Henderson,
Greg Kurz, Cameron Esfahani, Yuval Shaia, Roman Bolshakov,
Cédric Le Goater, Stefan Hajnoczi, Paolo Bonzini,
Sunil Muthuswamy, David Gibson, Kevin Wolf,
open list:S390 general arch...,
Cornelia Huck, Philippe Mathieu-Daudé,
Hanna Reitz, open list:New World mac99, Wenchao Wang,
Igor Mammedov, Dr. David Alan Gilbert, Colin Xu
marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Replace the global variables with inlined helper functions. getpagesize() is very
> likely annotated with a "const" function attribute (at least with glibc), and thus
> optimization should apply even better.
>
> This avoids the need for a constructor initialization too.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
I see what you are tyring to do here.
But once here, why aren't we just calling getpagesize() and call it a
day? I can't see what advantage has to have this other name for this
function, and as you are already changing all its uses anyways.
Once there, I can see that qemu_real_host_page_mask is used (almost)
everywhere as (vfio code use the real value):
foo & qemu_real_host_page_mask()
or
foo & ~qemu_real_host_page_mask()
And no, I don't have any good names for this macros.
Anyways, if you don't like the suggestion, your changes are better that
we already have, so ...
Reviewed-by: Juan Quintela <quintela@redhat.com>
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 12/32] qga: replace deprecated g_get_current_time()
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (10 preceding siblings ...)
2022-03-23 15:57 ` marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-04-06 14:53 ` Damien Hedde
2022-04-07 5:46 ` Markus Armbruster
2022-03-23 15:57 ` [PATCH 13/32] error-report: replace deprecated g_get_current_time() with glib >= 2.62 marcandre.lureau
` (20 subsequent siblings)
32 siblings, 2 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Michael Roth
From: Marc-André Lureau <marcandre.lureau@redhat.com>
According to GLib API:
g_get_current_time has been deprecated since version 2.62 and should not
be used in newly-written code. GTimeVal is not year-2038-safe. Use
g_get_real_time() instead.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qga/main.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/qga/main.c b/qga/main.c
index b9dd19918e47..1deb0ee2fbfe 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -314,7 +314,6 @@ static void ga_log(const gchar *domain, GLogLevelFlags level,
const gchar *msg, gpointer opaque)
{
GAState *s = opaque;
- GTimeVal time;
const char *level_str = ga_log_level_str(level);
if (!ga_logging_enabled(s)) {
@@ -329,9 +328,11 @@ static void ga_log(const gchar *domain, GLogLevelFlags level,
#else
if (level & s->log_level) {
#endif
- g_get_current_time(&time);
+ gint64 t = g_get_real_time();
fprintf(s->log_file,
- "%lu.%lu: %s: %s\n", time.tv_sec, time.tv_usec, level_str, msg);
+ "%" G_GINT64_FORMAT ".%" G_GINT64_FORMAT
+ ": %s: %s\n", t / G_USEC_PER_SEC, t % G_USEC_PER_SEC,
+ level_str, msg);
fflush(s->log_file);
}
}
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 12/32] qga: replace deprecated g_get_current_time()
2022-03-23 15:57 ` [PATCH 12/32] qga: replace deprecated g_get_current_time() marcandre.lureau
@ 2022-04-06 14:53 ` Damien Hedde
2022-04-07 5:46 ` Markus Armbruster
1 sibling, 0 replies; 79+ messages in thread
From: Damien Hedde @ 2022-04-06 14:53 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: Michael Roth
On 3/23/22 16:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> According to GLib API:
> g_get_current_time has been deprecated since version 2.62 and should not
> be used in newly-written code. GTimeVal is not year-2038-safe. Use
> g_get_real_time() instead.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> qga/main.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/qga/main.c b/qga/main.c
> index b9dd19918e47..1deb0ee2fbfe 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -314,7 +314,6 @@ static void ga_log(const gchar *domain, GLogLevelFlags level,
> const gchar *msg, gpointer opaque)
> {
> GAState *s = opaque;
> - GTimeVal time;
> const char *level_str = ga_log_level_str(level);
>
> if (!ga_logging_enabled(s)) {
> @@ -329,9 +328,11 @@ static void ga_log(const gchar *domain, GLogLevelFlags level,
> #else
> if (level & s->log_level) {
> #endif
> - g_get_current_time(&time);
> + gint64 t = g_get_real_time();
> fprintf(s->log_file,
> - "%lu.%lu: %s: %s\n", time.tv_sec, time.tv_usec, level_str, msg);
> + "%" G_GINT64_FORMAT ".%" G_GINT64_FORMAT
> + ": %s: %s\n", t / G_USEC_PER_SEC, t % G_USEC_PER_SEC,
> + level_str, msg);
> fflush(s->log_file);
> }
> }
Reviewed-by: Damien Hedde <damien.hedde@greensocs.com>
--
Damien
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 12/32] qga: replace deprecated g_get_current_time()
2022-03-23 15:57 ` [PATCH 12/32] qga: replace deprecated g_get_current_time() marcandre.lureau
2022-04-06 14:53 ` Damien Hedde
@ 2022-04-07 5:46 ` Markus Armbruster
2022-04-07 11:19 ` Marc-André Lureau
1 sibling, 1 reply; 79+ messages in thread
From: Markus Armbruster @ 2022-04-07 5:46 UTC (permalink / raw)
To: marcandre.lureau; +Cc: Michael Roth, qemu-devel
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> According to GLib API:
> g_get_current_time has been deprecated since version 2.62 and should not
> be used in newly-written code. GTimeVal is not year-2038-safe. Use
> g_get_real_time() instead.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> qga/main.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/qga/main.c b/qga/main.c
> index b9dd19918e47..1deb0ee2fbfe 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -314,7 +314,6 @@ static void ga_log(const gchar *domain, GLogLevelFlags level,
> const gchar *msg, gpointer opaque)
> {
> GAState *s = opaque;
> - GTimeVal time;
> const char *level_str = ga_log_level_str(level);
>
> if (!ga_logging_enabled(s)) {
> @@ -329,9 +328,11 @@ static void ga_log(const gchar *domain, GLogLevelFlags level,
> #else
> if (level & s->log_level) {
> #endif
> - g_get_current_time(&time);
> + gint64 t = g_get_real_time();
> fprintf(s->log_file,
> - "%lu.%lu: %s: %s\n", time.tv_sec, time.tv_usec, level_str, msg);
The old code is kind of wrong. Say it's 1649309843.000001 seconds past
the epoch. Prints "1649309843.1". 9us later, it prints
"1649309843.10". Should really use %06lu for the microseconds part.
Whether you want to fix this in this patch, or just note it for later in
the commit message, or ignore it alltogether is up to you.
> + "%" G_GINT64_FORMAT ".%" G_GINT64_FORMAT
This gives me flashbacks to the 90s. Please use PRId64 like we do
everywhere else.
I'd ditch gint64_t for int64_t, too.
> + ": %s: %s\n", t / G_USEC_PER_SEC, t % G_USEC_PER_SEC,
> + level_str, msg);
> fflush(s->log_file);
> }
> }
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 12/32] qga: replace deprecated g_get_current_time()
2022-04-07 5:46 ` Markus Armbruster
@ 2022-04-07 11:19 ` Marc-André Lureau
0 siblings, 0 replies; 79+ messages in thread
From: Marc-André Lureau @ 2022-04-07 11:19 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Michael Roth, QEMU
[-- Attachment #1: Type: text/plain, Size: 2184 bytes --]
Hi
On Thu, Apr 7, 2022 at 9:54 AM Markus Armbruster <armbru@redhat.com> wrote:
> marcandre.lureau@redhat.com writes:
>
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > According to GLib API:
> > g_get_current_time has been deprecated since version 2.62 and should not
> > be used in newly-written code. GTimeVal is not year-2038-safe. Use
> > g_get_real_time() instead.
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> > qga/main.c | 7 ++++---
> > 1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/qga/main.c b/qga/main.c
> > index b9dd19918e47..1deb0ee2fbfe 100644
> > --- a/qga/main.c
> > +++ b/qga/main.c
> > @@ -314,7 +314,6 @@ static void ga_log(const gchar *domain,
> GLogLevelFlags level,
> > const gchar *msg, gpointer opaque)
> > {
> > GAState *s = opaque;
> > - GTimeVal time;
> > const char *level_str = ga_log_level_str(level);
> >
> > if (!ga_logging_enabled(s)) {
> > @@ -329,9 +328,11 @@ static void ga_log(const gchar *domain,
> GLogLevelFlags level,
> > #else
> > if (level & s->log_level) {
> > #endif
> > - g_get_current_time(&time);
> > + gint64 t = g_get_real_time();
> > fprintf(s->log_file,
> > - "%lu.%lu: %s: %s\n", time.tv_sec, time.tv_usec,
> level_str, msg);
>
> The old code is kind of wrong. Say it's 1649309843.000001 seconds past
> the epoch. Prints "1649309843.1". 9us later, it prints
> "1649309843.10". Should really use %06lu for the microseconds part.
>
good idea
> Whether you want to fix this in this patch, or just note it for later in
> the commit message, or ignore it alltogether is up to you.
>
> > + "%" G_GINT64_FORMAT ".%" G_GINT64_FORMAT
>
> This gives me flashbacks to the 90s. Please use PRId64 like we do
> everywhere else.
>
> I'd ditch gint64_t for int64_t, too.
>
ack, ack
>
> > + ": %s: %s\n", t / G_USEC_PER_SEC, t % G_USEC_PER_SEC,
> > + level_str, msg);
> > fflush(s->log_file);
> > }
> > }
>
>
>
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 3489 bytes --]
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 13/32] error-report: replace deprecated g_get_current_time() with glib >= 2.62
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (11 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 12/32] qga: replace deprecated g_get_current_time() marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-04-06 9:07 ` Markus Armbruster
2022-03-23 15:57 ` [PATCH 14/32] util: rename qemu-error.c to match its header name marcandre.lureau
` (19 subsequent siblings)
32 siblings, 1 reply; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Markus Armbruster
From: Marc-André Lureau <marcandre.lureau@redhat.com>
According to GLib API:
g_get_current_time has been deprecated since version 2.62 and should not
be used in newly-written code. GTimeVal is not year-2038-safe. Use
g_get_real_time() instead.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/glib-compat.h | 10 ++++++++++
util/qemu-error.c | 17 ++++++++++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/include/glib-compat.h b/include/glib-compat.h
index 3113a7d2af84..dc14d3ec0d1e 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -145,6 +145,16 @@ qemu_g_test_slow(void)
#define g_test_thorough() qemu_g_test_slow()
#define g_test_quick() (!qemu_g_test_slow())
+#if GLIB_CHECK_VERSION(2,62,0)
+static inline gchar *
+g_date_time_format_iso8601_compat(GDateTime *datetime)
+{
+ return g_date_time_format_iso8601(datetime);
+}
+
+#define g_date_time_format_iso8601 g_date_time_format_iso8601_compat
+#endif
+
#pragma GCC diagnostic pop
#endif
diff --git a/util/qemu-error.c b/util/qemu-error.c
index 7769aee8e791..4ea380dd4169 100644
--- a/util/qemu-error.c
+++ b/util/qemu-error.c
@@ -180,6 +180,19 @@ static void print_loc(void)
}
}
+static char *
+real_time_iso8601(void)
+{
+#if GLIB_CHECK_VERSION(2,62,0)
+ g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc(g_get_real_time());
+ return g_date_time_format_iso8601(dt);
+#else
+ GTimeVal tv;
+ g_get_current_time(&tv);
+ return g_time_val_to_iso8601(&tv);
+#endif
+}
+
/*
* Print a message to current monitor if we have one, else to stderr.
* @report_type is the type of message: error, warning or informational.
@@ -189,12 +202,10 @@ static void print_loc(void)
*/
static void vreport(report_type type, const char *fmt, va_list ap)
{
- GTimeVal tv;
gchar *timestr;
if (message_with_timestamp && !monitor_cur()) {
- g_get_current_time(&tv);
- timestr = g_time_val_to_iso8601(&tv);
+ timestr = real_time_iso8601();
error_printf("%s ", timestr);
g_free(timestr);
}
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 13/32] error-report: replace deprecated g_get_current_time() with glib >= 2.62
2022-03-23 15:57 ` [PATCH 13/32] error-report: replace deprecated g_get_current_time() with glib >= 2.62 marcandre.lureau
@ 2022-04-06 9:07 ` Markus Armbruster
2022-04-06 9:35 ` Marc-André Lureau
0 siblings, 1 reply; 79+ messages in thread
From: Markus Armbruster @ 2022-04-06 9:07 UTC (permalink / raw)
To: marcandre.lureau; +Cc: qemu-devel
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> According to GLib API:
> g_get_current_time has been deprecated since version 2.62 and should not
> be used in newly-written code. GTimeVal is not year-2038-safe. Use
> g_get_real_time() instead.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> include/glib-compat.h | 10 ++++++++++
> util/qemu-error.c | 17 ++++++++++++++---
> 2 files changed, 24 insertions(+), 3 deletions(-)
>
> diff --git a/include/glib-compat.h b/include/glib-compat.h
> index 3113a7d2af84..dc14d3ec0d1e 100644
> --- a/include/glib-compat.h
> +++ b/include/glib-compat.h
> @@ -145,6 +145,16 @@ qemu_g_test_slow(void)
> #define g_test_thorough() qemu_g_test_slow()
> #define g_test_quick() (!qemu_g_test_slow())
>
> +#if GLIB_CHECK_VERSION(2,62,0)
> +static inline gchar *
> +g_date_time_format_iso8601_compat(GDateTime *datetime)
> +{
> + return g_date_time_format_iso8601(datetime);
> +}
> +
> +#define g_date_time_format_iso8601 g_date_time_format_iso8601_compat
> +#endif
I'm confused.
If we're using v2.62 or later, g_time_val_to_iso8601(dt) calls GLib's
g_time_val_to_iso8601(). Why do we need the inline function and the
macro?
Else, I expect g_date_time_format_iso8601(dt) not to compile.
> +
> #pragma GCC diagnostic pop
>
> #endif
> diff --git a/util/qemu-error.c b/util/qemu-error.c
> index 7769aee8e791..4ea380dd4169 100644
> --- a/util/qemu-error.c
> +++ b/util/qemu-error.c
> @@ -180,6 +180,19 @@ static void print_loc(void)
> }
> }
>
> +static char *
> +real_time_iso8601(void)
> +{
> +#if GLIB_CHECK_VERSION(2,62,0)
> + g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc(g_get_real_time());
> + return g_date_time_format_iso8601(dt);
> +#else
> + GTimeVal tv;
> + g_get_current_time(&tv);
> + return g_time_val_to_iso8601(&tv);
> +#endif
> +}
> +
> /*
> * Print a message to current monitor if we have one, else to stderr.
> * @report_type is the type of message: error, warning or informational.
> @@ -189,12 +202,10 @@ static void print_loc(void)
> */
> static void vreport(report_type type, const char *fmt, va_list ap)
> {
> - GTimeVal tv;
> gchar *timestr;
>
> if (message_with_timestamp && !monitor_cur()) {
> - g_get_current_time(&tv);
> - timestr = g_time_val_to_iso8601(&tv);
> + timestr = real_time_iso8601();
> error_printf("%s ", timestr);
> g_free(timestr);
> }
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 13/32] error-report: replace deprecated g_get_current_time() with glib >= 2.62
2022-04-06 9:07 ` Markus Armbruster
@ 2022-04-06 9:35 ` Marc-André Lureau
2022-04-06 9:40 ` Marc-André Lureau
0 siblings, 1 reply; 79+ messages in thread
From: Marc-André Lureau @ 2022-04-06 9:35 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel
Hi
On Wed, Apr 6, 2022 at 1:08 PM Markus Armbruster <armbru@redhat.com> wrote:
>
> marcandre.lureau@redhat.com writes:
>
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > According to GLib API:
> > g_get_current_time has been deprecated since version 2.62 and should not
> > be used in newly-written code. GTimeVal is not year-2038-safe. Use
> > g_get_real_time() instead.
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> > include/glib-compat.h | 10 ++++++++++
> > util/qemu-error.c | 17 ++++++++++++++---
> > 2 files changed, 24 insertions(+), 3 deletions(-)
> >
> > diff --git a/include/glib-compat.h b/include/glib-compat.h
> > index 3113a7d2af84..dc14d3ec0d1e 100644
> > --- a/include/glib-compat.h
> > +++ b/include/glib-compat.h
> > @@ -145,6 +145,16 @@ qemu_g_test_slow(void)
> > #define g_test_thorough() qemu_g_test_slow()
> > #define g_test_quick() (!qemu_g_test_slow())
> >
> > +#if GLIB_CHECK_VERSION(2,62,0)
> > +static inline gchar *
> > +g_date_time_format_iso8601_compat(GDateTime *datetime)
> > +{
> > + return g_date_time_format_iso8601(datetime);
> > +}
> > +
> > +#define g_date_time_format_iso8601 g_date_time_format_iso8601_compat
> > +#endif
>
> I'm confused.
>
> If we're using v2.62 or later, g_time_val_to_iso8601(dt) calls GLib's
> g_time_val_to_iso8601(). Why do we need the inline function and the
> macro?
To hide the "deprecation" warning because GLIB_VERSION_MAX_ALLOWED is 2.56.
>
> Else, I expect g_date_time_format_iso8601(dt) not to compile.
>
> > +
> > #pragma GCC diagnostic pop
> >
> > #endif
> > diff --git a/util/qemu-error.c b/util/qemu-error.c
> > index 7769aee8e791..4ea380dd4169 100644
> > --- a/util/qemu-error.c
> > +++ b/util/qemu-error.c
> > @@ -180,6 +180,19 @@ static void print_loc(void)
> > }
> > }
> >
> > +static char *
> > +real_time_iso8601(void)
> > +{
> > +#if GLIB_CHECK_VERSION(2,62,0)
> > + g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc(g_get_real_time());
> > + return g_date_time_format_iso8601(dt);
> > +#else
> > + GTimeVal tv;
> > + g_get_current_time(&tv);
> > + return g_time_val_to_iso8601(&tv);
> > +#endif
> > +}
> > +
> > /*
> > * Print a message to current monitor if we have one, else to stderr.
> > * @report_type is the type of message: error, warning or informational.
> > @@ -189,12 +202,10 @@ static void print_loc(void)
> > */
> > static void vreport(report_type type, const char *fmt, va_list ap)
> > {
> > - GTimeVal tv;
> > gchar *timestr;
> >
> > if (message_with_timestamp && !monitor_cur()) {
> > - g_get_current_time(&tv);
> > - timestr = g_time_val_to_iso8601(&tv);
> > + timestr = real_time_iso8601();
> > error_printf("%s ", timestr);
> > g_free(timestr);
> > }
>
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 13/32] error-report: replace deprecated g_get_current_time() with glib >= 2.62
2022-04-06 9:35 ` Marc-André Lureau
@ 2022-04-06 9:40 ` Marc-André Lureau
2022-04-06 10:38 ` Markus Armbruster
0 siblings, 1 reply; 79+ messages in thread
From: Marc-André Lureau @ 2022-04-06 9:40 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel
On Wed, Apr 6, 2022 at 1:35 PM Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
>
> Hi
>
> On Wed, Apr 6, 2022 at 1:08 PM Markus Armbruster <armbru@redhat.com> wrote:
> >
> > marcandre.lureau@redhat.com writes:
> >
> > > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> > >
> > > According to GLib API:
> > > g_get_current_time has been deprecated since version 2.62 and should not
> > > be used in newly-written code. GTimeVal is not year-2038-safe. Use
> > > g_get_real_time() instead.
> > >
> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > > ---
> > > include/glib-compat.h | 10 ++++++++++
> > > util/qemu-error.c | 17 ++++++++++++++---
> > > 2 files changed, 24 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/include/glib-compat.h b/include/glib-compat.h
> > > index 3113a7d2af84..dc14d3ec0d1e 100644
> > > --- a/include/glib-compat.h
> > > +++ b/include/glib-compat.h
> > > @@ -145,6 +145,16 @@ qemu_g_test_slow(void)
> > > #define g_test_thorough() qemu_g_test_slow()
> > > #define g_test_quick() (!qemu_g_test_slow())
> > >
> > > +#if GLIB_CHECK_VERSION(2,62,0)
> > > +static inline gchar *
> > > +g_date_time_format_iso8601_compat(GDateTime *datetime)
> > > +{
> > > + return g_date_time_format_iso8601(datetime);
> > > +}
> > > +
> > > +#define g_date_time_format_iso8601 g_date_time_format_iso8601_compat
> > > +#endif
> >
> > I'm confused.
> >
> > If we're using v2.62 or later, g_time_val_to_iso8601(dt) calls GLib's
> > g_time_val_to_iso8601(). Why do we need the inline function and the
> > macro?
>
> To hide the "deprecation" warning because GLIB_VERSION_MAX_ALLOWED is 2.56.
This is probably a better solution, I will change the patch:
--- a/util/qemu-error.c
+++ b/util/qemu-error.c
@@ -185,7 +185,10 @@ real_time_iso8601(void)
{
#if GLIB_CHECK_VERSION(2,62,0)
g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc(g_get_real_time());
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return g_date_time_format_iso8601(dt);
+#pragma GCC diagnostic pop
#else
GTimeVal tv;
>
> >
> > Else, I expect g_date_time_format_iso8601(dt) not to compile.
> >
> > > +
> > > #pragma GCC diagnostic pop
> > >
> > > #endif
> > > diff --git a/util/qemu-error.c b/util/qemu-error.c
> > > index 7769aee8e791..4ea380dd4169 100644
> > > --- a/util/qemu-error.c
> > > +++ b/util/qemu-error.c
> > > @@ -180,6 +180,19 @@ static void print_loc(void)
> > > }
> > > }
> > >
> > > +static char *
> > > +real_time_iso8601(void)
> > > +{
> > > +#if GLIB_CHECK_VERSION(2,62,0)
> > > + g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc(g_get_real_time());
> > > + return g_date_time_format_iso8601(dt);
> > > +#else
> > > + GTimeVal tv;
> > > + g_get_current_time(&tv);
> > > + return g_time_val_to_iso8601(&tv);
> > > +#endif
> > > +}
> > > +
> > > /*
> > > * Print a message to current monitor if we have one, else to stderr.
> > > * @report_type is the type of message: error, warning or informational.
> > > @@ -189,12 +202,10 @@ static void print_loc(void)
> > > */
> > > static void vreport(report_type type, const char *fmt, va_list ap)
> > > {
> > > - GTimeVal tv;
> > > gchar *timestr;
> > >
> > > if (message_with_timestamp && !monitor_cur()) {
> > > - g_get_current_time(&tv);
> > > - timestr = g_time_val_to_iso8601(&tv);
> > > + timestr = real_time_iso8601();
> > > error_printf("%s ", timestr);
> > > g_free(timestr);
> > > }
> >
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 13/32] error-report: replace deprecated g_get_current_time() with glib >= 2.62
2022-04-06 9:40 ` Marc-André Lureau
@ 2022-04-06 10:38 ` Markus Armbruster
0 siblings, 0 replies; 79+ messages in thread
From: Markus Armbruster @ 2022-04-06 10:38 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: qemu-devel
Marc-André Lureau <marcandre.lureau@redhat.com> writes:
> On Wed, Apr 6, 2022 at 1:35 PM Marc-André Lureau
> <marcandre.lureau@redhat.com> wrote:
>>
>> Hi
>>
>> On Wed, Apr 6, 2022 at 1:08 PM Markus Armbruster <armbru@redhat.com> wrote:
>> >
>> > marcandre.lureau@redhat.com writes:
>> >
>> > > From: Marc-André Lureau <marcandre.lureau@redhat.com>
>> > >
>> > > According to GLib API:
>> > > g_get_current_time has been deprecated since version 2.62 and should not
>> > > be used in newly-written code. GTimeVal is not year-2038-safe. Use
>> > > g_get_real_time() instead.
>> > >
>> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> > > ---
>> > > include/glib-compat.h | 10 ++++++++++
>> > > util/qemu-error.c | 17 ++++++++++++++---
>> > > 2 files changed, 24 insertions(+), 3 deletions(-)
>> > >
>> > > diff --git a/include/glib-compat.h b/include/glib-compat.h
>> > > index 3113a7d2af84..dc14d3ec0d1e 100644
>> > > --- a/include/glib-compat.h
>> > > +++ b/include/glib-compat.h
>> > > @@ -145,6 +145,16 @@ qemu_g_test_slow(void)
>> > > #define g_test_thorough() qemu_g_test_slow()
>> > > #define g_test_quick() (!qemu_g_test_slow())
>> > >
>> > > +#if GLIB_CHECK_VERSION(2,62,0)
>> > > +static inline gchar *
>> > > +g_date_time_format_iso8601_compat(GDateTime *datetime)
>> > > +{
>> > > + return g_date_time_format_iso8601(datetime);
>> > > +}
>> > > +
>> > > +#define g_date_time_format_iso8601 g_date_time_format_iso8601_compat
>> > > +#endif
>> >
>> > I'm confused.
>> >
>> > If we're using v2.62 or later, g_time_val_to_iso8601(dt) calls GLib's
>> > g_time_val_to_iso8601(). Why do we need the inline function and the
>> > macro?
>>
>> To hide the "deprecation" warning because GLIB_VERSION_MAX_ALLOWED is 2.56.
Ah, now I see!
> This is probably a better solution, I will change the patch:
>
> --- a/util/qemu-error.c
> +++ b/util/qemu-error.c
> @@ -185,7 +185,10 @@ real_time_iso8601(void)
> {
> #if GLIB_CHECK_VERSION(2,62,0)
> g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc(g_get_real_time());
> +#pragma GCC diagnostic push
> +#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
> return g_date_time_format_iso8601(dt);
> +#pragma GCC diagnostic pop
> #else
> GTimeVal tv;
Yup, this is clearer. Throw in a comment, perhaps?
[...]
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 14/32] util: rename qemu-error.c to match its header name
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (12 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 13/32] error-report: replace deprecated g_get_current_time() with glib >= 2.62 marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 18:23 ` Richard Henderson
2022-04-07 5:49 ` Markus Armbruster
2022-03-23 15:57 ` [PATCH 15/32] error-report: use error_printf() for program prefix marcandre.lureau
` (18 subsequent siblings)
32 siblings, 2 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The header name is more appropriate.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
util/{qemu-error.c => error-report.c} | 0
util/meson.build | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename util/{qemu-error.c => error-report.c} (100%)
diff --git a/util/qemu-error.c b/util/error-report.c
similarity index 100%
rename from util/qemu-error.c
rename to util/error-report.c
diff --git a/util/meson.build b/util/meson.build
index 2d71ab57a42e..82eec004e223 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -28,7 +28,7 @@ util_ss.add(files('host-utils.c'))
util_ss.add(files('bitmap.c', 'bitops.c'))
util_ss.add(files('fifo8.c'))
util_ss.add(files('cacheinfo.c', 'cacheflush.c'))
-util_ss.add(files('error.c', 'qemu-error.c'))
+util_ss.add(files('error.c', 'error-report.c'))
util_ss.add(files('qemu-print.c'))
util_ss.add(files('id.c'))
util_ss.add(files('qemu-config.c', 'notify.c'))
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 14/32] util: rename qemu-error.c to match its header name
2022-03-23 15:57 ` [PATCH 14/32] util: rename qemu-error.c to match its header name marcandre.lureau
@ 2022-03-23 18:23 ` Richard Henderson
2022-04-07 5:49 ` Markus Armbruster
1 sibling, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 18:23 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> The header name is more appropriate.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> ---
> util/{qemu-error.c => error-report.c} | 0
> util/meson.build | 2 +-
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename util/{qemu-error.c => error-report.c} (100%)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 14/32] util: rename qemu-error.c to match its header name
2022-03-23 15:57 ` [PATCH 14/32] util: rename qemu-error.c to match its header name marcandre.lureau
2022-03-23 18:23 ` Richard Henderson
@ 2022-04-07 5:49 ` Markus Armbruster
1 sibling, 0 replies; 79+ messages in thread
From: Markus Armbruster @ 2022-04-07 5:49 UTC (permalink / raw)
To: marcandre.lureau; +Cc: qemu-devel
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The header name is more appropriate.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> util/{qemu-error.c => error-report.c} | 0
> util/meson.build | 2 +-
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename util/{qemu-error.c => error-report.c} (100%)
>
> diff --git a/util/qemu-error.c b/util/error-report.c
> similarity index 100%
> rename from util/qemu-error.c
> rename to util/error-report.c
> diff --git a/util/meson.build b/util/meson.build
> index 2d71ab57a42e..82eec004e223 100644
> --- a/util/meson.build
> +++ b/util/meson.build
> @@ -28,7 +28,7 @@ util_ss.add(files('host-utils.c'))
> util_ss.add(files('bitmap.c', 'bitops.c'))
> util_ss.add(files('fifo8.c'))
> util_ss.add(files('cacheinfo.c', 'cacheflush.c'))
> -util_ss.add(files('error.c', 'qemu-error.c'))
> +util_ss.add(files('error.c', 'error-report.c'))
> util_ss.add(files('qemu-print.c'))
> util_ss.add(files('id.c'))
> util_ss.add(files('qemu-config.c', 'notify.c'))
Unfortunate file names can be annoying. Dealing with renames in git
history is also annoying. Which one's the lesser annoyance?
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 15/32] error-report: use error_printf() for program prefix
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (13 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 14/32] util: rename qemu-error.c to match its header name marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-04-07 5:50 ` Markus Armbruster
2022-03-23 15:57 ` [PATCH 16/32] include: move TFR to osdep.h marcandre.lureau
` (17 subsequent siblings)
32 siblings, 1 reply; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
For consistency with other calls in the function, let's use
error_printf(). (it will use stderr since !monitor_cur())
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
util/error-report.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/error-report.c b/util/error-report.c
index 4ea380dd4169..3a1d4923d620 100644
--- a/util/error-report.c
+++ b/util/error-report.c
@@ -156,7 +156,7 @@ static void print_loc(void)
const char *const *argp;
if (!monitor_cur() && g_get_prgname()) {
- fprintf(stderr, "%s:", g_get_prgname());
+ error_printf("%s:", g_get_prgname());
sep = " ";
}
switch (cur_loc->kind) {
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 15/32] error-report: use error_printf() for program prefix
2022-03-23 15:57 ` [PATCH 15/32] error-report: use error_printf() for program prefix marcandre.lureau
@ 2022-04-07 5:50 ` Markus Armbruster
0 siblings, 0 replies; 79+ messages in thread
From: Markus Armbruster @ 2022-04-07 5:50 UTC (permalink / raw)
To: marcandre.lureau; +Cc: qemu-devel
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> For consistency with other calls in the function, let's use
> error_printf(). (it will use stderr since !monitor_cur())
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> util/error-report.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/util/error-report.c b/util/error-report.c
> index 4ea380dd4169..3a1d4923d620 100644
> --- a/util/error-report.c
> +++ b/util/error-report.c
> @@ -156,7 +156,7 @@ static void print_loc(void)
> const char *const *argp;
>
> if (!monitor_cur() && g_get_prgname()) {
> - fprintf(stderr, "%s:", g_get_prgname());
> + error_printf("%s:", g_get_prgname());
> sep = " ";
> }
> switch (cur_loc->kind) {
Reviewed-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 16/32] include: move TFR to osdep.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (14 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 15/32] error-report: use error_printf() for program prefix marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 17/32] include: move qemu_write_full() declaration " marcandre.lureau
` (16 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The macro requires EINTR, which has its header included in osdep.h.
(Not sure what TFR stands for, perhaps "Test For Retry". Rename it ?)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 2 --
include/qemu/osdep.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index f9b3f85b8124..db8b03be51f3 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -10,8 +10,6 @@
#ifndef QEMU_COMMON_H
#define QEMU_COMMON_H
-#define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
-
/* Copyright string for -version arguments, About dialogs, etc */
#define QEMU_COPYRIGHT "Copyright (c) 2003-2022 " \
"Fabrice Bellard and the QEMU Project developers"
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 240b48707ecc..489a5d1aad5f 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -226,6 +226,8 @@ extern "C" {
#define ESHUTDOWN 4099
#endif
+#define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
+
/* time_t may be either 32 or 64 bits depending on the host OS, and
* can be either signed or unsigned, so we can't just hardcode a
* specific maximum value. This is not a C preprocessor constant,
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 17/32] include: move qemu_write_full() declaration to osdep.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (15 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 16/32] include: move TFR to osdep.h marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 18/32] include: move qemu_pipe() " marcandre.lureau
` (15 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Closer to other IO functions.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 3 ---
include/qemu/osdep.h | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index db8b03be51f3..c6f3ed94bc7e 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,9 +24,6 @@
int qemu_main(int argc, char **argv, char **envp);
#endif
-ssize_t qemu_write_full(int fd, const void *buf, size_t count)
- G_GNUC_WARN_UNUSED_RESULT;
-
#ifndef _WIN32
int qemu_pipe(int pipefd[2]);
#endif
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 489a5d1aad5f..259436ff5371 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -527,6 +527,9 @@ static inline void qemu_timersub(const struct timeval *val1,
#define qemu_timersub timersub
#endif
+ssize_t qemu_write_full(int fd, const void *buf, size_t count)
+ G_GNUC_WARN_UNUSED_RESULT;
+
void qemu_set_cloexec(int fd);
void fips_set_state(bool requested);
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 18/32] include: move qemu_pipe() to osdep.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (16 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 17/32] include: move qemu_write_full() declaration " marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 19/32] include: move coroutine IO functions to coroutine.h marcandre.lureau
` (14 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 4 ----
include/qemu/osdep.h | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index c6f3ed94bc7e..2e1e76014a5f 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,10 +24,6 @@
int qemu_main(int argc, char **argv, char **envp);
#endif
-#ifndef _WIN32
-int qemu_pipe(int pipefd[2]);
-#endif
-
void cpu_exec_init_all(void);
void cpu_exec_step_atomic(CPUState *cpu);
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 259436ff5371..a7332947107a 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -530,6 +530,10 @@ static inline void qemu_timersub(const struct timeval *val1,
ssize_t qemu_write_full(int fd, const void *buf, size_t count)
G_GNUC_WARN_UNUSED_RESULT;
+#ifndef _WIN32
+int qemu_pipe(int pipefd[2]);
+#endif
+
void qemu_set_cloexec(int fd);
void fips_set_state(bool requested);
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 19/32] include: move coroutine IO functions to coroutine.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (17 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 18/32] include: move qemu_pipe() " marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 20/32] include: move dump_in_progress() to runstate.h marcandre.lureau
` (13 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Marc-André Lureau, Stefan Hajnoczi
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 23 -----------------------
include/qemu/coroutine.h | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 2e1e76014a5f..fdb0b16166a5 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -45,29 +45,6 @@ bool set_preferred_target_page_bits(int bits);
*/
void finalize_target_page_bits(void);
-/**
- * Sends a (part of) iovec down a socket, yielding when the socket is full, or
- * Receives data into a (part of) iovec from a socket,
- * yielding when there is no data in the socket.
- * The same interface as qemu_sendv_recvv(), with added yielding.
- * XXX should mark these as coroutine_fn
- */
-ssize_t qemu_co_sendv_recvv(int sockfd, struct iovec *iov, unsigned iov_cnt,
- size_t offset, size_t bytes, bool do_send);
-#define qemu_co_recvv(sockfd, iov, iov_cnt, offset, bytes) \
- qemu_co_sendv_recvv(sockfd, iov, iov_cnt, offset, bytes, false)
-#define qemu_co_sendv(sockfd, iov, iov_cnt, offset, bytes) \
- qemu_co_sendv_recvv(sockfd, iov, iov_cnt, offset, bytes, true)
-
-/**
- * The same as above, but with just a single buffer
- */
-ssize_t qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send);
-#define qemu_co_recv(sockfd, buf, bytes) \
- qemu_co_send_recv(sockfd, buf, bytes, false)
-#define qemu_co_send(sockfd, buf, bytes) \
- qemu_co_send_recv(sockfd, buf, bytes, true)
-
void qemu_progress_init(int enabled, float min_skip);
void qemu_progress_end(void);
void qemu_progress_print(float delta, int max);
diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index c828a95ee092..284571badb8a 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -343,4 +343,27 @@ void qemu_coroutine_decrease_pool_batch_size(unsigned int additional_pool_size);
#include "qemu/lockable.h"
+/**
+ * Sends a (part of) iovec down a socket, yielding when the socket is full, or
+ * Receives data into a (part of) iovec from a socket,
+ * yielding when there is no data in the socket.
+ * The same interface as qemu_sendv_recvv(), with added yielding.
+ * XXX should mark these as coroutine_fn
+ */
+ssize_t qemu_co_sendv_recvv(int sockfd, struct iovec *iov, unsigned iov_cnt,
+ size_t offset, size_t bytes, bool do_send);
+#define qemu_co_recvv(sockfd, iov, iov_cnt, offset, bytes) \
+ qemu_co_sendv_recvv(sockfd, iov, iov_cnt, offset, bytes, false)
+#define qemu_co_sendv(sockfd, iov, iov_cnt, offset, bytes) \
+ qemu_co_sendv_recvv(sockfd, iov, iov_cnt, offset, bytes, true)
+
+/**
+ * The same as above, but with just a single buffer
+ */
+ssize_t qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send);
+#define qemu_co_recv(sockfd, buf, bytes) \
+ qemu_co_send_recv(sockfd, buf, bytes, false)
+#define qemu_co_send(sockfd, buf, bytes) \
+ qemu_co_send_recv(sockfd, buf, bytes, true)
+
#endif /* QEMU_COROUTINE_H */
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 20/32] include: move dump_in_progress() to runstate.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (18 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 19/32] include: move coroutine IO functions to coroutine.h marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-04-06 8:45 ` Markus Armbruster
2022-03-23 15:57 ` [PATCH 21/32] include: move C/util-related declarations to cutils.h marcandre.lureau
` (12 subsequent siblings)
32 siblings, 1 reply; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Markus Armbruster, Paolo Bonzini
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Along with other state tracking functions. Rename it for consistency.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 4 ----
include/sysemu/runstate.h | 1 +
dump/dump.c | 4 ++--
monitor/qmp-cmds.c | 4 ++--
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index fdb0b16166a5..5f53a0e11287 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -76,8 +76,4 @@ int parse_debug_env(const char *name, int max, int initial);
void page_size_init(void);
-/* returns non-zero if dump is in progress, otherwise zero is
- * returned. */
-bool dump_in_progress(void);
-
#endif
diff --git a/include/sysemu/runstate.h b/include/sysemu/runstate.h
index a53569157343..c3f445dd2683 100644
--- a/include/sysemu/runstate.h
+++ b/include/sysemu/runstate.h
@@ -69,6 +69,7 @@ void qemu_system_killed(int signal, pid_t pid);
void qemu_system_reset(ShutdownCause reason);
void qemu_system_guest_panicked(GuestPanicInformation *info);
void qemu_system_guest_crashloaded(GuestPanicInformation *info);
+bool qemu_system_dump_in_progress(void);
#endif
diff --git a/dump/dump.c b/dump/dump.c
index f57ed76fa76d..5d71c47d06aa 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -1564,7 +1564,7 @@ static void dump_state_prepare(DumpState *s)
*s = (DumpState) { .status = DUMP_STATUS_ACTIVE };
}
-bool dump_in_progress(void)
+bool qemu_system_dump_in_progress(void)
{
DumpState *state = &dump_state_global;
return (qatomic_read(&state->status) == DUMP_STATUS_ACTIVE);
@@ -1930,7 +1930,7 @@ void qmp_dump_guest_memory(bool paging, const char *file,
/* if there is a dump in background, we should wait until the dump
* finished */
- if (dump_in_progress()) {
+ if (qemu_system_dump_in_progress()) {
error_setg(errp, "There is a dump in process, please wait.");
return;
}
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 0b04855ce899..883cf1ca4bbf 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -85,7 +85,7 @@ void qmp_stop(Error **errp)
{
/* if there is a dump in background, we should wait until the dump
* finished */
- if (dump_in_progress()) {
+ if (qemu_system_dump_in_progress()) {
error_setg(errp, "There is a dump in process, please wait.");
return;
}
@@ -115,7 +115,7 @@ void qmp_cont(Error **errp)
/* if there is a dump in background, we should wait until the dump
* finished */
- if (dump_in_progress()) {
+ if (qemu_system_dump_in_progress()) {
error_setg(errp, "There is a dump in process, please wait.");
return;
}
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 20/32] include: move dump_in_progress() to runstate.h
2022-03-23 15:57 ` [PATCH 20/32] include: move dump_in_progress() to runstate.h marcandre.lureau
@ 2022-04-06 8:45 ` Markus Armbruster
0 siblings, 0 replies; 79+ messages in thread
From: Markus Armbruster @ 2022-04-06 8:45 UTC (permalink / raw)
To: marcandre.lureau; +Cc: Paolo Bonzini, qemu-devel
marcandre.lureau@redhat.com writes:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Along with other state tracking functions. Rename it for consistency.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> include/qemu-common.h | 4 ----
> include/sysemu/runstate.h | 1 +
> dump/dump.c | 4 ++--
> monitor/qmp-cmds.c | 4 ++--
> 4 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index fdb0b16166a5..5f53a0e11287 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -76,8 +76,4 @@ int parse_debug_env(const char *name, int max, int initial);
>
> void page_size_init(void);
>
> -/* returns non-zero if dump is in progress, otherwise zero is
> - * returned. */
> -bool dump_in_progress(void);
> -
> #endif
> diff --git a/include/sysemu/runstate.h b/include/sysemu/runstate.h
> index a53569157343..c3f445dd2683 100644
> --- a/include/sysemu/runstate.h
> +++ b/include/sysemu/runstate.h
> @@ -69,6 +69,7 @@ void qemu_system_killed(int signal, pid_t pid);
> void qemu_system_reset(ShutdownCause reason);
> void qemu_system_guest_panicked(GuestPanicInformation *info);
> void qemu_system_guest_crashloaded(GuestPanicInformation *info);
> +bool qemu_system_dump_in_progress(void);
>
> #endif
>
include/sysemu/dump.h would also work, I think. Perhaps Paolo has a
preference.
> diff --git a/dump/dump.c b/dump/dump.c
> index f57ed76fa76d..5d71c47d06aa 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -1564,7 +1564,7 @@ static void dump_state_prepare(DumpState *s)
> *s = (DumpState) { .status = DUMP_STATUS_ACTIVE };
> }
>
> -bool dump_in_progress(void)
> +bool qemu_system_dump_in_progress(void)
> {
> DumpState *state = &dump_state_global;
> return (qatomic_read(&state->status) == DUMP_STATUS_ACTIVE);
> @@ -1930,7 +1930,7 @@ void qmp_dump_guest_memory(bool paging, const char *file,
>
> /* if there is a dump in background, we should wait until the dump
> * finished */
> - if (dump_in_progress()) {
> + if (qemu_system_dump_in_progress()) {
> error_setg(errp, "There is a dump in process, please wait.");
> return;
> }
> diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
> index 0b04855ce899..883cf1ca4bbf 100644
> --- a/monitor/qmp-cmds.c
> +++ b/monitor/qmp-cmds.c
> @@ -85,7 +85,7 @@ void qmp_stop(Error **errp)
> {
> /* if there is a dump in background, we should wait until the dump
> * finished */
> - if (dump_in_progress()) {
> + if (qemu_system_dump_in_progress()) {
> error_setg(errp, "There is a dump in process, please wait.");
> return;
> }
> @@ -115,7 +115,7 @@ void qmp_cont(Error **errp)
>
> /* if there is a dump in background, we should wait until the dump
> * finished */
> - if (dump_in_progress()) {
> + if (qemu_system_dump_in_progress()) {
> error_setg(errp, "There is a dump in process, please wait.");
> return;
> }
Reviewed-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 21/32] include: move C/util-related declarations to cutils.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (19 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 20/32] include: move dump_in_progress() to runstate.h marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 22/32] include: move cpu_exec* declarations to cpu-common.h marcandre.lureau
` (11 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Peter Maydell, Thomas Huth, Michael S. Tsirkin,
Jason Wang, Alistair Francis, Havard Skinnemoen, Tyrone Ting,
Paolo Bonzini, Gerd Hoffmann, open list:Xilinx ZynqMP and...,
Edgar E. Iglesias, Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 20 --------------------
include/qemu/cutils.h | 20 ++++++++++++++++++++
hw/dma/xlnx_dpdma.c | 2 +-
hw/usb/ccid-card-passthru.c | 2 +-
hw/usb/dev-smartcard-reader.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/virtio/vhost-vdpa.c | 2 +-
net/announce.c | 2 +-
tests/qtest/npcm7xx_rng-test.c | 2 +-
util/hexdump.c | 2 +-
10 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 5f53a0e11287..08f40a9d1ed3 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -54,26 +54,6 @@ const char *qemu_get_vm_name(void);
void os_setup_early_signal_handling(void);
int os_parse_cmd_args(int index, const char *optarg);
-/*
- * Hexdump a line of a byte buffer into a hexadecimal/ASCII buffer
- */
-#define QEMU_HEXDUMP_LINE_BYTES 16 /* Number of bytes to dump */
-#define QEMU_HEXDUMP_LINE_LEN 75 /* Number of characters in line */
-void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr,
- unsigned int len, bool ascii);
-
-/*
- * Hexdump a buffer to a file. An optional string prefix is added to every line
- */
-
-void qemu_hexdump(FILE *fp, const char *prefix,
- const void *bufptr, size_t size);
-
-/*
- * helper to parse debug environment variables
- */
-int parse_debug_env(const char *name, int max, int initial);
-
void page_size_init(void);
#endif
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index 320543950c4c..2137e6526087 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -214,4 +214,24 @@ static inline const char *yes_no(bool b)
return b ? "yes" : "no";
}
+/*
+ * helper to parse debug environment variables
+ */
+int parse_debug_env(const char *name, int max, int initial);
+
+/*
+ * Hexdump a line of a byte buffer into a hexadecimal/ASCII buffer
+ */
+#define QEMU_HEXDUMP_LINE_BYTES 16 /* Number of bytes to dump */
+#define QEMU_HEXDUMP_LINE_LEN 75 /* Number of characters in line */
+void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr,
+ unsigned int len, bool ascii);
+
+/*
+ * Hexdump a buffer to a file. An optional string prefix is added to every line
+ */
+
+void qemu_hexdump(FILE *fp, const char *prefix,
+ const void *bufptr, size_t size);
+
#endif
diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c
index 2d7eae72cd23..dd66be5265df 100644
--- a/hw/dma/xlnx_dpdma.c
+++ b/hw/dma/xlnx_dpdma.c
@@ -23,7 +23,7 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/cutils.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "hw/dma/xlnx_dpdma.h"
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index fa3040fb7154..f530ab2565cb 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -9,7 +9,7 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/cutils.h"
#include "qemu/units.h"
#include <libcacard.h>
#include "chardev/char-fe.h"
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 91ffd9f8ae8d..28164d89be27 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -37,7 +37,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "hw/qdev-properties.h"
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 8692ea256109..3bc4dee7fed9 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -26,7 +26,7 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/cutils.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/timer.h"
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 2075f336e2ad..b25c8ef799a7 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -20,10 +20,10 @@
#include "hw/virtio/vhost-shadow-virtqueue.h"
#include "hw/virtio/vhost-vdpa.h"
#include "exec/address-spaces.h"
+#include "qemu/cutils.h"
#include "qemu/main-loop.h"
#include "cpu.h"
#include "trace.h"
-#include "qemu-common.h"
#include "qapi/error.h"
/*
diff --git a/net/announce.c b/net/announce.c
index 3b9e2f1f14e8..62c60192a3cf 100644
--- a/net/announce.c
+++ b/net/announce.c
@@ -7,7 +7,7 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/cutils.h"
#include "net/announce.h"
#include "net/net.h"
#include "qapi/clone-visitor.h"
diff --git a/tests/qtest/npcm7xx_rng-test.c b/tests/qtest/npcm7xx_rng-test.c
index 797f832e53a1..35b1c1f5f6d2 100644
--- a/tests/qtest/npcm7xx_rng-test.c
+++ b/tests/qtest/npcm7xx_rng-test.c
@@ -20,7 +20,7 @@
#include "libqtest-single.h"
#include "qemu/bitops.h"
-#include "qemu-common.h"
+#include "qemu/cutils.h"
#define RNG_BASE_ADDR 0xf000b000
diff --git a/util/hexdump.c b/util/hexdump.c
index 2c105a884620..9921114b3c75 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -14,7 +14,7 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/cutils.h"
void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr,
unsigned int len, bool ascii)
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 22/32] include: move cpu_exec* declarations to cpu-common.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (20 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 21/32] include: move C/util-related declarations to cutils.h marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 23/32] include: move target page bits declaration to page-vary.h marcandre.lureau
` (10 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Richard Henderson, Paolo Bonzini
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/exec/cpu-common.h | 3 +++
include/qemu-common.h | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 5979fc1f8e1b..5968551a0556 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -19,6 +19,9 @@ typedef uint64_t vaddr;
#define VADDR_PRIX PRIX64
#define VADDR_MAX UINT64_MAX
+void cpu_exec_init_all(void);
+void cpu_exec_step_atomic(CPUState *cpu);
+
/* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
* when intptr_t is 32-bit and we are aligning a long long.
*/
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 08f40a9d1ed3..ced260d08be0 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,9 +24,6 @@
int qemu_main(int argc, char **argv, char **envp);
#endif
-void cpu_exec_init_all(void);
-void cpu_exec_step_atomic(CPUState *cpu);
-
/**
* set_preferred_target_page_bits:
* @bits: number of bits needed to represent an address within the page
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 23/32] include: move target page bits declaration to page-vary.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (21 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 22/32] include: move cpu_exec* declarations to cpu-common.h marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 18:29 ` Richard Henderson
2022-03-23 15:57 ` [PATCH 24/32] include: move progress API to qemu-progress.h marcandre.lureau
` (9 subsequent siblings)
32 siblings, 1 reply; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, David Hildenbrand, Richard Henderson,
Philippe Mathieu-Daudé,
Peter Xu, open list:ARM TCG CPUs, Paolo Bonzini,
Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Since the implementation unit is page-vary.c.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/exec/page-vary.h | 18 ++++++++++++++++++
include/qemu-common.h | 17 -----------------
page-vary.c | 2 +-
softmmu/physmem.c | 2 +-
softmmu/vl.c | 1 +
target/arm/cpu.c | 2 +-
6 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/include/exec/page-vary.h b/include/exec/page-vary.h
index c22a7a742e7c..ebbe9b169b8f 100644
--- a/include/exec/page-vary.h
+++ b/include/exec/page-vary.h
@@ -31,4 +31,22 @@ extern bool set_preferred_target_page_bits_common(int bits);
extern void finalize_target_page_bits_common(int min);
#endif
+/**
+ * set_preferred_target_page_bits:
+ * @bits: number of bits needed to represent an address within the page
+ *
+ * Set the preferred target page size (the actual target page
+ * size may be smaller than any given CPU's preference).
+ * Returns true on success, false on failure (which can only happen
+ * if this is called after the system has already finalized its
+ * choice of page size and the requested page size is smaller than that).
+ */
+bool set_preferred_target_page_bits(int bits);
+
+/**
+ * finalize_target_page_bits:
+ * Commit the final value set by set_preferred_target_page_bits.
+ */
+void finalize_target_page_bits(void);
+
#endif /* EXEC_PAGE_VARY_H */
diff --git a/include/qemu-common.h b/include/qemu-common.h
index ced260d08be0..bc73daecb4e9 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,23 +24,6 @@
int qemu_main(int argc, char **argv, char **envp);
#endif
-/**
- * set_preferred_target_page_bits:
- * @bits: number of bits needed to represent an address within the page
- *
- * Set the preferred target page size (the actual target page
- * size may be smaller than any given CPU's preference).
- * Returns true on success, false on failure (which can only happen
- * if this is called after the system has already finalized its
- * choice of page size and the requested page size is smaller than that).
- */
-bool set_preferred_target_page_bits(int bits);
-
-/**
- * finalize_target_page_bits:
- * Commit the final value set by set_preferred_target_page_bits.
- */
-void finalize_target_page_bits(void);
void qemu_progress_init(int enabled, float min_skip);
void qemu_progress_end(void);
diff --git a/page-vary.c b/page-vary.c
index 057c7f181521..343b4adb95a5 100644
--- a/page-vary.c
+++ b/page-vary.c
@@ -20,7 +20,7 @@
#define IN_PAGE_VARY 1
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "exec/page-vary.h"
#include "exec/exec-all.h"
bool set_preferred_target_page_bits(int bits)
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index cdf0db733e57..657841eed0cf 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -18,7 +18,7 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "exec/page-vary.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 6f646531a0ae..46aba6a039c4 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -27,6 +27,7 @@
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "exec/cpu-common.h"
+#include "exec/page-vary.h"
#include "hw/qdev-properties.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 0980d3390112..3609de088827 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -22,7 +22,7 @@
#include "qemu/qemu-print.h"
#include "qemu/timer.h"
#include "qemu/log.h"
-#include "qemu-common.h"
+#include "exec/page-vary.h"
#include "target/arm/idau.h"
#include "qemu/module.h"
#include "qapi/error.h"
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 23/32] include: move target page bits declaration to page-vary.h
2022-03-23 15:57 ` [PATCH 23/32] include: move target page bits declaration to page-vary.h marcandre.lureau
@ 2022-03-23 18:29 ` Richard Henderson
0 siblings, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 18:29 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
Cc: Peter Maydell, David Hildenbrand, Philippe Mathieu-Daudé,
Peter Xu, open list:ARM TCG CPUs, Paolo Bonzini
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> Since the implementation unit is page-vary.c.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> ---
> include/exec/page-vary.h | 18 ++++++++++++++++++
> include/qemu-common.h | 17 -----------------
> page-vary.c | 2 +-
> softmmu/physmem.c | 2 +-
> softmmu/vl.c | 1 +
> target/arm/cpu.c | 2 +-
> 6 files changed, 22 insertions(+), 20 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 24/32] include: move progress API to qemu-progress.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (22 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 23/32] include: move target page bits declaration to page-vary.h marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 18:30 ` Richard Henderson
2022-03-23 15:57 ` [PATCH 25/32] include: move qemu_get_vm_name() to sysemu.h marcandre.lureau
` (8 subsequent siblings)
32 siblings, 1 reply; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, Marc-André Lureau, Hanna Reitz,
open list:Block layer core
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 4 ----
include/qemu/qemu-progress.h | 8 ++++++++
qemu-img.c | 1 +
util/qemu-progress.c | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 include/qemu/qemu-progress.h
diff --git a/include/qemu-common.h b/include/qemu-common.h
index bc73daecb4e9..fee2181af218 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,10 +24,6 @@
int qemu_main(int argc, char **argv, char **envp);
#endif
-
-void qemu_progress_init(int enabled, float min_skip);
-void qemu_progress_end(void);
-void qemu_progress_print(float delta, int max);
const char *qemu_get_vm_name(void);
/* OS specific functions */
diff --git a/include/qemu/qemu-progress.h b/include/qemu/qemu-progress.h
new file mode 100644
index 000000000000..137e1c316fd0
--- /dev/null
+++ b/include/qemu/qemu-progress.h
@@ -0,0 +1,8 @@
+#ifndef QEMU_PROGRESS_H
+#define QEMU_PROGRESS_H
+
+void qemu_progress_init(int enabled, float min_skip);
+void qemu_progress_end(void);
+void qemu_progress_print(float delta, int max);
+
+#endif /* QEMU_PROGRESS_H */
diff --git a/qemu-img.c b/qemu-img.c
index 1caddfb23a71..13cb2ec72fbd 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -26,6 +26,7 @@
#include <getopt.h>
#include "qemu-common.h"
+#include "qemu/qemu-progress.h"
#include "qemu-version.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-block-core.h"
diff --git a/util/qemu-progress.c b/util/qemu-progress.c
index 20d51f8c128b..aa994668f1c4 100644
--- a/util/qemu-progress.c
+++ b/util/qemu-progress.c
@@ -23,7 +23,7 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/qemu-progress.h"
struct progress_state {
float current;
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 25/32] include: move qemu_get_vm_name() to sysemu.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (23 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 24/32] include: move progress API to qemu-progress.h marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 26/32] include: move os_*() to os-foo.h marcandre.lureau
` (7 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, open list:iSCSI, Peter Lieven, Hanna Reitz,
Gerd Hoffmann, Ronnie Sahlberg, Paolo Bonzini,
Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 2 --
include/sysemu/sysemu.h | 2 ++
audio/audio.c | 2 +-
block/iscsi.c | 2 +-
stubs/get-vm-name.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index fee2181af218..1fbc20e4bcf7 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,8 +24,6 @@
int qemu_main(int argc, char **argv, char **envp);
#endif
-const char *qemu_get_vm_name(void);
-
/* OS specific functions */
void os_setup_early_signal_handling(void);
int os_parse_cmd_args(int index, const char *optarg);
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index b9421e03ffdd..10e283c17064 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -13,6 +13,8 @@ extern const char *qemu_name;
extern QemuUUID qemu_uuid;
extern bool qemu_uuid_set;
+const char *qemu_get_vm_name(void);
+
void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify);
diff --git a/audio/audio.c b/audio/audio.c
index 1c98964eb843..9e91a5a4f2b8 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -32,7 +32,7 @@
#include "qapi/qapi-visit-audio.h"
#include "qemu/cutils.h"
#include "qemu/module.h"
-#include "qemu-common.h"
+#include "sysemu/sysemu.h"
#include "sysemu/replay.h"
#include "sysemu/runstate.h"
#include "ui/qemu-spice.h"
diff --git a/block/iscsi.c b/block/iscsi.c
index 51f2a5eeaa80..d707d0b35435 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -28,7 +28,7 @@
#include <poll.h>
#include <math.h>
#include <arpa/inet.h>
-#include "qemu-common.h"
+#include "sysemu/sysemu.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "qemu/bitops.h"
diff --git a/stubs/get-vm-name.c b/stubs/get-vm-name.c
index fa990136b068..0906303f7306 100644
--- a/stubs/get-vm-name.c
+++ b/stubs/get-vm-name.c
@@ -1,5 +1,5 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "sysemu/sysemu.h"
const char *qemu_get_vm_name(void)
{
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 26/32] include: move os_*() to os-foo.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (24 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 25/32] include: move qemu_get_vm_name() to sysemu.h marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 18:31 ` Richard Henderson
2022-03-23 21:11 ` Philippe Mathieu-Daudé
2022-03-23 15:57 ` [PATCH 27/32] include: move page_size_init() to include/hw/core/cpu.h marcandre.lureau
` (6 subsequent siblings)
32 siblings, 2 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Stefan Weil, Paolo Bonzini
From: Marc-André Lureau <marcandre.lureau@redhat.com>
For consistency with other os_ functions that do not have POSIX
implementation, declare an inline function for the stub in os-win32.h.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 4 ----
include/sysemu/os-posix.h | 2 ++
include/sysemu/os-win32.h | 4 +++-
os-win32.c | 9 ---------
4 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 1fbc20e4bcf7..a271cac66a1b 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,10 +24,6 @@
int qemu_main(int argc, char **argv, char **envp);
#endif
-/* OS specific functions */
-void os_setup_early_signal_handling(void);
-int os_parse_cmd_args(int index, const char *optarg);
-
void page_size_init(void);
#endif
diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h
index dd64fb401dfb..a49c6848ff1a 100644
--- a/include/sysemu/os-posix.h
+++ b/include/sysemu/os-posix.h
@@ -42,7 +42,9 @@
extern "C" {
#endif
+int os_parse_cmd_args(int index, const char *optarg);
void os_set_line_buffering(void);
+void os_setup_early_signal_handling(void);
void os_set_proc_name(const char *s);
void os_setup_signal_handling(void);
void os_daemonize(void);
diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h
index 770752222ae3..c0ba65389986 100644
--- a/include/sysemu/os-win32.h
+++ b/include/sysemu/os-win32.h
@@ -62,8 +62,10 @@ struct tm *localtime_r(const time_t *timep, struct tm *result);
static inline void os_setup_signal_handling(void) {}
static inline void os_daemonize(void) {}
static inline void os_setup_post(void) {}
-void os_set_line_buffering(void);
static inline void os_set_proc_name(const char *dummy) {}
+static inline int os_parse_cmd_args(int index, const char *optarg) { return -1; }
+void os_set_line_buffering(void);
+void os_setup_early_signal_handling(void);
int getpagesize(void);
diff --git a/os-win32.c b/os-win32.c
index e31c921983b4..6f21b578417c 100644
--- a/os-win32.c
+++ b/os-win32.c
@@ -61,12 +61,3 @@ void os_set_line_buffering(void)
setbuf(stdout, NULL);
setbuf(stderr, NULL);
}
-
-/*
- * Parse OS specific command line options.
- * return 0 if option handled, -1 otherwise
- */
-int os_parse_cmd_args(int index, const char *optarg)
-{
- return -1;
-}
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 26/32] include: move os_*() to os-foo.h
2022-03-23 15:57 ` [PATCH 26/32] include: move os_*() to os-foo.h marcandre.lureau
@ 2022-03-23 18:31 ` Richard Henderson
2022-03-23 21:11 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 18:31 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: Stefan Weil, Paolo Bonzini
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> For consistency with other os_ functions that do not have POSIX
> implementation, declare an inline function for the stub in os-win32.h.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> ---
> include/qemu-common.h | 4 ----
> include/sysemu/os-posix.h | 2 ++
> include/sysemu/os-win32.h | 4 +++-
> os-win32.c | 9 ---------
> 4 files changed, 5 insertions(+), 14 deletions(-)
This does two things, and should be split.
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PATCH 26/32] include: move os_*() to os-foo.h
2022-03-23 15:57 ` [PATCH 26/32] include: move os_*() to os-foo.h marcandre.lureau
2022-03-23 18:31 ` Richard Henderson
@ 2022-03-23 21:11 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 79+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-23 21:11 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: Stefan Weil, Paolo Bonzini
On 23/3/22 16:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> For consistency with other os_ functions that do not have POSIX
> implementation, declare an inline function for the stub in os-win32.h.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> include/qemu-common.h | 4 ----
> include/sysemu/os-posix.h | 2 ++
> include/sysemu/os-win32.h | 4 +++-
> os-win32.c | 9 ---------
> 4 files changed, 5 insertions(+), 14 deletions(-)
>
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index 1fbc20e4bcf7..a271cac66a1b 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -24,10 +24,6 @@
> int qemu_main(int argc, char **argv, char **envp);
> #endif
>
> -/* OS specific functions */
> -void os_setup_early_signal_handling(void);
> -int os_parse_cmd_args(int index, const char *optarg);
> -
> void page_size_init(void);
>
> #endif
> diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h
> index dd64fb401dfb..a49c6848ff1a 100644
> --- a/include/sysemu/os-posix.h
> +++ b/include/sysemu/os-posix.h
> @@ -42,7 +42,9 @@
> extern "C" {
> #endif
>
> +int os_parse_cmd_args(int index, const char *optarg);
> void os_set_line_buffering(void);
> +void os_setup_early_signal_handling(void);
> void os_set_proc_name(const char *s);
> void os_setup_signal_handling(void);
> void os_daemonize(void);
> diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h
> index 770752222ae3..c0ba65389986 100644
> --- a/include/sysemu/os-win32.h
> +++ b/include/sysemu/os-win32.h
> @@ -62,8 +62,10 @@ struct tm *localtime_r(const time_t *timep, struct tm *result);
> static inline void os_setup_signal_handling(void) {}
> static inline void os_daemonize(void) {}
> static inline void os_setup_post(void) {}
> -void os_set_line_buffering(void);
> static inline void os_set_proc_name(const char *dummy) {}
> +static inline int os_parse_cmd_args(int index, const char *optarg) { return -1; }
> +void os_set_line_buffering(void);
> +void os_setup_early_signal_handling(void);
By declaring the same prototype in various headers, we risk someone
update only one implementation. Maybe we need a "os-common.h" header?
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 27/32] include: move page_size_init() to include/hw/core/cpu.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (25 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 26/32] include: move os_*() to os-foo.h marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` marcandre.lureau
` (5 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Marc-André Lureau, Yanan Wang,
Philippe Mathieu-Daudé
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/hw/core/cpu.h | 2 ++
include/qemu-common.h | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 13adb251b2ab..466bed604727 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -1035,6 +1035,8 @@ void cpu_exec_unrealizefn(CPUState *cpu);
*/
bool target_words_bigendian(void);
+void page_size_init(void);
+
#ifdef NEED_CPU_H
#ifdef CONFIG_SOFTMMU
diff --git a/include/qemu-common.h b/include/qemu-common.h
index a271cac66a1b..65483f70d4fe 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,6 +24,4 @@
int qemu_main(int argc, char **argv, char **envp);
#endif
-void page_size_init(void);
-
#endif
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 28/32] Move CPU softfloat unions to cpu-float.h
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 02/32] meson: add util dependency for oslib-posix on freebsd marcandre.lureau
` (31 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, David Hildenbrand, Bin Meng, Mark Cave-Ayland,
Max Filippov, Alistair Francis, Edgar E. Iglesias,
Yoshinori Sato, Juan Quintela, Daniel Henrique Barboza,
Marc-André Lureau, Artyom Tarasenko, Thomas Huth,
Richard Henderson, Dr. David Alan Gilbert, Greg Kurz,
open list:S390 TCG CPUs, open list:ARM TCG CPUs,
Cédric Le Goater, open list:PowerPC TCG CPUs,
Stafford Horne, David Gibson, open list:RISC-V TCG CPUs,
Bastian Koppelmann, Cornelia Huck, Laurent Vivier,
Palmer Dabbelt
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The types are no longer used in bswap.h since commit
f930224fffe ("bswap.h: Remove unused float-access functions"), there
isn't much sense in keeping it there and having a dependency on fpu/.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu/bswap.h | 60 ------------------------------------
include/qemu/cpu-float.h | 64 +++++++++++++++++++++++++++++++++++++++
target/alpha/cpu.h | 1 +
target/arm/cpu.h | 1 +
target/hppa/cpu.h | 1 +
target/i386/cpu.h | 1 +
target/m68k/cpu.h | 1 +
target/microblaze/cpu.h | 2 +-
target/openrisc/cpu.h | 1 +
target/ppc/cpu.h | 1 +
target/riscv/cpu.h | 2 +-
target/rx/cpu.h | 1 +
target/s390x/cpu.h | 1 +
target/sh4/cpu.h | 1 +
target/sparc/cpu.h | 1 +
target/tricore/cpu.h | 1 +
target/xtensa/cpu.h | 1 +
migration/vmstate-types.c | 1 +
18 files changed, 80 insertions(+), 62 deletions(-)
create mode 100644 include/qemu/cpu-float.h
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 9dff7c7dbbc9..346d05f2aab3 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -19,8 +19,6 @@
extern "C" {
#endif
-#include "fpu/softfloat-types.h"
-
#ifdef BSWAP_FROM_BYTESWAP
static inline uint16_t bswap16(uint16_t x)
{
@@ -202,64 +200,6 @@ CPU_CONVERT(le, 64, uint64_t)
# define const_le16(_x) (_x)
#endif
-/* Unions for reinterpreting between floats and integers. */
-
-typedef union {
- float32 f;
- uint32_t l;
-} CPU_FloatU;
-
-typedef union {
- float64 d;
-#if HOST_BIG_ENDIAN
- struct {
- uint32_t upper;
- uint32_t lower;
- } l;
-#else
- struct {
- uint32_t lower;
- uint32_t upper;
- } l;
-#endif
- uint64_t ll;
-} CPU_DoubleU;
-
-typedef union {
- floatx80 d;
- struct {
- uint64_t lower;
- uint16_t upper;
- } l;
-} CPU_LDoubleU;
-
-typedef union {
- float128 q;
-#if HOST_BIG_ENDIAN
- struct {
- uint32_t upmost;
- uint32_t upper;
- uint32_t lower;
- uint32_t lowest;
- } l;
- struct {
- uint64_t upper;
- uint64_t lower;
- } ll;
-#else
- struct {
- uint32_t lowest;
- uint32_t lower;
- uint32_t upper;
- uint32_t upmost;
- } l;
- struct {
- uint64_t lower;
- uint64_t upper;
- } ll;
-#endif
-} CPU_QuadU;
-
/* unaligned/endian-independent pointer access */
/*
diff --git a/include/qemu/cpu-float.h b/include/qemu/cpu-float.h
new file mode 100644
index 000000000000..911099499ffb
--- /dev/null
+++ b/include/qemu/cpu-float.h
@@ -0,0 +1,64 @@
+#ifndef QEMU_CPU_FLOAT_H_
+#define QEMU_CPU_FLOAT_H_
+
+#include "fpu/softfloat-types.h"
+
+/* Unions for reinterpreting between floats and integers. */
+
+typedef union {
+ float32 f;
+ uint32_t l;
+} CPU_FloatU;
+
+typedef union {
+ float64 d;
+#if HOST_BIG_ENDIAN
+ struct {
+ uint32_t upper;
+ uint32_t lower;
+ } l;
+#else
+ struct {
+ uint32_t lower;
+ uint32_t upper;
+ } l;
+#endif
+ uint64_t ll;
+} CPU_DoubleU;
+
+typedef union {
+ floatx80 d;
+ struct {
+ uint64_t lower;
+ uint16_t upper;
+ } l;
+} CPU_LDoubleU;
+
+typedef union {
+ float128 q;
+#if HOST_BIG_ENDIAN
+ struct {
+ uint32_t upmost;
+ uint32_t upper;
+ uint32_t lower;
+ uint32_t lowest;
+ } l;
+ struct {
+ uint64_t upper;
+ uint64_t lower;
+ } ll;
+#else
+ struct {
+ uint32_t lowest;
+ uint32_t lower;
+ uint32_t upper;
+ uint32_t upmost;
+ } l;
+ struct {
+ uint64_t lower;
+ uint64_t upper;
+ } ll;
+#endif
+} CPU_QuadU;
+
+#endif /* QEMU_CPU_FLOAT_H_ */
diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h
index 58f00b7814fd..994a018b910d 100644
--- a/target/alpha/cpu.h
+++ b/target/alpha/cpu.h
@@ -22,6 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
/* Alpha processors have a weak memory model */
#define TCG_GUEST_DEFAULT_MO (0)
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index ccf635ac5cbc..cb5359a74702 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -21,6 +21,7 @@
#define ARM_CPU_H
#include "kvm-consts.h"
+#include "qemu/cpu-float.h"
#include "hw/registerfields.h"
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index 4cc936b6bfda..c43b93a68f14 100644
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -22,6 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
/* PA-RISC 1.x processors have a strong memory model. */
/* ??? While we do not yet implement PA-RISC 2.0, those processors have
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 5124c1e307b5..796e2cf6d664 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -25,6 +25,7 @@
#include "kvm/hyperv-proto.h"
#include "exec/cpu-defs.h"
#include "qapi/qapi-types-common.h"
+#include "qemu/cpu-float.h"
/* The x86 has a strong memory model with some store-after-load re-ordering */
#define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD)
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 872e8ce63758..9b3bf7a44819 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -22,6 +22,7 @@
#define M68K_CPU_H
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
#include "cpu-qom.h"
#define OS_BYTE 0
diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h
index 0a0ce71b6a5c..67aa88b8db5b 100644
--- a/target/microblaze/cpu.h
+++ b/target/microblaze/cpu.h
@@ -22,7 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
-#include "fpu/softfloat-types.h"
+#include "qemu/cpu-float.h"
typedef struct CPUArchState CPUMBState;
#if !defined(CONFIG_USER_ONLY)
diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h
index bdf29d2dc4c3..b9584f10d452 100644
--- a/target/openrisc/cpu.h
+++ b/target/openrisc/cpu.h
@@ -21,6 +21,7 @@
#define OPENRISC_CPU_H
#include "exec/cpu-defs.h"
+#include "fpu/softfloat-types.h"
#include "hw/core/cpu.h"
#include "qom/object.h"
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 627e574127ba..473436a49eb5 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -21,6 +21,7 @@
#define PPC_CPU_H
#include "qemu/int128.h"
+#include "qemu/cpu-float.h"
#include "exec/cpu-defs.h"
#include "cpu-qom.h"
#include "qom/object.h"
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index c069fe85fa1b..e1d976bdef06 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -23,7 +23,7 @@
#include "hw/core/cpu.h"
#include "hw/registerfields.h"
#include "exec/cpu-defs.h"
-#include "fpu/softfloat-types.h"
+#include "qemu/cpu-float.h"
#include "qom/object.h"
#include "qemu/int128.h"
#include "cpu_bits.h"
diff --git a/target/rx/cpu.h b/target/rx/cpu.h
index b4abd90ccd1e..1c267f83bfd2 100644
--- a/target/rx/cpu.h
+++ b/target/rx/cpu.h
@@ -24,6 +24,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
/* PSW define */
REG32(PSW, 0)
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index c49c8466e74d..7d6d01325b2d 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -28,6 +28,7 @@
#include "cpu-qom.h"
#include "cpu_models.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
#define ELF_MACHINE_UNAME "S390X"
diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h
index c72a30edfd41..14d490ac4705 100644
--- a/target/sh4/cpu.h
+++ b/target/sh4/cpu.h
@@ -22,6 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
/* CPU Subtypes */
#define SH_CPU_SH7750 (1 << 0)
diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index abb38db6749d..dd9e2f5cdb6a 100644
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -4,6 +4,7 @@
#include "qemu/bswap.h"
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
#if !defined(TARGET_SPARC64)
#define TARGET_DPREGS 16
diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
index 108d6b8288fb..3b9c533a7c3b 100644
--- a/target/tricore/cpu.h
+++ b/target/tricore/cpu.h
@@ -22,6 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
#include "tricore-defs.h"
struct tricore_boot_info;
diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index f10cfabdc35c..71142ea8f453 100644
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -29,6 +29,7 @@
#define XTENSA_CPU_H
#include "cpu-qom.h"
+#include "qemu/cpu-float.h"
#include "exec/cpu-defs.h"
#include "xtensa-isa.h"
diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
index bf4d440308ea..e83bfccb9ecf 100644
--- a/migration/vmstate-types.c
+++ b/migration/vmstate-types.c
@@ -11,6 +11,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cpu-float.h"
#include "qemu-file.h"
#include "migration.h"
#include "migration/vmstate.h"
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 28/32] Move CPU softfloat unions to cpu-float.h
@ 2022-03-23 15:57 ` marcandre.lureau
0 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Juan Quintela, Dr. David Alan Gilbert,
Richard Henderson, Peter Maydell, Laurent Vivier,
Edgar E. Iglesias, Stafford Horne, Cédric Le Goater,
Daniel Henrique Barboza, David Gibson, Greg Kurz, Palmer Dabbelt,
Alistair Francis, Bin Meng, Yoshinori Sato, David Hildenbrand,
Cornelia Huck, Thomas Huth, Mark Cave-Ayland, Artyom Tarasenko,
Bastian Koppelmann, Max Filippov, open list:ARM TCG CPUs,
open list:PowerPC TCG CPUs, open list:RISC-V TCG CPUs,
open list:S390 TCG CPUs
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The types are no longer used in bswap.h since commit
f930224fffe ("bswap.h: Remove unused float-access functions"), there
isn't much sense in keeping it there and having a dependency on fpu/.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu/bswap.h | 60 ------------------------------------
include/qemu/cpu-float.h | 64 +++++++++++++++++++++++++++++++++++++++
target/alpha/cpu.h | 1 +
target/arm/cpu.h | 1 +
target/hppa/cpu.h | 1 +
target/i386/cpu.h | 1 +
target/m68k/cpu.h | 1 +
target/microblaze/cpu.h | 2 +-
target/openrisc/cpu.h | 1 +
target/ppc/cpu.h | 1 +
target/riscv/cpu.h | 2 +-
target/rx/cpu.h | 1 +
target/s390x/cpu.h | 1 +
target/sh4/cpu.h | 1 +
target/sparc/cpu.h | 1 +
target/tricore/cpu.h | 1 +
target/xtensa/cpu.h | 1 +
migration/vmstate-types.c | 1 +
18 files changed, 80 insertions(+), 62 deletions(-)
create mode 100644 include/qemu/cpu-float.h
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 9dff7c7dbbc9..346d05f2aab3 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -19,8 +19,6 @@
extern "C" {
#endif
-#include "fpu/softfloat-types.h"
-
#ifdef BSWAP_FROM_BYTESWAP
static inline uint16_t bswap16(uint16_t x)
{
@@ -202,64 +200,6 @@ CPU_CONVERT(le, 64, uint64_t)
# define const_le16(_x) (_x)
#endif
-/* Unions for reinterpreting between floats and integers. */
-
-typedef union {
- float32 f;
- uint32_t l;
-} CPU_FloatU;
-
-typedef union {
- float64 d;
-#if HOST_BIG_ENDIAN
- struct {
- uint32_t upper;
- uint32_t lower;
- } l;
-#else
- struct {
- uint32_t lower;
- uint32_t upper;
- } l;
-#endif
- uint64_t ll;
-} CPU_DoubleU;
-
-typedef union {
- floatx80 d;
- struct {
- uint64_t lower;
- uint16_t upper;
- } l;
-} CPU_LDoubleU;
-
-typedef union {
- float128 q;
-#if HOST_BIG_ENDIAN
- struct {
- uint32_t upmost;
- uint32_t upper;
- uint32_t lower;
- uint32_t lowest;
- } l;
- struct {
- uint64_t upper;
- uint64_t lower;
- } ll;
-#else
- struct {
- uint32_t lowest;
- uint32_t lower;
- uint32_t upper;
- uint32_t upmost;
- } l;
- struct {
- uint64_t lower;
- uint64_t upper;
- } ll;
-#endif
-} CPU_QuadU;
-
/* unaligned/endian-independent pointer access */
/*
diff --git a/include/qemu/cpu-float.h b/include/qemu/cpu-float.h
new file mode 100644
index 000000000000..911099499ffb
--- /dev/null
+++ b/include/qemu/cpu-float.h
@@ -0,0 +1,64 @@
+#ifndef QEMU_CPU_FLOAT_H_
+#define QEMU_CPU_FLOAT_H_
+
+#include "fpu/softfloat-types.h"
+
+/* Unions for reinterpreting between floats and integers. */
+
+typedef union {
+ float32 f;
+ uint32_t l;
+} CPU_FloatU;
+
+typedef union {
+ float64 d;
+#if HOST_BIG_ENDIAN
+ struct {
+ uint32_t upper;
+ uint32_t lower;
+ } l;
+#else
+ struct {
+ uint32_t lower;
+ uint32_t upper;
+ } l;
+#endif
+ uint64_t ll;
+} CPU_DoubleU;
+
+typedef union {
+ floatx80 d;
+ struct {
+ uint64_t lower;
+ uint16_t upper;
+ } l;
+} CPU_LDoubleU;
+
+typedef union {
+ float128 q;
+#if HOST_BIG_ENDIAN
+ struct {
+ uint32_t upmost;
+ uint32_t upper;
+ uint32_t lower;
+ uint32_t lowest;
+ } l;
+ struct {
+ uint64_t upper;
+ uint64_t lower;
+ } ll;
+#else
+ struct {
+ uint32_t lowest;
+ uint32_t lower;
+ uint32_t upper;
+ uint32_t upmost;
+ } l;
+ struct {
+ uint64_t lower;
+ uint64_t upper;
+ } ll;
+#endif
+} CPU_QuadU;
+
+#endif /* QEMU_CPU_FLOAT_H_ */
diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h
index 58f00b7814fd..994a018b910d 100644
--- a/target/alpha/cpu.h
+++ b/target/alpha/cpu.h
@@ -22,6 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
/* Alpha processors have a weak memory model */
#define TCG_GUEST_DEFAULT_MO (0)
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index ccf635ac5cbc..cb5359a74702 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -21,6 +21,7 @@
#define ARM_CPU_H
#include "kvm-consts.h"
+#include "qemu/cpu-float.h"
#include "hw/registerfields.h"
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index 4cc936b6bfda..c43b93a68f14 100644
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -22,6 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
/* PA-RISC 1.x processors have a strong memory model. */
/* ??? While we do not yet implement PA-RISC 2.0, those processors have
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 5124c1e307b5..796e2cf6d664 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -25,6 +25,7 @@
#include "kvm/hyperv-proto.h"
#include "exec/cpu-defs.h"
#include "qapi/qapi-types-common.h"
+#include "qemu/cpu-float.h"
/* The x86 has a strong memory model with some store-after-load re-ordering */
#define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD)
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 872e8ce63758..9b3bf7a44819 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -22,6 +22,7 @@
#define M68K_CPU_H
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
#include "cpu-qom.h"
#define OS_BYTE 0
diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h
index 0a0ce71b6a5c..67aa88b8db5b 100644
--- a/target/microblaze/cpu.h
+++ b/target/microblaze/cpu.h
@@ -22,7 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
-#include "fpu/softfloat-types.h"
+#include "qemu/cpu-float.h"
typedef struct CPUArchState CPUMBState;
#if !defined(CONFIG_USER_ONLY)
diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h
index bdf29d2dc4c3..b9584f10d452 100644
--- a/target/openrisc/cpu.h
+++ b/target/openrisc/cpu.h
@@ -21,6 +21,7 @@
#define OPENRISC_CPU_H
#include "exec/cpu-defs.h"
+#include "fpu/softfloat-types.h"
#include "hw/core/cpu.h"
#include "qom/object.h"
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 627e574127ba..473436a49eb5 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -21,6 +21,7 @@
#define PPC_CPU_H
#include "qemu/int128.h"
+#include "qemu/cpu-float.h"
#include "exec/cpu-defs.h"
#include "cpu-qom.h"
#include "qom/object.h"
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index c069fe85fa1b..e1d976bdef06 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -23,7 +23,7 @@
#include "hw/core/cpu.h"
#include "hw/registerfields.h"
#include "exec/cpu-defs.h"
-#include "fpu/softfloat-types.h"
+#include "qemu/cpu-float.h"
#include "qom/object.h"
#include "qemu/int128.h"
#include "cpu_bits.h"
diff --git a/target/rx/cpu.h b/target/rx/cpu.h
index b4abd90ccd1e..1c267f83bfd2 100644
--- a/target/rx/cpu.h
+++ b/target/rx/cpu.h
@@ -24,6 +24,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
/* PSW define */
REG32(PSW, 0)
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index c49c8466e74d..7d6d01325b2d 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -28,6 +28,7 @@
#include "cpu-qom.h"
#include "cpu_models.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
#define ELF_MACHINE_UNAME "S390X"
diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h
index c72a30edfd41..14d490ac4705 100644
--- a/target/sh4/cpu.h
+++ b/target/sh4/cpu.h
@@ -22,6 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
/* CPU Subtypes */
#define SH_CPU_SH7750 (1 << 0)
diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index abb38db6749d..dd9e2f5cdb6a 100644
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -4,6 +4,7 @@
#include "qemu/bswap.h"
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
#if !defined(TARGET_SPARC64)
#define TARGET_DPREGS 16
diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
index 108d6b8288fb..3b9c533a7c3b 100644
--- a/target/tricore/cpu.h
+++ b/target/tricore/cpu.h
@@ -22,6 +22,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
+#include "qemu/cpu-float.h"
#include "tricore-defs.h"
struct tricore_boot_info;
diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index f10cfabdc35c..71142ea8f453 100644
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -29,6 +29,7 @@
#define XTENSA_CPU_H
#include "cpu-qom.h"
+#include "qemu/cpu-float.h"
#include "exec/cpu-defs.h"
#include "xtensa-isa.h"
diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
index bf4d440308ea..e83bfccb9ecf 100644
--- a/migration/vmstate-types.c
+++ b/migration/vmstate-types.c
@@ -11,6 +11,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cpu-float.h"
#include "qemu-file.h"
#include "migration.h"
#include "migration/vmstate.h"
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 28/32] Move CPU softfloat unions to cpu-float.h
2022-03-23 15:57 ` marcandre.lureau
@ 2022-03-25 8:16 ` Juan Quintela
-1 siblings, 0 replies; 79+ messages in thread
From: Juan Quintela @ 2022-03-25 8:16 UTC (permalink / raw)
To: marcandre.lureau
Cc: Peter Maydell, David Hildenbrand, Bin Meng, Mark Cave-Ayland,
qemu-devel, Max Filippov, Alistair Francis, Edgar E. Iglesias,
Yoshinori Sato, Daniel Henrique Barboza,
open list:PowerPC TCG CPUs, Artyom Tarasenko, Thomas Huth,
Richard Henderson, Greg Kurz, Dr. David Alan Gilbert,
open list:S390 TCG CPUs, open list:ARM TCG CPUs,
Cédric Le Goater, Stafford Horne, David Gibson,
open list:RISC-V TCG CPUs, Bastian Koppelmann, Cornelia Huck,
Laurent Vivier, Palmer Dabbelt
marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The types are no longer used in bswap.h since commit
> f930224fffe ("bswap.h: Remove unused float-access functions"), there
> isn't much sense in keeping it there and having a dependency on fpu/.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
> index bf4d440308ea..e83bfccb9ecf 100644
> --- a/migration/vmstate-types.c
> +++ b/migration/vmstate-types.c
> @@ -11,6 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/cpu-float.h"
> #include "qemu-file.h"
> #include "migration.h"
> #include "migration/vmstate.h"
Reviewed-by: Juan Quintela <quintela@redhat.com>
I think that the rest of the patch is also correct, but as there are
other maintainers involved.
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 28/32] Move CPU softfloat unions to cpu-float.h
@ 2022-03-25 8:16 ` Juan Quintela
0 siblings, 0 replies; 79+ messages in thread
From: Juan Quintela @ 2022-03-25 8:16 UTC (permalink / raw)
To: marcandre.lureau
Cc: qemu-devel, Dr. David Alan Gilbert, Richard Henderson,
Peter Maydell, Laurent Vivier, Edgar E. Iglesias, Stafford Horne,
Cédric Le Goater, Daniel Henrique Barboza, David Gibson,
Greg Kurz, Palmer Dabbelt, Alistair Francis, Bin Meng,
Yoshinori Sato, David Hildenbrand, Cornelia Huck, Thomas Huth,
Mark Cave-Ayland, Artyom Tarasenko, Bastian Koppelmann,
Max Filippov, open list:ARM TCG CPUs, open list:PowerPC TCG CPUs,
open list:RISC-V TCG CPUs, open list:S390 TCG CPUs
marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The types are no longer used in bswap.h since commit
> f930224fffe ("bswap.h: Remove unused float-access functions"), there
> isn't much sense in keeping it there and having a dependency on fpu/.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
> index bf4d440308ea..e83bfccb9ecf 100644
> --- a/migration/vmstate-types.c
> +++ b/migration/vmstate-types.c
> @@ -11,6 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/cpu-float.h"
> #include "qemu-file.h"
> #include "migration.h"
> #include "migration/vmstate.h"
Reviewed-by: Juan Quintela <quintela@redhat.com>
I think that the rest of the patch is also correct, but as there are
other maintainers involved.
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 29/32] Move fcntl_setfl() to oslib-posix
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (27 preceding siblings ...)
2022-03-23 15:57 ` marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 18:34 ` Richard Henderson
2022-03-23 15:57 ` [PATCH 30/32] qga: remove explicit environ argument from exec/spawn marcandre.lureau
` (3 subsequent siblings)
32 siblings, 1 reply; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Paolo Bonzini
From: Marc-André Lureau <marcandre.lureau@redhat.com>
It is only implemented for POSIX anyway.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu/cutils.h | 1 -
include/sysemu/os-posix.h | 2 ++
util/cutils.c | 17 -----------------
util/oslib-posix.c | 15 +++++++++++++++
4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index 2137e6526087..e873bad36674 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -131,7 +131,6 @@ const char *qemu_strchrnul(const char *s, int c);
time_t mktimegm(struct tm *tm);
int qemu_fdatasync(int fd);
int qemu_msync(void *addr, size_t length, int fd);
-int fcntl_setfl(int fd, int flag);
int qemu_parse_fd(const char *param);
int qemu_strtoi(const char *nptr, const char **endptr, int base,
int *result);
diff --git a/include/sysemu/os-posix.h b/include/sysemu/os-posix.h
index a49c6848ff1a..e9deb9b0c4b6 100644
--- a/include/sysemu/os-posix.h
+++ b/include/sysemu/os-posix.h
@@ -99,6 +99,8 @@ static inline void qemu_funlockfile(FILE *f)
funlockfile(f);
}
+int fcntl_setfl(int fd, int flag);
+
#ifdef __cplusplus
}
#endif
diff --git a/util/cutils.c b/util/cutils.c
index 1173ce3b88f3..aaf2ced29142 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -199,23 +199,6 @@ int qemu_msync(void *addr, size_t length, int fd)
#endif /* CONFIG_POSIX */
}
-#ifndef _WIN32
-/* Sets a specific flag */
-int fcntl_setfl(int fd, int flag)
-{
- int flags;
-
- flags = fcntl(fd, F_GETFL);
- if (flags == -1)
- return -errno;
-
- if (fcntl(fd, F_SETFL, flags | flag) == -1)
- return -errno;
-
- return 0;
-}
-#endif
-
static int64_t suffix_mul(char suffix, int64_t unit)
{
switch (qemu_toupper(suffix)) {
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 577c855612cb..fae25be3e779 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -936,3 +936,18 @@ size_t qemu_get_host_physmem(void)
#endif
return 0;
}
+
+/* Sets a specific flag */
+int fcntl_setfl(int fd, int flag)
+{
+ int flags;
+
+ flags = fcntl(fd, F_GETFL);
+ if (flags == -1)
+ return -errno;
+
+ if (fcntl(fd, F_SETFL, flags | flag) == -1)
+ return -errno;
+
+ return 0;
+}
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 29/32] Move fcntl_setfl() to oslib-posix
2022-03-23 15:57 ` [PATCH 29/32] Move fcntl_setfl() to oslib-posix marcandre.lureau
@ 2022-03-23 18:34 ` Richard Henderson
0 siblings, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 18:34 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: Paolo Bonzini
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> It is only implemented for POSIX anyway.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> ---
> include/qemu/cutils.h | 1 -
> include/sysemu/os-posix.h | 2 ++
> util/cutils.c | 17 -----------------
> util/oslib-posix.c | 15 +++++++++++++++
> 4 files changed, 17 insertions(+), 18 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 30/32] qga: remove explicit environ argument from exec/spawn
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (28 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 29/32] Move fcntl_setfl() to oslib-posix marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 18:36 ` Richard Henderson
2022-03-23 15:57 ` [PATCH 31/32] RFC: Simplify softmmu/main.c marcandre.lureau
` (2 subsequent siblings)
32 siblings, 1 reply; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Michael Roth
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Environment is implicitly inherited from the current process "environ"
variable for execl() or g_spawn_sync(), no need to be explicit about it.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
meson.build | 2 --
qga/commands-posix.c | 24 +++++++-----------------
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/meson.build b/meson.build
index e03a1b50cc11..c06fe5e02737 100644
--- a/meson.build
+++ b/meson.build
@@ -1654,8 +1654,6 @@ config_host_data.set('CONFIG_BYTESWAP_H',
cc.has_header_symbol('byteswap.h', 'bswap_32'))
config_host_data.set('CONFIG_EPOLL_CREATE1',
cc.has_header_symbol('sys/epoll.h', 'epoll_create1'))
-config_host_data.set('CONFIG_HAS_ENVIRON',
- cc.has_header_symbol('unistd.h', 'environ', prefix: gnu_source_prefix))
config_host_data.set('CONFIG_FALLOCATE_PUNCH_HOLE',
cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_PUNCH_HOLE') and
cc.has_header_symbol('linux/falloc.h', 'FALLOC_FL_KEEP_SIZE'))
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 75dbaab68ea9..4d7a2392c097 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -32,15 +32,6 @@
#include <utmpx.h>
#endif
-#ifndef CONFIG_HAS_ENVIRON
-#ifdef __APPLE__
-#include <crt_externs.h>
-#define environ (*_NSGetEnviron())
-#else
-extern char **environ;
-#endif
-#endif
-
#if defined(__linux__)
#include <mntent.h>
#include <linux/fs.h>
@@ -109,8 +100,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp)
reopen_fd_to_null(1);
reopen_fd_to_null(2);
- execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
- "hypervisor initiated shutdown", (char *)NULL, environ);
+ execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
+ "hypervisor initiated shutdown", (char *)NULL);
_exit(EXIT_FAILURE);
} else if (pid < 0) {
error_setg_errno(errp, errno, "failed to create child process");
@@ -207,8 +198,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
/* Use '/sbin/hwclock -w' to set RTC from the system time,
* or '/sbin/hwclock -s' to set the system time from RTC. */
- execle(hwclock_path, "hwclock", has_time ? "-w" : "-s",
- NULL, environ);
+ execl(hwclock_path, "hwclock", has_time ? "-w" : "-s", NULL);
_exit(EXIT_FAILURE);
} else if (pid < 0) {
error_setg_errno(errp, errno, "failed to create child process");
@@ -1574,7 +1564,7 @@ static void execute_fsfreeze_hook(FsfreezeHookArg arg, Error **errp)
reopen_fd_to_null(1);
reopen_fd_to_null(2);
- execle(hook, hook, arg_str, NULL, environ);
+ execl(hook, hook, arg_str, NULL);
_exit(EXIT_FAILURE);
} else if (pid < 0) {
error_setg_errno(errp, errno, "failed to create child process");
@@ -1888,7 +1878,7 @@ static int run_process_child(const char *command[], Error **errp)
spawn_flag = G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL |
G_SPAWN_STDERR_TO_DEV_NULL;
- success = g_spawn_sync(NULL, (char **)command, environ, spawn_flag,
+ success = g_spawn_sync(NULL, (char **)command, NULL, spawn_flag,
NULL, NULL, NULL, NULL,
&exit_status, &g_err);
@@ -2569,9 +2559,9 @@ void qmp_guest_set_user_password(const char *username,
reopen_fd_to_null(2);
if (crypted) {
- execle(passwd_path, "chpasswd", "-e", NULL, environ);
+ execl(passwd_path, "chpasswd", "-e", NULL);
} else {
- execle(passwd_path, "chpasswd", NULL, environ);
+ execl(passwd_path, "chpasswd", NULL);
}
_exit(EXIT_FAILURE);
} else if (pid < 0) {
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 30/32] qga: remove explicit environ argument from exec/spawn
2022-03-23 15:57 ` [PATCH 30/32] qga: remove explicit environ argument from exec/spawn marcandre.lureau
@ 2022-03-23 18:36 ` Richard Henderson
0 siblings, 0 replies; 79+ messages in thread
From: Richard Henderson @ 2022-03-23 18:36 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel; +Cc: Michael Roth
On 3/23/22 08:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> Environment is implicitly inherited from the current process "environ"
> variable for execl() or g_spawn_sync(), no need to be explicit about it.
>
> Signed-off-by: Marc-André Lureau<marcandre.lureau@redhat.com>
> ---
> meson.build | 2 --
> qga/commands-posix.c | 24 +++++++-----------------
> 2 files changed, 7 insertions(+), 19 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 31/32] RFC: Simplify softmmu/main.c
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (29 preceding siblings ...)
2022-03-23 15:57 ` [PATCH 30/32] qga: remove explicit environ argument from exec/spawn marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 20:56 ` Akihiko Odaki
2022-03-24 7:51 ` Paolo Bonzini
2022-03-23 15:57 ` marcandre.lureau
2022-03-24 9:26 ` [PATCH 00/32] Misc cleanups Stefan Hajnoczi
32 siblings, 2 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Philippe Mathieu-Daudé,
Gerd Hoffmann, Akihiko Odaki, Paolo Bonzini,
Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Move qemu_main() declaration to a new header.
Simplify main.c since both cocoa & sdl cannot be enabled together.
(there might be some small conflict with the RFC patch "cocoa: run qemu_init
in the main thread", but the two look like they could be used together
to improve the code)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 5 -----
include/qemu-main.h | 6 ++++++
softmmu/main.c | 25 +++++++++----------------
ui/cocoa.m | 1 +
4 files changed, 16 insertions(+), 21 deletions(-)
create mode 100644 include/qemu-main.h
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 65483f70d4fe..0498acd16b78 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -19,9 +19,4 @@
"See <https://qemu.org/contribute/report-a-bug> for how to report bugs.\n" \
"More information on the QEMU project at <https://qemu.org>."
-/* main function, renamed */
-#if defined(CONFIG_COCOA)
-int qemu_main(int argc, char **argv, char **envp);
-#endif
-
#endif
diff --git a/include/qemu-main.h b/include/qemu-main.h
new file mode 100644
index 000000000000..74d670bbf9a7
--- /dev/null
+++ b/include/qemu-main.h
@@ -0,0 +1,6 @@
+#ifndef QEMU_MAIN_H
+#define QEMU_MAIN_H
+
+int qemu_main(int argc, char **argv, char **envp);
+
+#endif /* QEMU_MAIN_H */
diff --git a/softmmu/main.c b/softmmu/main.c
index 639c67ff4893..c00432ff098e 100644
--- a/softmmu/main.c
+++ b/softmmu/main.c
@@ -23,28 +23,14 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu-main.h"
#include "sysemu/sysemu.h"
#ifdef CONFIG_SDL
-#if defined(__APPLE__) || defined(main)
#include <SDL.h>
-static int qemu_main(int argc, char **argv, char **envp);
-int main(int argc, char **argv)
-{
- return qemu_main(argc, argv, NULL);
-}
-#undef main
-#define main qemu_main
#endif
-#endif /* CONFIG_SDL */
-
-#ifdef CONFIG_COCOA
-#undef main
-#define main qemu_main
-#endif /* CONFIG_COCOA */
-int main(int argc, char **argv, char **envp)
+int qemu_main(int argc, char **argv, char **envp)
{
qemu_init(argc, argv, envp);
qemu_main_loop();
@@ -52,3 +38,10 @@ int main(int argc, char **argv, char **envp)
return 0;
}
+
+#ifndef CONFIG_COCOA
+int main(int argc, char **argv)
+{
+ return qemu_main(argc, argv, NULL);
+}
+#endif
diff --git a/ui/cocoa.m b/ui/cocoa.m
index cb6e7c41dc6f..e566372b8f73 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -28,6 +28,7 @@
#include <crt_externs.h>
#include "qemu-common.h"
+#include "qemu-main.h"
#include "ui/clipboard.h"
#include "ui/console.h"
#include "ui/input.h"
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 31/32] RFC: Simplify softmmu/main.c
2022-03-23 15:57 ` [PATCH 31/32] RFC: Simplify softmmu/main.c marcandre.lureau
@ 2022-03-23 20:56 ` Akihiko Odaki
2022-03-24 7:51 ` Paolo Bonzini
1 sibling, 0 replies; 79+ messages in thread
From: Akihiko Odaki @ 2022-03-23 20:56 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
Cc: Paolo Bonzini, Gerd Hoffmann, Philippe Mathieu-Daudé, Peter Maydell
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
On 2022/03/24 0:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Move qemu_main() declaration to a new header.
>
> Simplify main.c since both cocoa & sdl cannot be enabled together.
>
> (there might be some small conflict with the RFC patch "cocoa: run qemu_init
> in the main thread", but the two look like they could be used together
> to improve the code)
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> include/qemu-common.h | 5 -----
> include/qemu-main.h | 6 ++++++
> softmmu/main.c | 25 +++++++++----------------
> ui/cocoa.m | 1 +
> 4 files changed, 16 insertions(+), 21 deletions(-)
> create mode 100644 include/qemu-main.h
>
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index 65483f70d4fe..0498acd16b78 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -19,9 +19,4 @@
> "See <https://qemu.org/contribute/report-a-bug> for how to report bugs.\n" \
> "More information on the QEMU project at <https://qemu.org>."
>
> -/* main function, renamed */
> -#if defined(CONFIG_COCOA)
> -int qemu_main(int argc, char **argv, char **envp);
> -#endif
> -
> #endif
> diff --git a/include/qemu-main.h b/include/qemu-main.h
> new file mode 100644
> index 000000000000..74d670bbf9a7
> --- /dev/null
> +++ b/include/qemu-main.h
> @@ -0,0 +1,6 @@
> +#ifndef QEMU_MAIN_H
> +#define QEMU_MAIN_H
> +
> +int qemu_main(int argc, char **argv, char **envp);
> +
> +#endif /* QEMU_MAIN_H */
> diff --git a/softmmu/main.c b/softmmu/main.c
> index 639c67ff4893..c00432ff098e 100644
> --- a/softmmu/main.c
> +++ b/softmmu/main.c
> @@ -23,28 +23,14 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> +#include "qemu-main.h"
> #include "sysemu/sysemu.h"
>
> #ifdef CONFIG_SDL
> -#if defined(__APPLE__) || defined(main)
> #include <SDL.h>
> -static int qemu_main(int argc, char **argv, char **envp);
> -int main(int argc, char **argv)
> -{
> - return qemu_main(argc, argv, NULL);
> -}
> -#undef main
> -#define main qemu_main
> #endif
> -#endif /* CONFIG_SDL */
> -
> -#ifdef CONFIG_COCOA
> -#undef main
> -#define main qemu_main
> -#endif /* CONFIG_COCOA */
>
> -int main(int argc, char **argv, char **envp)
> +int qemu_main(int argc, char **argv, char **envp)
> {
> qemu_init(argc, argv, envp);
> qemu_main_loop();
> @@ -52,3 +38,10 @@ int main(int argc, char **argv, char **envp)
>
> return 0;
> }
> +
> +#ifndef CONFIG_COCOA
> +int main(int argc, char **argv)
> +{
> + return qemu_main(argc, argv, NULL);
> +}
> +#endif
> diff --git a/ui/cocoa.m b/ui/cocoa.m
> index cb6e7c41dc6f..e566372b8f73 100644
> --- a/ui/cocoa.m
> +++ b/ui/cocoa.m
> @@ -28,6 +28,7 @@
> #include <crt_externs.h>
>
> #include "qemu-common.h"
> +#include "qemu-main.h"
> #include "ui/clipboard.h"
> #include "ui/console.h"
> #include "ui/input.h"
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 31/32] RFC: Simplify softmmu/main.c
2022-03-23 15:57 ` [PATCH 31/32] RFC: Simplify softmmu/main.c marcandre.lureau
2022-03-23 20:56 ` Akihiko Odaki
@ 2022-03-24 7:51 ` Paolo Bonzini
2022-04-20 7:57 ` Marc-André Lureau
1 sibling, 1 reply; 79+ messages in thread
From: Paolo Bonzini @ 2022-03-24 7:51 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel
Cc: Peter Maydell, Philippe Mathieu-Daudé, Akihiko Odaki, Gerd Hoffmann
On 3/23/22 16:57, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau<marcandre.lureau@redhat.com>
>
> Move qemu_main() declaration to a new header.
>
> Simplify main.c since both cocoa & sdl cannot be enabled together.
>
> (there might be some small conflict with the RFC patch "cocoa: run qemu_init
> in the main thread", but the two look like they could be used together
> to improve the code)
That patch enables cocoa and SDL to be in the same binary, so I think
this one (while a good idea in theory) should be the one that loses.
Akihiko has ideas on how to use the standard main() for Cocoa, by
turning qemu_main_loop() into a function pointer, like
-void qemu_main_loop()
+static void (*qemu_main_loop)(void) = qemu_default_main_loop;
+void qemu_default_main_loop()
{
...
}
and cocoa_display_init() would do "qemu_main_loop = qemu_cocoa_main_loop;".
Paolo
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 31/32] RFC: Simplify softmmu/main.c
2022-03-24 7:51 ` Paolo Bonzini
@ 2022-04-20 7:57 ` Marc-André Lureau
2022-04-20 10:48 ` Akihiko Odaki
0 siblings, 1 reply; 79+ messages in thread
From: Marc-André Lureau @ 2022-04-20 7:57 UTC (permalink / raw)
To: Paolo Bonzini, Akihiko Odaki
Cc: Peter Maydell, Gerd Hoffmann, QEMU, Philippe Mathieu-Daudé
[-- Attachment #1: Type: text/plain, Size: 1207 bytes --]
Hi
On Thu, Mar 24, 2022 at 11:52 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
> On 3/23/22 16:57, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau<marcandre.lureau@redhat.com>
> >
> > Move qemu_main() declaration to a new header.
> >
> > Simplify main.c since both cocoa & sdl cannot be enabled together.
> >
> > (there might be some small conflict with the RFC patch "cocoa: run
> qemu_init
> > in the main thread", but the two look like they could be used together
> > to improve the code)
>
> That patch enables cocoa and SDL to be in the same binary, so I think
> this one (while a good idea in theory) should be the one that loses.
>
> Akihiko has ideas on how to use the standard main() for Cocoa, by
> turning qemu_main_loop() into a function pointer, like
>
> -void qemu_main_loop()
> +static void (*qemu_main_loop)(void) = qemu_default_main_loop;
> +void qemu_default_main_loop()
> {
> ...
> }
>
> and cocoa_display_init() would do "qemu_main_loop = qemu_cocoa_main_loop;".
>
>
Akihiko, do you have a patch ? Since you have reviewed this patch already,
are you willing to rebase on top of this one?
thanks
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 1887 bytes --]
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 31/32] RFC: Simplify softmmu/main.c
2022-04-20 7:57 ` Marc-André Lureau
@ 2022-04-20 10:48 ` Akihiko Odaki
0 siblings, 0 replies; 79+ messages in thread
From: Akihiko Odaki @ 2022-04-20 10:48 UTC (permalink / raw)
To: Marc-André Lureau, Paolo Bonzini
Cc: Peter Maydell, Gerd Hoffmann, QEMU, Philippe Mathieu-Daudé
On 2022/04/20 16:57, Marc-André Lureau wrote:
> Hi
>
> On Thu, Mar 24, 2022 at 11:52 AM Paolo Bonzini <pbonzini@redhat.com
> <mailto:pbonzini@redhat.com>> wrote:
>
> On 3/23/22 16:57, marcandre.lureau@redhat.com
> <mailto:marcandre.lureau@redhat.com> wrote:
> > From: Marc-André Lureau<marcandre.lureau@redhat.com
> <mailto:marcandre.lureau@redhat.com>>
> >
> > Move qemu_main() declaration to a new header.
> >
> > Simplify main.c since both cocoa & sdl cannot be enabled together.
> >
> > (there might be some small conflict with the RFC patch "cocoa:
> run qemu_init
> > in the main thread", but the two look like they could be used
> together
> > to improve the code)
>
> That patch enables cocoa and SDL to be in the same binary, so I think
> this one (while a good idea in theory) should be the one that loses.
The patch does *not* allow to enable cocoa and SDL to be in the same
binary, but "[RFC PATCH-for-7.0 v4 0/2] cocoa: run qemu_init in the main
thread" does.
https://patchew.org/QEMU/20220317125534.38706-1-philippe.mathieu.daude@gmail.com/
>
> Akihiko has ideas on how to use the standard main() for Cocoa, by
> turning qemu_main_loop() into a function pointer, like
>
> -void qemu_main_loop()
> +static void (*qemu_main_loop)(void) = qemu_default_main_loop;
> +void qemu_default_main_loop()
> {
> ...
> }
>
> and cocoa_display_init() would do "qemu_main_loop =
> qemu_cocoa_main_loop;".
>
>
> Akihiko, do you have a patch ? Since you have reviewed this patch
> already, are you willing to rebase on top of this one?
>
> thanks
>
> --
> Marc-André Lureau
No, I don't have but I'm willing to author one if nobody else is going to.
Regards,
Akihiko Odaki
^ permalink raw reply [flat|nested] 79+ messages in thread
* [PATCH 32/32] Remove qemu-common.h include from most units
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
@ 2022-03-23 15:57 ` marcandre.lureau
2022-03-23 15:57 ` [PATCH 02/32] meson: add util dependency for oslib-posix on freebsd marcandre.lureau
` (31 subsequent siblings)
32 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: Marc-André Lureau, Cameron Esfahani, Roman Bolshakov,
Richard Henderson, Paolo Bonzini, Gerd Hoffmann,
David Hildenbrand, Igor Mammedov, Stefan Berger, Kevin Wolf,
Hanna Reitz, Aarushi Mehta, Julia Suvorova, Stefan Hajnoczi,
Stefano Garzarella, Warner Losh, Kyle Evans, Eduardo Habkost,
Marcel Apfelbaum, Philippe Mathieu-Daudé,
Yanan Wang, Daniel P. Berrangé,
Greg Kurz, Christian Schoenebeck, Alex Bennée,
Michael Rolnik, Mark Cave-Ayland, Michael S. Tsirkin,
Peter Maydell, Helge Deller, Cédric Le Goater,
Daniel Henrique Barboza, David Gibson, Thomas Huth,
Laurent Vivier, Edgar E. Iglesias, Huacai Chen, Jiaxun Yang,
Hervé Poussineau, Aleksandar Rikalo, Aurelien Jarno,
Jason Wang, Subbaraya Sundeep, Havard Skinnemoen, Tyrone Ting,
Chris Wulff, Marek Vasut, BALATON Zoltan, Elena Ufimtseva,
Jagannathan Raman, John G Johnson, Alexey Kardashevskiy,
Palmer Dabbelt, Alistair Francis, Bin Meng, Yoshinori Sato,
Christian Borntraeger, Cornelia Huck, Halil Pasic, Eric Farman,
Fabien Chouteau, KONRAD Frederic, Artyom Tarasenko, Eric Auger,
Taylor Simpson, Markus Armbruster, Zhang Chen, Li Zhijian,
Stefan Weil, Michael Roth, Alexander Graf, Wenchao Wang,
Colin Xu, Marcelo Tosatti, Kamil Rytarowski, Reinoud Zandijk,
Sunil Muthuswamy, Bastian Koppelmann, Max Filippov, Ani Sinha,
John Snow, Andrew Jeffery, Joel Stanley, Alexander Bulekov,
Bandan Das, Darren Kenny, Qiuhao Li, Corey Minyard, Fam Zheng,
open list:raw, open list:ARM PrimeCell and...,
open list:sPAPR (pseries),
open list:RISC-V TCG CPUs, open list:S390-ccw boot,
open list:Overall KVM CPUs, open list:X86 HAXM CPUs
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 9 ---------
accel/hvf/hvf-all.c | 1 -
accel/tcg/cpu-exec.c | 1 -
accel/tcg/tcg-accel-ops-icount.c | 1 -
accel/tcg/tcg-accel-ops-mttcg.c | 1 -
accel/tcg/tcg-accel-ops-rr.c | 1 -
accel/tcg/tcg-accel-ops.c | 1 -
accel/tcg/tcg-all.c | 1 -
accel/tcg/translate-all.c | 1 -
audio/audio_win_int.c | 1 -
backends/hostmem-epc.c | 1 -
backends/tpm/tpm_passthrough.c | 1 -
block/file-posix.c | 1 -
block/io_uring.c | 1 -
bsd-user/freebsd/os-syscall.c | 1 -
bsd-user/mmap.c | 1 -
chardev/char-fd.c | 1 -
chardev/char-pipe.c | 1 -
chardev/char-pty.c | 1 -
cpu.c | 1 -
crypto/cipher-afalg.c | 1 -
crypto/hash-afalg.c | 1 -
dump/dump.c | 1 -
dump/win_dump.c | 1 -
fsdev/virtfs-proxy-helper.c | 1 -
gdbstub.c | 1 -
hw/9pfs/9p-proxy.c | 1 -
hw/alpha/dp264.c | 1 -
hw/avr/boot.c | 1 -
hw/core/loader.c | 1 -
hw/display/artist.c | 1 -
hw/display/cg3.c | 1 -
hw/display/tcx.c | 1 -
hw/display/virtio-gpu-udmabuf.c | 1 -
hw/dma/pl330.c | 1 -
hw/hppa/machine.c | 1 -
hw/i386/pc_sysfw.c | 1 -
hw/i386/x86.c | 1 -
hw/input/vhost-user-input.c | 1 -
hw/intc/xics_kvm.c | 1 -
hw/m68k/mcf5208.c | 1 -
hw/m68k/q800.c | 1 -
hw/m68k/virt.c | 1 -
hw/microblaze/boot.c | 1 -
hw/mips/fuloong2e.c | 1 -
hw/mips/jazz.c | 1 -
hw/mips/loongson3_virt.c | 1 -
hw/mips/malta.c | 1 -
hw/mips/mipssim.c | 1 -
hw/misc/sbsa_ec.c | 1 -
hw/net/fsl_etsec/etsec.c | 1 -
hw/net/fsl_etsec/rings.c | 1 -
hw/net/msf2-emac.c | 1 -
hw/net/npcm7xx_emc.c | 1 -
hw/nios2/boot.c | 1 -
hw/nios2/generic_nommu.c | 1 -
hw/nvram/fw_cfg.c | 1 -
hw/pci-host/mv64361.c | 1 -
hw/pci-host/pnv_phb3.c | 1 -
hw/pci-host/pnv_phb3_msi.c | 1 -
hw/pci-host/pnv_phb3_pbcq.c | 1 -
hw/pci-host/pnv_phb4.c | 1 -
hw/pci-host/pnv_phb4_pec.c | 1 -
hw/pci-host/raven.c | 1 -
hw/pci-host/remote.c | 1 -
hw/pci/pci.c | 1 -
hw/ppc/e500.c | 1 -
hw/ppc/mac_newworld.c | 1 -
hw/ppc/mac_oldworld.c | 1 -
hw/ppc/pegasos2.c | 1 -
hw/ppc/pnv.c | 1 -
hw/ppc/pnv_bmc.c | 1 -
hw/ppc/ppc405_boards.c | 1 -
hw/ppc/ppc440_bamboo.c | 1 -
hw/ppc/sam460ex.c | 1 -
hw/ppc/spapr.c | 1 -
hw/ppc/spapr_numa.c | 1 -
hw/ppc/spapr_pci_nvlink2.c | 1 -
hw/ppc/spapr_tpm_proxy.c | 1 -
hw/ppc/spapr_vof.c | 1 -
hw/ppc/virtex_ml507.c | 1 -
hw/ppc/vof.c | 1 -
hw/remote/iohub.c | 1 -
hw/remote/machine.c | 1 -
hw/remote/memory.c | 1 -
hw/remote/message.c | 1 -
hw/remote/mpqemu-link.c | 1 -
hw/remote/proxy-memory-listener.c | 1 -
hw/remote/proxy.c | 1 -
hw/remote/remote-obj.c | 1 -
hw/riscv/boot.c | 1 -
hw/rx/rx-gdbsim.c | 1 -
hw/s390x/ipl.c | 1 -
hw/sd/sd.c | 1 -
hw/sparc/leon3.c | 1 -
hw/sparc/sun4m.c | 1 -
hw/sparc64/sun4u.c | 1 -
hw/usb/dev-mtp.c | 1 -
hw/virtio/virtio-iommu.c | 1 -
hw/virtio/virtio-mem.c | 1 -
hw/virtio/virtio-pmem.c | 1 -
io/channel-socket.c | 1 -
linux-user/aarch64/cpu_loop.c | 1 -
linux-user/alpha/cpu_loop.c | 1 -
linux-user/arm/cpu_loop.c | 1 -
linux-user/cris/cpu_loop.c | 1 -
linux-user/hexagon/cpu_loop.c | 1 -
linux-user/i386/cpu_loop.c | 1 -
linux-user/m68k/cpu_loop.c | 1 -
linux-user/microblaze/cpu_loop.c | 1 -
linux-user/mips/cpu_loop.c | 1 -
linux-user/openrisc/cpu_loop.c | 1 -
linux-user/ppc/cpu_loop.c | 1 -
linux-user/riscv/cpu_loop.c | 1 -
linux-user/s390x/cpu_loop.c | 1 -
linux-user/sh4/cpu_loop.c | 1 -
linux-user/sparc/cpu_loop.c | 1 -
linux-user/uname.c | 1 -
monitor/qmp-cmds.c | 1 -
net/colo-compare.c | 1 -
net/net.c | 1 -
net/socket.c | 1 -
net/tap-bsd.c | 1 -
net/tap-linux.c | 1 -
net/tap-solaris.c | 1 -
net/tap-win32.c | 1 -
net/tap.c | 1 -
net/vde.c | 1 -
os-posix.c | 1 -
os-win32.c | 1 -
page-vary-common.c | 1 -
qga/commands-posix.c | 1 -
softmmu/cpu-throttle.c | 1 -
softmmu/cpu-timers.c | 1 -
softmmu/cpus.c | 1 -
softmmu/datadir.c | 1 -
softmmu/icount.c | 1 -
softmmu/runstate.c | 1 -
stubs/monitor-core.c | 1 -
target/arm/hvf/hvf.c | 1 -
target/arm/kvm.c | 1 -
target/arm/kvm64.c | 1 -
target/hexagon/gdbstub.c | 1 -
target/i386/hax/hax-all.c | 1 -
target/i386/hvf/hvf.c | 1 -
target/i386/hvf/x86.c | 1 -
target/i386/hvf/x86_cpuid.c | 1 -
target/i386/hvf/x86_decode.c | 1 -
target/i386/hvf/x86_descr.c | 1 -
target/i386/hvf/x86_emu.c | 1 -
target/i386/hvf/x86_flags.c | 1 -
target/i386/hvf/x86_mmu.c | 1 -
target/i386/hvf/x86_task.c | 1 -
target/i386/hvf/x86hvf.c | 1 -
target/i386/kvm/sev-stub.c | 1 -
target/i386/nvmm/nvmm-all.c | 1 -
target/i386/whpx/whpx-all.c | 1 -
target/i386/whpx/whpx-apic.c | 1 -
target/mips/kvm.c | 1 -
target/nios2/nios2-semi.c | 1 -
target/ppc/kvm.c | 1 -
target/riscv/kvm.c | 1 -
target/rx/cpu.c | 1 -
target/rx/gdbstub.c | 1 -
target/s390x/kvm/kvm.c | 1 -
target/s390x/tcg/vec_fpu_helper.c | 1 -
target/s390x/tcg/vec_int_helper.c | 1 -
target/s390x/tcg/vec_string_helper.c | 1 -
target/tricore/gdbstub.c | 1 -
target/xtensa/core-de233_fpu.c | 1 -
target/xtensa/core-dsp3400.c | 1 -
target/xtensa/core-test_mmuhifi_c3.c | 1 -
tcg/tci.c | 1 -
tests/qtest/acpi-utils.c | 1 -
tests/qtest/ahci-test.c | 1 -
tests/qtest/aspeed_hace-test.c | 1 -
tests/qtest/bios-tables-test.c | 1 -
tests/qtest/boot-sector.c | 1 -
tests/qtest/cpu-plug-test.c | 1 -
tests/qtest/dbus-display-test.c | 1 -
tests/qtest/dbus-vmstate-test.c | 1 -
tests/qtest/device-introspect-test.c | 1 -
tests/qtest/e1000e-test.c | 2 --
tests/qtest/erst-test.c | 1 -
tests/qtest/fdc-test.c | 1 -
tests/qtest/fuzz/qos_fuzz.c | 1 -
tests/qtest/hd-geo-test.c | 1 -
tests/qtest/ide-test.c | 1 -
tests/qtest/ipmi-bt-test.c | 1 -
tests/qtest/ivshmem-test.c | 1 -
tests/qtest/libqos/ahci.c | 1 -
tests/qtest/libqos/malloc-pc.c | 2 --
tests/qtest/libqos/malloc-spapr.c | 2 --
tests/qtest/libqos/malloc.c | 1 -
tests/qtest/libqtest.c | 1 -
tests/qtest/machine-none-test.c | 1 -
tests/qtest/npcm7xx_emc-test.c | 1 -
tests/qtest/pxe-test.c | 1 -
tests/qtest/qom-test.c | 1 -
tests/qtest/rtl8139-test.c | 1 -
tests/qtest/test-filter-mirror.c | 1 -
tests/qtest/test-filter-redirector.c | 1 -
tests/qtest/test-x86-cpuid-compat.c | 1 -
tests/qtest/virtio-net-test.c | 1 -
tests/unit/check-qjson.c | 1 -
tests/unit/check-qnull.c | 1 -
tests/unit/check-qnum.c | 1 -
tests/unit/check-qobject.c | 1 -
tests/unit/check-qstring.c | 1 -
tests/unit/socket-helpers.c | 1 -
tests/unit/test-clone-visitor.c | 1 -
tests/unit/test-forward-visitor.c | 1 -
tests/unit/test-iov.c | 1 -
tests/unit/test-logging.c | 1 -
tests/unit/test-qmp-event.c | 1 -
tests/unit/test-qobject-input-visitor.c | 1 -
tests/unit/test-qobject-output-visitor.c | 1 -
tests/unit/test-string-input-visitor.c | 1 -
tests/unit/test-string-output-visitor.c | 1 -
tests/unit/test-thread-pool.c | 1 -
tests/unit/test-util-sockets.c | 1 -
tests/unit/test-visitor-serialization.c | 1 -
tests/unit/test-xbzrle.c | 1 -
ui/gtk-clipboard.c | 1 -
ui/keymaps.c | 1 -
ui/vdagent.c | 1 -
ui/vnc-clipboard.c | 1 -
ui/vnc-enc-tight.c | 2 +-
ui/vnc.c | 1 -
util/aio-win32.c | 1 -
util/coroutine-sigaltstack.c | 1 -
util/coroutine-win32.c | 1 -
util/cutils.c | 1 -
util/event_notifier-posix.c | 1 -
util/event_notifier-win32.c | 1 -
util/iov.c | 1 -
util/osdep.c | 1 -
util/oslib-posix.c | 1 -
util/oslib-win32.c | 1 -
util/qemu-coroutine-io.c | 1 -
util/qemu-sockets.c | 1 -
util/qemu-thread-win32.c | 1 -
target/xtensa/import_core.sh | 1 -
243 files changed, 1 insertion(+), 254 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 0498acd16b78..ba32cc8b1f39 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -1,12 +1,3 @@
-/*
- * This file is supposed to be included only by .c files. No header file should
- * depend on qemu-common.h, as this would easily lead to circular header
- * dependencies.
- *
- * If a header file uses a definition from qemu-common.h, that definition
- * must be moved to a separate header file, and the header that uses it
- * must include that header.
- */
#ifndef QEMU_COMMON_H
#define QEMU_COMMON_H
diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
index f185b0830a75..0043f4d308ba 100644
--- a/accel/hvf/hvf-all.c
+++ b/accel/hvf/hvf-all.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "sysemu/hvf.h"
#include "sysemu/hvf_int.h"
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index c997c2e8e015..083ada76b124 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/qemu-print.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c
index bdaf2c943b49..6436cd9349a3 100644
--- a/accel/tcg/tcg-accel-ops-icount.c
+++ b/accel/tcg/tcg-accel-ops-icount.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/replay.h"
#include "sysemu/cpu-timers.h"
diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttcg.c
index ea2b741deb51..d50239e0e28f 100644
--- a/accel/tcg/tcg-accel-ops-mttcg.c
+++ b/accel/tcg/tcg-accel-ops-mttcg.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/replay.h"
#include "sysemu/cpu-timers.h"
diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
index b287110766ef..1a72149f0e46 100644
--- a/accel/tcg/tcg-accel-ops-rr.c
+++ b/accel/tcg/tcg-accel-ops-rr.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/replay.h"
#include "sysemu/cpu-timers.h"
diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
index ea7dcad674cf..684dc5a1371f 100644
--- a/accel/tcg/tcg-accel-ops.c
+++ b/accel/tcg/tcg-accel-ops.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/replay.h"
#include "sysemu/cpu-timers.h"
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index d6336a9c966d..47952eecd779 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/cpu-timers.h"
#include "tcg/tcg.h"
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 5971cd53ab9f..a6e03c1e50b2 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#define NO_CPU_IO_DEFS
#include "trace.h"
diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
index 5ea8157dfcc8..316f118f5099 100644
--- a/audio/audio_win_int.c
+++ b/audio/audio_win_int.c
@@ -1,7 +1,6 @@
/* public domain */
#include "qemu/osdep.h"
-#include "qemu-common.h"
#define AUDIO_CAP "win-int"
#include <windows.h>
diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c
index b47f98b6a3aa..037292d2672f 100644
--- a/backends/hostmem-epc.c
+++ b/backends/hostmem-epc.c
@@ -12,7 +12,6 @@
#include <sys/ioctl.h>
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qom/object_interfaces.h"
#include "qapi/error.h"
#include "sysemu/hostmem.h"
diff --git a/backends/tpm/tpm_passthrough.c b/backends/tpm/tpm_passthrough.c
index d5558fae6cc5..5a2f74db1b38 100644
--- a/backends/tpm/tpm_passthrough.c
+++ b/backends/tpm/tpm_passthrough.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qemu/sockets.h"
diff --git a/block/file-posix.c b/block/file-posix.c
index 61b02d85ebf1..bfd9b2111143 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
diff --git a/block/io_uring.c b/block/io_uring.c
index 782afdb433e1..0b401512b973 100644
--- a/block/io_uring.c
+++ b/block/io_uring.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
#include <liburing.h>
-#include "qemu-common.h"
#include "block/aio.h"
#include "qemu/queue.h"
#include "block/block.h"
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index a17ff9f6ecce..d272478e7b0a 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -37,7 +37,6 @@
#include <utime.h>
#include "qemu.h"
-#include "qemu-common.h"
#include "signal-common.h"
#include "user/syscall-trace.h"
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 07aa0a634dff..e54e26de17b0 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qemu.h"
-#include "qemu-common.h"
static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
static __thread int mmap_lock_count;
diff --git a/chardev/char-fd.c b/chardev/char-fd.c
index 93c56913b49a..6ec9682b22f2 100644
--- a/chardev/char-fd.c
+++ b/chardev/char-fd.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/module.h"
#include "qemu/sockets.h"
#include "qapi/error.h"
diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
index 7eca5d9a56ae..66d3b8509183 100644
--- a/chardev/char-pipe.c
+++ b/chardev/char-pipe.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index d73d8b23903d..1e2863f532a8 100644
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "chardev/char.h"
#include "io/channel-file.h"
diff --git a/cpu.c b/cpu.c
index ab2c7c81e460..0fef70e18e74 100644
--- a/cpu.c
+++ b/cpu.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "exec/target_page.h"
diff --git a/crypto/cipher-afalg.c b/crypto/cipher-afalg.c
index c55cd28bf01c..3df8fc54c051 100644
--- a/crypto/cipher-afalg.c
+++ b/crypto/cipher-afalg.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
#include "qemu/sockets.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "crypto/cipher.h"
#include "cipherpriv.h"
diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c
index 4ac18c7c1db7..3ebea392920d 100644
--- a/crypto/hash-afalg.c
+++ b/crypto/hash-afalg.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "crypto/hash.h"
#include "crypto/hmac.h"
diff --git a/dump/dump.c b/dump/dump.c
index 5d71c47d06aa..e766ce1d7d91 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "elf.h"
#include "exec/hwaddr.h"
diff --git a/dump/win_dump.c b/dump/win_dump.c
index c5eb5a9aacd7..fbdbb7bd93a6 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "elf.h"
#include "exec/hwaddr.h"
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index d06a0f7b8326..2dde27922fe2 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -21,7 +21,6 @@
#include <linux/magic.h>
#endif
#include <cap-ng.h>
-#include "qemu-common.h"
#include "qemu/sockets.h"
#include "qemu/xattr.h"
#include "9p-iov-marshal.h"
diff --git a/gdbstub.c b/gdbstub.c
index c8375e3c3ffe..2c804d506629 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/ctype.h"
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
index 4c5e0fc217eb..99d115ff0db4 100644
--- a/hw/9pfs/9p-proxy.c
+++ b/hw/9pfs/9p-proxy.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include <sys/socket.h>
#include <sys/un.h>
-#include "qemu-common.h"
#include "9p.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index c78ed96d0eca..f4349eba83fb 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "elf.h"
#include "hw/loader.h"
diff --git a/hw/avr/boot.c b/hw/avr/boot.c
index cbede775cee2..617f3a144c85 100644
--- a/hw/avr/boot.c
+++ b/hw/avr/boot.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 8d9b2df6e725..8167301f0402 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -43,7 +43,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
diff --git a/hw/display/artist.c b/hw/display/artist.c
index 69a8f9eea8ba..8e121bb0b4dc 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index 4b7e78d91924..2e9656ae1c39 100644
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index d4d09d0df8d5..1b27b64f6d14 100644
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "ui/console.h"
diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c
index 1597921c51fc..8bdf4bac6e4b 100644
--- a/hw/display/virtio-gpu-udmabuf.c
+++ b/hw/display/virtio-gpu-udmabuf.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/iov.h"
#include "ui/console.h"
#include "hw/virtio/virtio-gpu.h"
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 31ce01b7c57c..08e5938ec7b7 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 98b30e0395ee..f7595c08577c 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -4,7 +4,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "elf.h"
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index c8b17af95353..0540047bad22 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "sysemu/block-backend.h"
#include "qemu/error-report.h"
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 4cf107baea34..bb6727279097 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -25,7 +25,6 @@
#include "qemu/option.h"
#include "qemu/cutils.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c
index 273e96a7b12d..aeb0624fe57e 100644
--- a/hw/input/vhost-user-input.c
+++ b/hw/input/vhost-user-input.c
@@ -7,7 +7,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/virtio/virtio-input.h"
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index f5bfc501bc15..9719d98a179e 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "trace.h"
#include "sysemu/kvm.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 93812ee206ea..655207e393dc 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -11,7 +11,6 @@
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/irq.h"
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 66ca5c0df6ef..099a758c6f6a 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -22,7 +22,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 8e630282e02c..7de8b5f83393 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "hw/boards.h"
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 03c030aa2cf0..8b92a9801a02 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "qemu/option.h"
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index c9f14e70a077..7b13098f9b1b 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 4d6b44de342e..6598d7dddd59 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/clock.h"
#include "hw/mips/mips.h"
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index ae192db0c8b9..25534288dd81 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/units.h"
#include "qemu/cutils.h"
#include "qemu/datadir.h"
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index c4474b927c46..9ffdc5b8f187 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/bitops.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/clock.h"
#include "hw/southbridge/piix.h"
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index 30bc1c4f086f..39f64448f244 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/clock.h"
#include "hw/mips/mips.h"
diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c
index 83020fe9ac9b..8d939fe31b1b 100644
--- a/hw/misc/sbsa_ec.c
+++ b/hw/misc/sbsa_ec.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/log.h"
#include "hw/sysbus.h"
#include "sysemu/runstate.h"
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index e7fc082518d2..6d50c395439a 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -27,7 +27,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/sysbus.h"
#include "hw/irq.h"
#include "hw/ptimer.h"
diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
index 8f084464155d..a32589e33be4 100644
--- a/hw/net/fsl_etsec/rings.c
+++ b/hw/net/fsl_etsec/rings.c
@@ -22,7 +22,6 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "net/checksum.h"
#include "qemu/log.h"
#include "etsec.h"
diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
index 9278fdce0b3d..7ccd3e514271 100644
--- a/hw/net/msf2-emac.c
+++ b/hw/net/msf2-emac.c
@@ -29,7 +29,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/log.h"
#include "qapi/error.h"
#include "hw/registerfields.h"
diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
index 9a2328935c1c..7c86bb52e571 100644
--- a/hw/net/npcm7xx_emc.c
+++ b/hw/net/npcm7xx_emc.c
@@ -32,7 +32,6 @@
/* For crc32 */
#include <zlib.h>
-#include "qemu-common.h"
#include "hw/irq.h"
#include "hw/qdev-clock.h"
#include "hw/qdev-properties.h"
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index e889595d5c2b..07b8d87633b6 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -30,7 +30,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
index fbc18dbd04c2..48edb3ae373d 100644
--- a/hw/nios2/generic_nommu.c
+++ b/hw/nios2/generic_nommu.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/char/serial.h"
#include "hw/boards.h"
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index ea2d56f9f2af..4125cbebcd38 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
index 00b3ff7d9098..cc9c4d6d3b33 100644
--- a/hw/pci-host/mv64361.c
+++ b/hw/pci-host/mv64361.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "hw/hw.h"
diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
index 6e9aa9d6ace2..4e68ad4f03fc 100644
--- a/hw/pci-host/pnv_phb3.c
+++ b/hw/pci-host/pnv_phb3.c
@@ -10,7 +10,6 @@
#include "qemu/log.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/pci-host/pnv_phb3_regs.h"
#include "hw/pci-host/pnv_phb3.h"
#include "hw/pci/pcie_host.h"
diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c
index 8bcbc2cc4f37..2f4112907b84 100644
--- a/hw/pci-host/pnv_phb3_msi.c
+++ b/hw/pci-host/pnv_phb3_msi.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/pci-host/pnv_phb3_regs.h"
#include "hw/pci-host/pnv_phb3.h"
#include "hw/ppc/pnv.h"
diff --git a/hw/pci-host/pnv_phb3_pbcq.c b/hw/pci-host/pnv_phb3_pbcq.c
index c7426cd27a20..82f70efa4311 100644
--- a/hw/pci-host/pnv_phb3_pbcq.c
+++ b/hw/pci-host/pnv_phb3_pbcq.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/log.h"
#include "target/ppc/cpu.h"
#include "hw/ppc/fdt.h"
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 11c97e27eb16..3c4c2dace0a3 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -10,7 +10,6 @@
#include "qemu/log.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "monitor/monitor.h"
#include "target/ppc/cpu.h"
#include "hw/pci-host/pnv_phb4_regs.h"
diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
index 6f1121a9489a..61bc0b503e3e 100644
--- a/hw/pci-host/pnv_phb4_pec.c
+++ b/hw/pci-host/pnv_phb4_pec.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/log.h"
#include "target/ppc/cpu.h"
#include "hw/ppc/fdt.h"
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index 6e514f75eb8f..7a105e4a63d3 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qemu/log.h"
diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
index eee45444ef73..bfb25ef6af85 100644
--- a/hw/pci-host/remote.c
+++ b/hw/pci-host/remote.c
@@ -22,7 +22,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index dae9119bfe5f..e99417e50110 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "hw/irq.h"
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index c7e6767f91a8..2bc3dce1fb7d 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 7b5a205309af..e8ef1a9e5d9b 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -47,7 +47,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "hw/ppc/ppc.h"
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 7016979a7cd0..fe2adb057b0c 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index d45008ac7131..56bf203dfddf 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "hw/hw.h"
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 00f57c9678e6..c5e48992d988 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qemu/cutils.h"
diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
index 75a22ce50b11..99f1e8d7f9f3 100644
--- a/hw/ppc/pnv_bmc.c
+++ b/hw/ppc/pnv_bmc.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "target/ppc/cpu.h"
#include "qemu/log.h"
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 7e1a4ac9553b..32013b89836a 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/ppc/ppc.h"
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 7fb620b9a056..efa90ef5ba73 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/error-report.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/error-report.h"
#include "net/net.h"
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 0737234d66e5..2f24598f55db 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index a4372ba1891e..cc11fcc8b24d 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/memalign.h"
#include "qapi/error.h"
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
index d7c0e212baf8..a64098c375e0 100644
--- a/hw/ppc/spapr_numa.c
+++ b/hw/ppc/spapr_numa.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/ppc/spapr_numa.h"
#include "hw/pci-host/spapr.h"
#include "hw/ppc/fdt.h"
diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c
index 4678c79235f6..63b476c8f727 100644
--- a/hw/ppc/spapr_pci_nvlink2.c
+++ b/hw/ppc/spapr_pci_nvlink2.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/pci/pci.h"
#include "hw/pci-host/spapr.h"
#include "hw/ppc/spapr_numa.h"
diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c
index 2454086744b1..e10af35a1850 100644
--- a/hw/ppc/spapr_tpm_proxy.c
+++ b/hw/ppc/spapr_tpm_proxy.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/reset.h"
diff --git a/hw/ppc/spapr_vof.c b/hw/ppc/spapr_vof.c
index a33f940c32bb..09f29be0b9de 100644
--- a/hw/ppc/spapr_vof.c
+++ b/hw/ppc/spapr_vof.c
@@ -4,7 +4,6 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 9c575403b85c..b67a709ddce2 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "cpu.h"
diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c
index 2b63a6287561..8d96593677da 100644
--- a/hw/ppc/vof.c
+++ b/hw/ppc/vof.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu/range.h"
#include "qemu/units.h"
diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c
index 547d597f0feb..40dfee4bad43 100644
--- a/hw/remote/iohub.c
+++ b/hw/remote/iohub.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_ids.h"
diff --git a/hw/remote/machine.c b/hw/remote/machine.c
index 952105eab5a2..92d71d47bb9c 100644
--- a/hw/remote/machine.c
+++ b/hw/remote/machine.c
@@ -14,7 +14,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/remote/machine.h"
#include "exec/memory.h"
diff --git a/hw/remote/memory.c b/hw/remote/memory.c
index 6e21ab1a45c9..6d60da91e01c 100644
--- a/hw/remote/memory.c
+++ b/hw/remote/memory.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/remote/memory.h"
#include "exec/ram_addr.h"
diff --git a/hw/remote/message.c b/hw/remote/message.c
index 11d729845c5a..50f6bf2d495f 100644
--- a/hw/remote/message.c
+++ b/hw/remote/message.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/remote/machine.h"
#include "io/channel.h"
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
index 7e841820e521..2a4aa651ca26 100644
--- a/hw/remote/mpqemu-link.c
+++ b/hw/remote/mpqemu-link.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/module.h"
#include "hw/remote/mpqemu-link.h"
diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
index 0e893f3189e9..eb9918fe72bb 100644
--- a/hw/remote/proxy-memory-listener.c
+++ b/hw/remote/proxy-memory-listener.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/compiler.h"
#include "qemu/int128.h"
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index bad164299dd4..1c7786b52cf1 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/remote/proxy.h"
#include "hw/pci/pci.h"
diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
index 4f21254219f8..333e5ac44331 100644
--- a/hw/remote/remote-obj.c
+++ b/hw/remote/remote-obj.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/notify.h"
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index cae74fcbcd9a..0f179d36014a 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qemu/error-report.h"
diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index 75d1fec6ca46..64f897e5b10a 100644
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -20,7 +20,6 @@
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/loader.h"
#include "hw/rx/rx62n.h"
#include "sysemu/qtest.h"
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index eb7fc4c4ae87..84971e537b3e 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -13,7 +13,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "sysemu/reset.h"
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index cd67a7bac8e2..8e6fa0915137 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -47,7 +47,6 @@
#include "qemu/timer.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "qemu-common.h"
#include "sdmmc-internal.h"
#include "trace.h"
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index a9f24968275d..1e39d2e2d0ac 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/irq.h"
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 7f3a7c002780..fccaed1eb444 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/datadir.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
#include "qemu/error-report.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index cda7df36e312..6fd08e2298a6 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/pci/pci.h"
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index e6b77a2a941d..5831395cef75 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include <wchar.h>
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 664cbd958323..6de58a76a7ff 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/iov.h"
-#include "qemu-common.h"
#include "hw/qdev-properties.h"
#include "hw/virtio/virtio.h"
#include "sysemu/kvm.h"
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 35cbf1f21946..5aca40872695 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/iov.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
index 5419dca75e2c..5dd21c2c4408 100644
--- a/hw/virtio/virtio-pmem.c
+++ b/hw/virtio/virtio-pmem.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "hw/virtio/virtio-pmem.h"
diff --git a/io/channel-socket.c b/io/channel-socket.c
index 7a8d9f69c92d..9f5ddf68b687 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-sockets.h"
#include "qemu/module.h"
diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
index 31a66a4fa07c..3b273f62997a 100644
--- a/linux-user/aarch64/cpu_loop.c
+++ b/linux-user/aarch64/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c
index de6e0c901cdf..2ea039aa71f7 100644
--- a/linux-user/alpha/cpu_loop.c
+++ b/linux-user/alpha/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index 9dcb2e024eb0..683b8e47c2bd 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "elf.h"
diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c
index 0f46b3c1a87a..01e6ff16fc92 100644
--- a/linux-user/cris/cpu_loop.c
+++ b/linux-user/cris/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c
index 0d73934d31d5..b84e25bf71eb 100644
--- a/linux-user/hexagon/cpu_loop.c
+++ b/linux-user/hexagon/cpu_loop.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
index 90bffc1956aa..492701dd9af9 100644
--- a/linux-user/i386/cpu_loop.c
+++ b/linux-user/i386/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "qemu/timer.h"
#include "user-internals.h"
diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
index 928a18e3cf05..d1bf8548b747 100644
--- a/linux-user/m68k/cpu_loop.c
+++ b/linux-user/m68k/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c
index 1a2556be2c5f..5ccf9e942eaa 100644
--- a/linux-user/microblaze/cpu_loop.c
+++ b/linux-user/microblaze/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
index 9bb12a07ba08..d5c1c7941d34 100644
--- a/linux-user/mips/cpu_loop.c
+++ b/linux-user/mips/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/openrisc/cpu_loop.c b/linux-user/openrisc/cpu_loop.c
index 7683bea0649e..a7aa586c8f96 100644
--- a/linux-user/openrisc/cpu_loop.c
+++ b/linux-user/openrisc/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/ppc/cpu_loop.c b/linux-user/ppc/cpu_loop.c
index b468f199e4d2..02204ad8bebb 100644
--- a/linux-user/ppc/cpu_loop.c
+++ b/linux-user/ppc/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "qemu/timer.h"
#include "user-internals.h"
diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
index 26d446f32379..29084c142196 100644
--- a/linux-user/riscv/cpu_loop.c
+++ b/linux-user/riscv/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu.h"
#include "user-internals.h"
diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c
index 7901dfe6f518..285bc60071a8 100644
--- a/linux-user/s390x/cpu_loop.c
+++ b/linux-user/s390x/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c
index 1bd313cb19a2..c805f9db1104 100644
--- a/linux-user/sh4/cpu_loop.c
+++ b/linux-user/sh4/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
index baf3d9ae011f..434c90a55f8f 100644
--- a/linux-user/sparc/cpu_loop.c
+++ b/linux-user/sparc/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/uname.c b/linux-user/uname.c
index 0856783b2190..415fdf31b62d 100644
--- a/linux-user/uname.c
+++ b/linux-user/uname.c
@@ -21,7 +21,6 @@
#include "qemu.h"
#include "user-internals.h"
-//#include "qemu-common.h"
#include "uname.h"
/* return highest utsname machine name for emulated instruction set
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 883cf1ca4bbf..5e7302cbb995 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -14,7 +14,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/option.h"
#include "monitor/monitor.h"
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 62554b5b3c8f..d5d096580577 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -13,7 +13,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "trace.h"
#include "qapi/error.h"
diff --git a/net/net.c b/net/net.c
index 9f17ab204422..a094cf1d2929 100644
--- a/net/net.c
+++ b/net/net.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "net/net.h"
#include "clients.h"
diff --git a/net/socket.c b/net/socket.c
index c4b80e9228d7..ea5220a2eb51 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -27,7 +27,6 @@
#include "clients.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "qemu/sockets.h"
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index e45a6d124eb6..7e65bd391f0b 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "tap_int.h"
#include "qemu/cutils.h"
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 5e70b9303710..3e24d232e782 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "tap_int.h"
#include "tap-linux.h"
#include "net/tap.h"
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index d85224242b30..79919785c9f6 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -27,7 +27,6 @@
#include "tap_int.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
-#include "qemu-common.h"
#include <sys/ethernet.h>
#include <sys/sockio.h>
diff --git a/net/tap-win32.c b/net/tap-win32.c
index 6096972f5d47..7466f22e77a4 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -29,7 +29,6 @@
#include "qemu/osdep.h"
#include "tap_int.h"
-#include "qemu-common.h"
#include "clients.h" /* net_init_tap */
#include "net/eth.h"
#include "net/net.h"
diff --git a/net/tap.c b/net/tap.c
index c5cbeaa7a2be..6190fa699d2f 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -38,7 +38,6 @@
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/net/vde.c b/net/vde.c
index 99189cccb694..1083916bcf52 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -27,7 +27,6 @@
#include "net/net.h"
#include "clients.h"
-#include "qemu-common.h"
#include "qemu/option.h"
#include "qemu/main-loop.h"
#include "qapi/error.h"
diff --git a/os-posix.c b/os-posix.c
index 24692c8593f3..ee765f047dea 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -29,7 +29,6 @@
#include <grp.h>
#include <libgen.h>
-#include "qemu-common.h"
/* Needed early for CONFIG_BSD etc. */
#include "net/slirp.h"
#include "qemu/qemu-options.h"
diff --git a/os-win32.c b/os-win32.c
index 6f21b578417c..725ad652e8bb 100644
--- a/os-win32.c
+++ b/os-win32.c
@@ -26,7 +26,6 @@
#include "qemu/osdep.h"
#include <windows.h>
#include <mmsystem.h>
-#include "qemu-common.h"
#include "sysemu/runstate.h"
static BOOL WINAPI qemu_ctrl_handler(DWORD type)
diff --git a/page-vary-common.c b/page-vary-common.c
index 91755564985c..ab77672dd412 100644
--- a/page-vary-common.c
+++ b/page-vary-common.c
@@ -20,7 +20,6 @@
#define IN_PAGE_VARY 1
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "exec/page-vary.h"
/* WARNING: This file must *not* be complied with -flto. */
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 4d7a2392c097..9924277c826e 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -16,7 +16,6 @@
#include <sys/utsname.h>
#include <sys/wait.h>
#include <dirent.h>
-#include "qemu-common.h"
#include "guest-agent-core.h"
#include "qga-qapi-commands.h"
#include "qapi/error.h"
diff --git a/softmmu/cpu-throttle.c b/softmmu/cpu-throttle.c
index 8c2144ab95cc..d9bb30a223d8 100644
--- a/softmmu/cpu-throttle.c
+++ b/softmmu/cpu-throttle.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/thread.h"
#include "hw/core/cpu.h"
#include "qemu/main-loop.h"
diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c
index 204d946a1729..117408cb83af 100644
--- a/softmmu/cpu-timers.c
+++ b/softmmu/cpu-timers.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
diff --git a/softmmu/cpus.c b/softmmu/cpus.c
index 7b75bb66d5e6..668bef9b4d62 100644
--- a/softmmu/cpus.c
+++ b/softmmu/cpus.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "monitor/monitor.h"
#include "qemu/coroutine-tls.h"
#include "qapi/error.h"
diff --git a/softmmu/datadir.c b/softmmu/datadir.c
index 504c4665bed7..160cac999a6f 100644
--- a/softmmu/datadir.c
+++ b/softmmu/datadir.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/cutils.h"
#include "trace.h"
diff --git a/softmmu/icount.c b/softmmu/icount.c
index 21341a4ce49e..5ca271620db6 100644
--- a/softmmu/icount.c
+++ b/softmmu/icount.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
diff --git a/softmmu/runstate.c b/softmmu/runstate.c
index e0d869b21aa4..fac7b63259e8 100644
--- a/softmmu/runstate.c
+++ b/softmmu/runstate.c
@@ -40,7 +40,6 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-events-run-state.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qemu/job.h"
diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
index d058a2a00d85..afa477aae656 100644
--- a/stubs/monitor-core.c
+++ b/stubs/monitor-core.c
@@ -1,6 +1,5 @@
#include "qemu/osdep.h"
#include "monitor/monitor.h"
-#include "qemu-common.h"
#include "qapi/qapi-emit-events.h"
Monitor *monitor_cur(void)
diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 8c34f86792ed..567e296b21c9 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "sysemu/runstate.h"
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index bbf1ce7ba3bc..5fc37ac10a5b 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -13,7 +13,6 @@
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index 9ec8875150d6..17dd2f77d9f5 100644
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -16,7 +16,6 @@
#include <linux/elf.h>
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "qapi/error.h"
#include "cpu.h"
#include "qemu/timer.h"
diff --git a/target/hexagon/gdbstub.c b/target/hexagon/gdbstub.c
index 9c8c04c961b1..d152d01bfe7e 100644
--- a/target/hexagon/gdbstub.c
+++ b/target/hexagon/gdbstub.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "exec/gdbstub.h"
#include "cpu.h"
#include "internal.h"
diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c
index 81f665e21245..b185ee8de4fd 100644
--- a/target/i386/hax/hax-all.c
+++ b/target/i386/hax/hax-all.c
@@ -27,7 +27,6 @@
#include "cpu.h"
#include "exec/address-spaces.h"
-#include "qemu-common.h"
#include "qemu/accel.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index fc12c02fb217..f8833277ab6a 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -47,7 +47,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/memalign.h"
diff --git a/target/i386/hvf/x86.c b/target/i386/hvf/x86.c
index 91a3fe002c73..d086584f26d9 100644
--- a/target/i386/hvf/x86.c
+++ b/target/i386/hvf/x86.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "qemu-common.h"
#include "x86_decode.h"
#include "x86_emu.h"
#include "vmcs.h"
diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
index 32b0d131df86..f24dd50e48ff 100644
--- a/target/i386/hvf/x86_cpuid.c
+++ b/target/i386/hvf/x86_cpuid.c
@@ -21,7 +21,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "x86.h"
#include "vmx.h"
diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c
index 062713b1a450..3728d7705e21 100644
--- a/target/i386/hvf/x86_decode.c
+++ b/target/i386/hvf/x86_decode.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "panic.h"
#include "x86_decode.h"
#include "vmx.h"
diff --git a/target/i386/hvf/x86_descr.c b/target/i386/hvf/x86_descr.c
index af15c06ac5db..a484942cfcd4 100644
--- a/target/i386/hvf/x86_descr.c
+++ b/target/i386/hvf/x86_descr.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "vmx.h"
#include "x86_descr.h"
diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
index 050428795bbc..f5704f63e8da 100644
--- a/target/i386/hvf/x86_emu.c
+++ b/target/i386/hvf/x86_emu.c
@@ -37,7 +37,6 @@
#include "qemu/osdep.h"
#include "panic.h"
-#include "qemu-common.h"
#include "x86_decode.h"
#include "x86.h"
#include "x86_emu.h"
diff --git a/target/i386/hvf/x86_flags.c b/target/i386/hvf/x86_flags.c
index fecbca751770..03d6de5efc3e 100644
--- a/target/i386/hvf/x86_flags.c
+++ b/target/i386/hvf/x86_flags.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "panic.h"
#include "cpu.h"
#include "x86_flags.h"
diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c
index df0b91cd4208..96d117567ee8 100644
--- a/target/i386/hvf/x86_mmu.c
+++ b/target/i386/hvf/x86_mmu.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "panic.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "x86.h"
#include "x86_mmu.h"
diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
index d24daf6a4110..beaeec068731 100644
--- a/target/i386/hvf/x86_task.c
+++ b/target/i386/hvf/x86_task.c
@@ -8,7 +8,6 @@
// GNU General Public License for more details.
#include "qemu/osdep.h"
#include "panic.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "sysemu/hvf.h"
diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c
index bec9fc581463..69d4fb8cf555 100644
--- a/target/i386/hvf/x86hvf.c
+++ b/target/i386/hvf/x86hvf.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "x86hvf.h"
#include "vmx.h"
#include "vmcs.h"
diff --git a/target/i386/kvm/sev-stub.c b/target/i386/kvm/sev-stub.c
index 6080c007a2e4..1be5341e8a6a 100644
--- a/target/i386/kvm/sev-stub.c
+++ b/target/i386/kvm/sev-stub.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sev.h"
int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index 9f940413318c..b75738ee9cdf 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -11,7 +11,6 @@
#include "cpu.h"
#include "exec/address-spaces.h"
#include "exec/ioport.h"
-#include "qemu-common.h"
#include "qemu/accel.h"
#include "sysemu/nvmm.h"
#include "sysemu/cpus.h"
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 68a4ebe909ad..5560a22ea5c2 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -12,7 +12,6 @@
#include "cpu.h"
#include "exec/address-spaces.h"
#include "exec/ioport.h"
-#include "qemu-common.h"
#include "qemu/accel.h"
#include "sysemu/whpx.h"
#include "sysemu/cpus.h"
diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c
index bba36f3ec98f..c15df35ad60a 100644
--- a/target/i386/whpx/whpx-apic.c
+++ b/target/i386/whpx/whpx-apic.c
@@ -11,7 +11,6 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "hw/i386/apic_internal.h"
#include "hw/i386/apic-msidef.h"
diff --git a/target/mips/kvm.c b/target/mips/kvm.c
index 086debd9f013..caf70decd2a5 100644
--- a/target/mips/kvm.c
+++ b/target/mips/kvm.c
@@ -14,7 +14,6 @@
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "cpu.h"
#include "internal.h"
#include "qemu/error-report.h"
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index 5a7ad0c7108d..eda21c04434b 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -28,7 +28,6 @@
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#else
-#include "qemu-common.h"
#include "exec/softmmu-semi.h"
#endif
#include "qemu/log.h"
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 8644b85de847..f905a2af17a7 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -21,7 +21,6 @@
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "cpu.h"
diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
index e6b7cb6d4d5f..70b4cff06fbb 100644
--- a/target/riscv/kvm.c
+++ b/target/riscv/kvm.c
@@ -21,7 +21,6 @@
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/target/rx/cpu.c b/target/rx/cpu.c
index 25a4aa2976d3..fb30080ac4ea 100644
--- a/target/rx/cpu.c
+++ b/target/rx/cpu.c
@@ -20,7 +20,6 @@
#include "qemu/qemu-print.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "qemu-common.h"
#include "migration/vmstate.h"
#include "exec/exec-all.h"
#include "hw/loader.h"
diff --git a/target/rx/gdbstub.c b/target/rx/gdbstub.c
index c811d4810b45..7eb2059a841b 100644
--- a/target/rx/gdbstub.c
+++ b/target/rx/gdbstub.c
@@ -16,7 +16,6 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "exec/gdbstub.h"
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index 6acf14d5ecb4..53098bf54104 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -24,7 +24,6 @@
#include <linux/kvm.h>
#include <asm/ptrace.h>
-#include "qemu-common.h"
#include "cpu.h"
#include "s390x-internal.h"
#include "kvm_s390x.h"
diff --git a/target/s390x/tcg/vec_fpu_helper.c b/target/s390x/tcg/vec_fpu_helper.c
index 1a779934715f..aa2cc8e4a6b5 100644
--- a/target/s390x/tcg/vec_fpu_helper.c
+++ b/target/s390x/tcg/vec_fpu_helper.c
@@ -10,7 +10,6 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "s390x-internal.h"
#include "vec.h"
diff --git a/target/s390x/tcg/vec_int_helper.c b/target/s390x/tcg/vec_int_helper.c
index 5561b3ed9096..b44859ee1630 100644
--- a/target/s390x/tcg/vec_int_helper.c
+++ b/target/s390x/tcg/vec_int_helper.c
@@ -10,7 +10,6 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "vec.h"
#include "exec/helper-proto.h"
diff --git a/target/s390x/tcg/vec_string_helper.c b/target/s390x/tcg/vec_string_helper.c
index ac315eb095c1..f8b54bba4a9d 100644
--- a/target/s390x/tcg/vec_string_helper.c
+++ b/target/s390x/tcg/vec_string_helper.c
@@ -10,7 +10,6 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "s390x-internal.h"
#include "vec.h"
diff --git a/target/tricore/gdbstub.c b/target/tricore/gdbstub.c
index 3ce55abb8e3b..ebf32defde3a 100644
--- a/target/tricore/gdbstub.c
+++ b/target/tricore/gdbstub.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target/xtensa/core-de233_fpu.c b/target/xtensa/core-de233_fpu.c
index c7cbeb1b4834..41af8057fbb9 100644
--- a/target/xtensa/core-de233_fpu.c
+++ b/target/xtensa/core-de233_fpu.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "core-de233_fpu/core-isa.h"
diff --git a/target/xtensa/core-dsp3400.c b/target/xtensa/core-dsp3400.c
index 4e0bc8a8c46c..81e425c56828 100644
--- a/target/xtensa/core-dsp3400.c
+++ b/target/xtensa/core-dsp3400.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "core-dsp3400/core-isa.h"
diff --git a/target/xtensa/core-test_mmuhifi_c3.c b/target/xtensa/core-test_mmuhifi_c3.c
index 123c630b0da7..c0e5d32d1e47 100644
--- a/target/xtensa/core-test_mmuhifi_c3.c
+++ b/target/xtensa/core-test_mmuhifi_c3.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "core-test_mmuhifi_c3/core-isa.h"
diff --git a/tcg/tci.c b/tcg/tci.c
index fe92b5d0844b..bdfac83492dd 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */
#include "exec/cpu_ldst.h"
#include "tcg/tcg-op.h"
diff --git a/tests/qtest/acpi-utils.c b/tests/qtest/acpi-utils.c
index 766c48e3a6a4..673fc975862c 100644
--- a/tests/qtest/acpi-utils.c
+++ b/tests/qtest/acpi-utils.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "qemu-common.h"
#include "qemu/bitmap.h"
#include "acpi-utils.h"
#include "boot-sector.h"
diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
index 8073ccc20521..aff5f3f79776 100644
--- a/tests/qtest/ahci-test.c
+++ b/tests/qtest/ahci-test.c
@@ -30,7 +30,6 @@
#include "libqos/ahci.h"
#include "libqos/pci-pc.h"
-#include "qemu-common.h"
#include "qapi/qmp/qdict.h"
#include "qemu/host-utils.h"
diff --git a/tests/qtest/aspeed_hace-test.c b/tests/qtest/aspeed_hace-test.c
index 09ee31545e41..58aa22014d04 100644
--- a/tests/qtest/aspeed_hace-test.c
+++ b/tests/qtest/aspeed_hace-test.c
@@ -8,7 +8,6 @@
#include "qemu/osdep.h"
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "qemu/bitops.h"
#define HACE_CMD 0x10
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index c4a2d1e1664b..5dddedabcdde 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -57,7 +57,6 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "qemu-common.h"
#include "hw/firmware/smbios.h"
#include "qemu/bitmap.h"
#include "acpi-utils.h"
diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
index ea8f264661c3..9d9825bc8145 100644
--- a/tests/qtest/boot-sector.c
+++ b/tests/qtest/boot-sector.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
#include "boot-sector.h"
-#include "qemu-common.h"
#include "libqos/libqtest.h"
#define LOW(x) ((x) & 0xff)
diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c
index a1c689414be5..7f5dd5f85a78 100644
--- a/tests/qtest/cpu-plug-test.c
+++ b/tests/qtest/cpu-plug-test.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqtest-single.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c
index 43c77aff045c..81043162dfdd 100644
--- a/tests/qtest/dbus-display-test.c
+++ b/tests/qtest/dbus-display-test.c
@@ -3,7 +3,6 @@
#include <gio/gio.h>
#include <gio/gunixfdlist.h>
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "dbus-display1.h"
static GDBusConnection*
diff --git a/tests/qtest/dbus-vmstate-test.c b/tests/qtest/dbus-vmstate-test.c
index aca9b98b7a35..a8acab763f5d 100644
--- a/tests/qtest/dbus-vmstate-test.c
+++ b/tests/qtest/dbus-vmstate-test.c
@@ -2,7 +2,6 @@
#include <glib/gstdio.h>
#include <gio/gio.h>
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "dbus-vmstate1.h"
#include "migration-helpers.h"
diff --git a/tests/qtest/device-introspect-test.c b/tests/qtest/device-introspect-test.c
index bbec166dbc2f..adf39b2518e8 100644
--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/qmp/qstring.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c
index e648fdd409cd..ddd6983ede14 100644
--- a/tests/qtest/e1000e-test.c
+++ b/tests/qtest/e1000e-test.c
@@ -25,9 +25,7 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqtest-single.h"
-#include "qemu-common.h"
#include "libqos/pci-pc.h"
#include "qemu/sockets.h"
#include "qemu/iov.h"
diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c
index f94cd8dd8e05..a0adc35bef7f 100644
--- a/tests/qtest/erst-test.c
+++ b/tests/qtest/erst-test.c
@@ -11,7 +11,6 @@
#include <glib/gstdio.h>
#include "libqos/libqos-pc.h"
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "hw/pci/pci.h"
diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c
index b0d40012e6a9..4aa72f36431f 100644
--- a/tests/qtest/fdc-test.c
+++ b/tests/qtest/fdc-test.c
@@ -27,7 +27,6 @@
#include "libqtest-single.h"
#include "qapi/qmp/qdict.h"
-#include "qemu-common.h"
/* TODO actually test the results and get rid of this */
#define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index 7a244c951e5e..dc891d838b6a 100644
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "exec/memory.h"
#include "qemu/main-loop.h"
diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index 64023c057408..da9c4c2792de 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/bswap.h"
#include "qapi/qmp/qlist.h"
#include "libqos/libqtest.h"
diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
index 19de3b410405..b7243a17b11d 100644
--- a/tests/qtest/ide-test.c
+++ b/tests/qtest/ide-test.c
@@ -30,7 +30,6 @@
#include "libqos/pci-pc.h"
#include "libqos/malloc-pc.h"
#include "qapi/qmp/qdict.h"
-#include "qemu-common.h"
#include "qemu/bswap.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/pci_regs.h"
diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c
index 19612e9405ae..ed431e34e68d 100644
--- a/tests/qtest/ipmi-bt-test.c
+++ b/tests/qtest/ipmi-bt-test.c
@@ -31,7 +31,6 @@
#include "libqtest-single.h"
-#include "qemu-common.h"
#define IPMI_IRQ 5
diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
index 4e8af42a9d04..95628a418579 100644
--- a/tests/qtest/ivshmem-test.c
+++ b/tests/qtest/ivshmem-test.c
@@ -14,7 +14,6 @@
#include "libqos/libqos-pc.h"
#include "libqos/libqos-spapr.h"
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#define TMPSHMSIZE (1 << 20)
static char *tmpshm;
diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
index eaa2096512e5..41c4be5efa93 100644
--- a/tests/qtest/libqos/ahci.c
+++ b/tests/qtest/libqos/ahci.c
@@ -28,7 +28,6 @@
#include "ahci.h"
#include "pci-pc.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "hw/pci/pci_ids.h"
diff --git a/tests/qtest/libqos/malloc-pc.c b/tests/qtest/libqos/malloc-pc.c
index f1e3b392a53c..bbd1b4827e54 100644
--- a/tests/qtest/libqos/malloc-pc.c
+++ b/tests/qtest/libqos/malloc-pc.c
@@ -16,8 +16,6 @@
#include "standard-headers/linux/qemu_fw_cfg.h"
-#include "qemu-common.h"
-
#define ALLOC_PAGE_SIZE (4096)
void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags)
diff --git a/tests/qtest/libqos/malloc-spapr.c b/tests/qtest/libqos/malloc-spapr.c
index 05b306c191d3..d90ed3c51d7d 100644
--- a/tests/qtest/libqos/malloc-spapr.c
+++ b/tests/qtest/libqos/malloc-spapr.c
@@ -8,8 +8,6 @@
#include "qemu/osdep.h"
#include "malloc-spapr.h"
-#include "qemu-common.h"
-
#define SPAPR_PAGE_SIZE 4096
/* Memory must be a multiple of 256 MB,
diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c
index f708b0143262..f0c8f950c805 100644
--- a/tests/qtest/libqos/malloc.c
+++ b/tests/qtest/libqos/malloc.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "malloc.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
typedef struct MemBlock {
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index dc5566ccfd60..7b5890dcc487 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -21,7 +21,6 @@
#include <sys/un.h>
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c
index 138101b46ac2..8ca18074b9f9 100644
--- a/tests/qtest/machine-none-test.c
+++ b/tests/qtest/machine-none-test.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
diff --git a/tests/qtest/npcm7xx_emc-test.c b/tests/qtest/npcm7xx_emc-test.c
index 7c435ac91576..a353fef0ca13 100644
--- a/tests/qtest/npcm7xx_emc-test.c
+++ b/tests/qtest/npcm7xx_emc-test.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqos/libqos.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qnum.h"
diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
index 32bbae33c597..3cb47d2c5496 100644
--- a/tests/qtest/pxe-test.c
+++ b/tests/qtest/pxe-test.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "qemu-common.h"
#include "libqos/libqtest.h"
#include "boot-sector.h"
#include "libqos/libqos-spapr.h"
diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
index eb34af843b79..6b162e12b5aa 100644
--- a/tests/qtest/qom-test.c
+++ b/tests/qtest/qom-test.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
#include "qemu/cutils.h"
diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
index 450604926492..8fa3313cc333 100644
--- a/tests/qtest/rtl8139-test.c
+++ b/tests/qtest/rtl8139-test.c
@@ -11,7 +11,6 @@
#include "libqtest-single.h"
#include "libqos/pci-pc.h"
#include "qemu/timer.h"
-#include "qemu-common.h"
/* Tests only initialization so far. TODO: Replace with functional tests */
static void nop(void)
diff --git a/tests/qtest/test-filter-mirror.c b/tests/qtest/test-filter-mirror.c
index da4f94de727a..fdf66cebd62f 100644
--- a/tests/qtest/test-filter-mirror.c
+++ b/tests/qtest/test-filter-mirror.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qemu/iov.h"
diff --git a/tests/qtest/test-filter-redirector.c b/tests/qtest/test-filter-redirector.c
index fc16cf7e8d5f..339d3c04cedc 100644
--- a/tests/qtest/test-filter-redirector.c
+++ b/tests/qtest/test-filter-redirector.c
@@ -51,7 +51,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qemu/iov.h"
diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c
index 39138db7744b..b39c9055b309 100644
--- a/tests/qtest/test-x86-cpuid-compat.c
+++ b/tests/qtest/test-x86-cpuid-compat.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qnum.h"
diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
index a71395849f33..fc9f2b94982d 100644
--- a/tests/qtest/virtio-net-test.c
+++ b/tests/qtest/virtio-net-test.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqtest-single.h"
#include "qemu/iov.h"
#include "qemu/module.h"
diff --git a/tests/unit/check-qjson.c b/tests/unit/check-qjson.c
index c845f91d4377..c4e0f851bfc6 100644
--- a/tests/unit/check-qjson.c
+++ b/tests/unit/check-qjson.c
@@ -21,7 +21,6 @@
#include "qapi/qmp/qnum.h"
#include "qapi/qmp/qstring.h"
#include "qemu/unicode.h"
-#include "qemu-common.h"
static QString *from_json_str(const char *jstr, bool single, Error **errp)
{
diff --git a/tests/unit/check-qnull.c b/tests/unit/check-qnull.c
index ebf21db83ccc..5ceacc65d7f3 100644
--- a/tests/unit/check-qnull.c
+++ b/tests/unit/check-qnull.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qapi/qmp/qnull.h"
-#include "qemu-common.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "qapi/error.h"
diff --git a/tests/unit/check-qnum.c b/tests/unit/check-qnum.c
index b85fca23029e..bf7fe45bacc4 100644
--- a/tests/unit/check-qnum.c
+++ b/tests/unit/check-qnum.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
#include "qapi/qmp/qnum.h"
-#include "qemu-common.h"
/*
* Public Interface test-cases
diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c
index 7903ebf4cf80..0ed094e55f3a 100644
--- a/tests/unit/check-qobject.c
+++ b/tests/unit/check-qobject.c
@@ -15,7 +15,6 @@
#include "qapi/qmp/qnull.h"
#include "qapi/qmp/qnum.h"
#include "qapi/qmp/qstring.h"
-#include "qemu-common.h"
#include <math.h>
diff --git a/tests/unit/check-qstring.c b/tests/unit/check-qstring.c
index 4bf977209342..bd861f4f8b47 100644
--- a/tests/unit/check-qstring.c
+++ b/tests/unit/check-qstring.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/qmp/qstring.h"
-#include "qemu-common.h"
/*
* Public Interface test-cases
diff --git a/tests/unit/socket-helpers.c b/tests/unit/socket-helpers.c
index ef31664d0224..0a9e090a68dd 100644
--- a/tests/unit/socket-helpers.c
+++ b/tests/unit/socket-helpers.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/sockets.h"
#include "socket-helpers.h"
diff --git a/tests/unit/test-clone-visitor.c b/tests/unit/test-clone-visitor.c
index 5d48e125b8e4..ce67585305f6 100644
--- a/tests/unit/test-clone-visitor.c
+++ b/tests/unit/test-clone-visitor.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/clone-visitor.h"
#include "test-qapi-visit.h"
diff --git a/tests/unit/test-forward-visitor.c b/tests/unit/test-forward-visitor.c
index 348f7e4e81c8..01de15522711 100644
--- a/tests/unit/test-forward-visitor.c
+++ b/tests/unit/test-forward-visitor.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/forward-visitor.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/error.h"
diff --git a/tests/unit/test-iov.c b/tests/unit/test-iov.c
index 5371066fb6a4..0d2ba9ba87d9 100644
--- a/tests/unit/test-iov.c
+++ b/tests/unit/test-iov.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c
index ccb819f193d9..05703a4e515f 100644
--- a/tests/unit/test-logging.c
+++ b/tests/unit/test-logging.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/log.h"
diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c
index d58c3b78f208..7d961d716afb 100644
--- a/tests/unit/test-qmp-event.c
+++ b/tests/unit/test-qmp-event.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
#include "qapi/qmp/qbool.h"
diff --git a/tests/unit/test-qobject-input-visitor.c b/tests/unit/test-qobject-input-visitor.c
index 22538f814099..aed08eaebcee 100644
--- a/tests/unit/test-qobject-input-visitor.c
+++ b/tests/unit/test-qobject-input-visitor.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-introspect.h"
#include "qapi/qobject-input-visitor.h"
diff --git a/tests/unit/test-qobject-output-visitor.c b/tests/unit/test-qobject-output-visitor.c
index 6af4c33eec15..66b27fad66bb 100644
--- a/tests/unit/test-qobject-output-visitor.c
+++ b/tests/unit/test-qobject-output-visitor.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qobject-output-visitor.h"
#include "test-qapi-visit.h"
diff --git a/tests/unit/test-string-input-visitor.c b/tests/unit/test-string-input-visitor.c
index 249faafc9d79..25094d3ffcef 100644
--- a/tests/unit/test-string-input-visitor.c
+++ b/tests/unit/test-string-input-visitor.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/string-input-visitor.h"
#include "test-qapi-visit.h"
diff --git a/tests/unit/test-string-output-visitor.c b/tests/unit/test-string-output-visitor.c
index e2bedc5c7c92..7ef305361eb7 100644
--- a/tests/unit/test-string-output-visitor.c
+++ b/tests/unit/test-string-output-visitor.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/string-output-visitor.h"
#include "test-qapi-visit.h"
diff --git a/tests/unit/test-thread-pool.c b/tests/unit/test-thread-pool.c
index 70dc6314a1ef..6020e65d6986 100644
--- a/tests/unit/test-thread-pool.c
+++ b/tests/unit/test-thread-pool.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "block/aio.h"
#include "block/thread-pool.h"
#include "block/block.h"
diff --git a/tests/unit/test-util-sockets.c b/tests/unit/test-util-sockets.c
index 896247e3ed36..63909ccb2b54 100644
--- a/tests/unit/test-util-sockets.c
+++ b/tests/unit/test-util-sockets.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/sockets.h"
#include "qapi/error.h"
#include "socket-helpers.h"
diff --git a/tests/unit/test-visitor-serialization.c b/tests/unit/test-visitor-serialization.c
index 462995864775..907263d0307c 100644
--- a/tests/unit/test-visitor-serialization.c
+++ b/tests/unit/test-visitor-serialization.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include <float.h>
-#include "qemu-common.h"
#include "test-qapi-visit.h"
#include "qapi/error.h"
#include "qapi/qmp/qjson.h"
diff --git a/tests/unit/test-xbzrle.c b/tests/unit/test-xbzrle.c
index 795d6f1cbabb..ef951b6e5405 100644
--- a/tests/unit/test-xbzrle.c
+++ b/tests/unit/test-xbzrle.c
@@ -11,7 +11,6 @@
*
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "../migration/xbzrle.h"
diff --git a/ui/gtk-clipboard.c b/ui/gtk-clipboard.c
index d58fd761abdf..8d8a636fd1fa 100644
--- a/ui/gtk-clipboard.c
+++ b/ui/gtk-clipboard.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/main-loop.h"
#include "ui/gtk.h"
diff --git a/ui/keymaps.c b/ui/keymaps.c
index d4a647464bbf..6ceaa97085ab 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "keymaps.h"
#include "trace.h"
diff --git a/ui/vdagent.c b/ui/vdagent.c
index 02861edfb13c..aa6167f0b492 100644
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -1,6 +1,5 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "include/qemu-common.h"
#include "chardev/char.h"
#include "qemu/buffer.h"
#include "qemu/option.h"
diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c
index d48f75eb1ab4..8aeadfaa218a 100644
--- a/ui/vnc-clipboard.c
+++ b/ui/vnc-clipboard.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "vnc.h"
#include "vnc-jobs.h"
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 7b86a4713dfd..5a4b8a4fc0f6 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -34,7 +34,7 @@
#ifdef CONFIG_VNC_PNG
/* The following define is needed by pngconf.h. Otherwise it won't compile,
- because setjmp.h was already included by qemu-common.h. */
+ because setjmp.h was already included by osdep.h. */
#define PNG_SKIP_SETJMP_CHECK
#include <png.h>
#endif
diff --git a/ui/vnc.c b/ui/vnc.c
index 5cbeebb8d1fd..6261d922953b 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "vnc.h"
#include "vnc-jobs.h"
#include "trace.h"
diff --git a/util/aio-win32.c b/util/aio-win32.c
index 7aac89df3a30..44003d645ecd 100644
--- a/util/aio-win32.c
+++ b/util/aio-win32.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "block/block.h"
#include "qemu/main-loop.h"
#include "qemu/queue.h"
diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
index e99b8a4f9c8c..e2690c5f4142 100644
--- a/util/coroutine-sigaltstack.c
+++ b/util/coroutine-sigaltstack.c
@@ -27,7 +27,6 @@
#endif
#include "qemu/osdep.h"
#include <pthread.h>
-#include "qemu-common.h"
#include "qemu/coroutine_int.h"
#ifdef CONFIG_SAFESTACK
diff --git a/util/coroutine-win32.c b/util/coroutine-win32.c
index de6bd4fd3e4e..c196f956d27e 100644
--- a/util/coroutine-win32.c
+++ b/util/coroutine-win32.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/coroutine_int.h"
typedef struct
diff --git a/util/cutils.c b/util/cutils.c
index aaf2ced29142..a01a3a754049 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -26,7 +26,6 @@
#include "qemu/host-utils.h"
#include <math.h>
-#include "qemu-common.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index 16294e98d434..8dc30c51414d 100644
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/event_notifier.h"
#include "qemu/main-loop.h"
diff --git a/util/event_notifier-win32.c b/util/event_notifier-win32.c
index 62c53b0a9909..9352da4699c7 100644
--- a/util/event_notifier-win32.c
+++ b/util/event_notifier-win32.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/event_notifier.h"
#include "qemu/main-loop.h"
diff --git a/util/iov.c b/util/iov.c
index 58c7b3eeee5f..22d6996ccec0 100644
--- a/util/iov.c
+++ b/util/iov.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
#include "qemu/cutils.h"
diff --git a/util/osdep.c b/util/osdep.c
index 97dc9bc65b45..1ea2398686ee 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/sockets.h"
#include "qemu/error-report.h"
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index fae25be3e779..c0125cd572ed 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -31,7 +31,6 @@
#include <glib/gprintf.h>
-#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "trace.h"
#include "qapi/error.h"
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 91d2f45cfe1f..b69e50b3f182 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -32,7 +32,6 @@
#include "qemu/osdep.h"
#include <windows.h>
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/main-loop.h"
#include "trace.h"
diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
index 7f5839cb769e..d791932d63b9 100644
--- a/util/qemu-coroutine-io.c
+++ b/util/qemu-coroutine-io.c
@@ -23,7 +23,6 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/sockets.h"
#include "qemu/coroutine.h"
#include "qemu/iov.h"
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index e8f45a7d30a5..13b5b197f9ea 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -21,7 +21,6 @@
#include <linux/vm_sockets.h>
#endif /* CONFIG_AF_VSOCK */
-#include "qemu-common.h"
#include "monitor/monitor.h"
#include "qapi/clone-visitor.h"
#include "qapi/error.h"
diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c
index 52eb19f3511a..a2d5a6e8259f 100644
--- a/util/qemu-thread-win32.c
+++ b/util/qemu-thread-win32.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/thread.h"
#include "qemu/notify.h"
#include "qemu-thread-common.h"
diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
index df66d09393af..b4c15556c2c4 100755
--- a/target/xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
@@ -42,7 +42,6 @@ cat <<EOF > "${TARGET}.c"
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "core-$NAME/core-isa.h"
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* [PATCH 32/32] Remove qemu-common.h include from most units
@ 2022-03-23 15:57 ` marcandre.lureau
0 siblings, 0 replies; 79+ messages in thread
From: marcandre.lureau @ 2022-03-23 15:57 UTC (permalink / raw)
To: qemu-devel
Cc: John G Johnson, Alexey Kardashevskiy, Li Zhijian,
Markus Armbruster, KONRAD Frederic, open list:raw, Stefan Berger,
Alex Bennée, Huacai Chen, Halil Pasic, Kamil Rytarowski,
Hervé Poussineau, Christian Borntraeger, Michael Roth,
Eric Auger, Stefan Hajnoczi, John Snow, Aarushi Mehta,
Kevin Wolf, Andrew Jeffery, Chris Wulff, Laurent Vivier,
Subbaraya Sundeep, Zhang Chen, open list:sPAPR pseries,
Igor Mammedov, Colin Xu, Fam Zheng, Peter Maydell,
David Hildenbrand, Yanan Wang, Max Filippov, Alistair Francis,
Yoshinori Sato, Helge Deller, Qiuhao Li, Artyom Tarasenko,
Stefano Garzarella, Eric Farman, Corey Minyard, Stefan Weil,
Julia Suvorova, Greg Kurz, Cameron Esfahani, Bandan Das,
Alexander Graf, Michael Rolnik, Cédric Le Goater,
open list:RISC-V TCG CPUs, Cornelia Huck,
open list:S390-ccw boot, Tyrone Ting, Hanna Reitz,
open list:ARM PrimeCell and...,
Wenchao Wang, Aurelien Jarno, Elena Ufimtseva, Jason Wang,
Bin Meng, Taylor Simpson, Gerd Hoffmann, Edgar E. Iglesias,
Daniel Henrique Barboza, Joel Stanley, Aleksandar Rikalo,
Mark Cave-Ayland, Fabien Chouteau, Roman Bolshakov,
Sunil Muthuswamy, Eduardo Habkost, Bastian Koppelmann,
open list:Overall KVM CPUs, Michael S. Tsirkin,
Christian Schoenebeck, open list:X86 HAXM CPUs, Ani Sinha,
Warner Losh, Marek Vasut, Jagannathan Raman, Havard Skinnemoen,
Reinoud Zandijk, Kyle Evans, Marc-André Lureau,
Alexander Bulekov, Richard Henderson, David Gibson,
Daniel P. Berrangé,
Darren Kenny, Thomas Huth, Marcelo Tosatti, Palmer Dabbelt,
Paolo Bonzini, Philippe Mathieu-Daudé
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/qemu-common.h | 9 ---------
accel/hvf/hvf-all.c | 1 -
accel/tcg/cpu-exec.c | 1 -
accel/tcg/tcg-accel-ops-icount.c | 1 -
accel/tcg/tcg-accel-ops-mttcg.c | 1 -
accel/tcg/tcg-accel-ops-rr.c | 1 -
accel/tcg/tcg-accel-ops.c | 1 -
accel/tcg/tcg-all.c | 1 -
accel/tcg/translate-all.c | 1 -
audio/audio_win_int.c | 1 -
backends/hostmem-epc.c | 1 -
backends/tpm/tpm_passthrough.c | 1 -
block/file-posix.c | 1 -
block/io_uring.c | 1 -
bsd-user/freebsd/os-syscall.c | 1 -
bsd-user/mmap.c | 1 -
chardev/char-fd.c | 1 -
chardev/char-pipe.c | 1 -
chardev/char-pty.c | 1 -
cpu.c | 1 -
crypto/cipher-afalg.c | 1 -
crypto/hash-afalg.c | 1 -
dump/dump.c | 1 -
dump/win_dump.c | 1 -
fsdev/virtfs-proxy-helper.c | 1 -
gdbstub.c | 1 -
hw/9pfs/9p-proxy.c | 1 -
hw/alpha/dp264.c | 1 -
hw/avr/boot.c | 1 -
hw/core/loader.c | 1 -
hw/display/artist.c | 1 -
hw/display/cg3.c | 1 -
hw/display/tcx.c | 1 -
hw/display/virtio-gpu-udmabuf.c | 1 -
hw/dma/pl330.c | 1 -
hw/hppa/machine.c | 1 -
hw/i386/pc_sysfw.c | 1 -
hw/i386/x86.c | 1 -
hw/input/vhost-user-input.c | 1 -
hw/intc/xics_kvm.c | 1 -
hw/m68k/mcf5208.c | 1 -
hw/m68k/q800.c | 1 -
hw/m68k/virt.c | 1 -
hw/microblaze/boot.c | 1 -
hw/mips/fuloong2e.c | 1 -
hw/mips/jazz.c | 1 -
hw/mips/loongson3_virt.c | 1 -
hw/mips/malta.c | 1 -
hw/mips/mipssim.c | 1 -
hw/misc/sbsa_ec.c | 1 -
hw/net/fsl_etsec/etsec.c | 1 -
hw/net/fsl_etsec/rings.c | 1 -
hw/net/msf2-emac.c | 1 -
hw/net/npcm7xx_emc.c | 1 -
hw/nios2/boot.c | 1 -
hw/nios2/generic_nommu.c | 1 -
hw/nvram/fw_cfg.c | 1 -
hw/pci-host/mv64361.c | 1 -
hw/pci-host/pnv_phb3.c | 1 -
hw/pci-host/pnv_phb3_msi.c | 1 -
hw/pci-host/pnv_phb3_pbcq.c | 1 -
hw/pci-host/pnv_phb4.c | 1 -
hw/pci-host/pnv_phb4_pec.c | 1 -
hw/pci-host/raven.c | 1 -
hw/pci-host/remote.c | 1 -
hw/pci/pci.c | 1 -
hw/ppc/e500.c | 1 -
hw/ppc/mac_newworld.c | 1 -
hw/ppc/mac_oldworld.c | 1 -
hw/ppc/pegasos2.c | 1 -
hw/ppc/pnv.c | 1 -
hw/ppc/pnv_bmc.c | 1 -
hw/ppc/ppc405_boards.c | 1 -
hw/ppc/ppc440_bamboo.c | 1 -
hw/ppc/sam460ex.c | 1 -
hw/ppc/spapr.c | 1 -
hw/ppc/spapr_numa.c | 1 -
hw/ppc/spapr_pci_nvlink2.c | 1 -
hw/ppc/spapr_tpm_proxy.c | 1 -
hw/ppc/spapr_vof.c | 1 -
hw/ppc/virtex_ml507.c | 1 -
hw/ppc/vof.c | 1 -
hw/remote/iohub.c | 1 -
hw/remote/machine.c | 1 -
hw/remote/memory.c | 1 -
hw/remote/message.c | 1 -
hw/remote/mpqemu-link.c | 1 -
hw/remote/proxy-memory-listener.c | 1 -
hw/remote/proxy.c | 1 -
hw/remote/remote-obj.c | 1 -
hw/riscv/boot.c | 1 -
hw/rx/rx-gdbsim.c | 1 -
hw/s390x/ipl.c | 1 -
hw/sd/sd.c | 1 -
hw/sparc/leon3.c | 1 -
hw/sparc/sun4m.c | 1 -
hw/sparc64/sun4u.c | 1 -
hw/usb/dev-mtp.c | 1 -
hw/virtio/virtio-iommu.c | 1 -
hw/virtio/virtio-mem.c | 1 -
hw/virtio/virtio-pmem.c | 1 -
io/channel-socket.c | 1 -
linux-user/aarch64/cpu_loop.c | 1 -
linux-user/alpha/cpu_loop.c | 1 -
linux-user/arm/cpu_loop.c | 1 -
linux-user/cris/cpu_loop.c | 1 -
linux-user/hexagon/cpu_loop.c | 1 -
linux-user/i386/cpu_loop.c | 1 -
linux-user/m68k/cpu_loop.c | 1 -
linux-user/microblaze/cpu_loop.c | 1 -
linux-user/mips/cpu_loop.c | 1 -
linux-user/openrisc/cpu_loop.c | 1 -
linux-user/ppc/cpu_loop.c | 1 -
linux-user/riscv/cpu_loop.c | 1 -
linux-user/s390x/cpu_loop.c | 1 -
linux-user/sh4/cpu_loop.c | 1 -
linux-user/sparc/cpu_loop.c | 1 -
linux-user/uname.c | 1 -
monitor/qmp-cmds.c | 1 -
net/colo-compare.c | 1 -
net/net.c | 1 -
net/socket.c | 1 -
net/tap-bsd.c | 1 -
net/tap-linux.c | 1 -
net/tap-solaris.c | 1 -
net/tap-win32.c | 1 -
net/tap.c | 1 -
net/vde.c | 1 -
os-posix.c | 1 -
os-win32.c | 1 -
page-vary-common.c | 1 -
qga/commands-posix.c | 1 -
softmmu/cpu-throttle.c | 1 -
softmmu/cpu-timers.c | 1 -
softmmu/cpus.c | 1 -
softmmu/datadir.c | 1 -
softmmu/icount.c | 1 -
softmmu/runstate.c | 1 -
stubs/monitor-core.c | 1 -
target/arm/hvf/hvf.c | 1 -
target/arm/kvm.c | 1 -
target/arm/kvm64.c | 1 -
target/hexagon/gdbstub.c | 1 -
target/i386/hax/hax-all.c | 1 -
target/i386/hvf/hvf.c | 1 -
target/i386/hvf/x86.c | 1 -
target/i386/hvf/x86_cpuid.c | 1 -
target/i386/hvf/x86_decode.c | 1 -
target/i386/hvf/x86_descr.c | 1 -
target/i386/hvf/x86_emu.c | 1 -
target/i386/hvf/x86_flags.c | 1 -
target/i386/hvf/x86_mmu.c | 1 -
target/i386/hvf/x86_task.c | 1 -
target/i386/hvf/x86hvf.c | 1 -
target/i386/kvm/sev-stub.c | 1 -
target/i386/nvmm/nvmm-all.c | 1 -
target/i386/whpx/whpx-all.c | 1 -
target/i386/whpx/whpx-apic.c | 1 -
target/mips/kvm.c | 1 -
target/nios2/nios2-semi.c | 1 -
target/ppc/kvm.c | 1 -
target/riscv/kvm.c | 1 -
target/rx/cpu.c | 1 -
target/rx/gdbstub.c | 1 -
target/s390x/kvm/kvm.c | 1 -
target/s390x/tcg/vec_fpu_helper.c | 1 -
target/s390x/tcg/vec_int_helper.c | 1 -
target/s390x/tcg/vec_string_helper.c | 1 -
target/tricore/gdbstub.c | 1 -
target/xtensa/core-de233_fpu.c | 1 -
target/xtensa/core-dsp3400.c | 1 -
target/xtensa/core-test_mmuhifi_c3.c | 1 -
tcg/tci.c | 1 -
tests/qtest/acpi-utils.c | 1 -
tests/qtest/ahci-test.c | 1 -
tests/qtest/aspeed_hace-test.c | 1 -
tests/qtest/bios-tables-test.c | 1 -
tests/qtest/boot-sector.c | 1 -
tests/qtest/cpu-plug-test.c | 1 -
tests/qtest/dbus-display-test.c | 1 -
tests/qtest/dbus-vmstate-test.c | 1 -
tests/qtest/device-introspect-test.c | 1 -
tests/qtest/e1000e-test.c | 2 --
tests/qtest/erst-test.c | 1 -
tests/qtest/fdc-test.c | 1 -
tests/qtest/fuzz/qos_fuzz.c | 1 -
tests/qtest/hd-geo-test.c | 1 -
tests/qtest/ide-test.c | 1 -
tests/qtest/ipmi-bt-test.c | 1 -
tests/qtest/ivshmem-test.c | 1 -
tests/qtest/libqos/ahci.c | 1 -
tests/qtest/libqos/malloc-pc.c | 2 --
tests/qtest/libqos/malloc-spapr.c | 2 --
tests/qtest/libqos/malloc.c | 1 -
tests/qtest/libqtest.c | 1 -
tests/qtest/machine-none-test.c | 1 -
tests/qtest/npcm7xx_emc-test.c | 1 -
tests/qtest/pxe-test.c | 1 -
tests/qtest/qom-test.c | 1 -
tests/qtest/rtl8139-test.c | 1 -
tests/qtest/test-filter-mirror.c | 1 -
tests/qtest/test-filter-redirector.c | 1 -
tests/qtest/test-x86-cpuid-compat.c | 1 -
tests/qtest/virtio-net-test.c | 1 -
tests/unit/check-qjson.c | 1 -
tests/unit/check-qnull.c | 1 -
tests/unit/check-qnum.c | 1 -
tests/unit/check-qobject.c | 1 -
tests/unit/check-qstring.c | 1 -
tests/unit/socket-helpers.c | 1 -
tests/unit/test-clone-visitor.c | 1 -
tests/unit/test-forward-visitor.c | 1 -
tests/unit/test-iov.c | 1 -
tests/unit/test-logging.c | 1 -
tests/unit/test-qmp-event.c | 1 -
tests/unit/test-qobject-input-visitor.c | 1 -
tests/unit/test-qobject-output-visitor.c | 1 -
tests/unit/test-string-input-visitor.c | 1 -
tests/unit/test-string-output-visitor.c | 1 -
tests/unit/test-thread-pool.c | 1 -
tests/unit/test-util-sockets.c | 1 -
tests/unit/test-visitor-serialization.c | 1 -
tests/unit/test-xbzrle.c | 1 -
ui/gtk-clipboard.c | 1 -
ui/keymaps.c | 1 -
ui/vdagent.c | 1 -
ui/vnc-clipboard.c | 1 -
ui/vnc-enc-tight.c | 2 +-
ui/vnc.c | 1 -
util/aio-win32.c | 1 -
util/coroutine-sigaltstack.c | 1 -
util/coroutine-win32.c | 1 -
util/cutils.c | 1 -
util/event_notifier-posix.c | 1 -
util/event_notifier-win32.c | 1 -
util/iov.c | 1 -
util/osdep.c | 1 -
util/oslib-posix.c | 1 -
util/oslib-win32.c | 1 -
util/qemu-coroutine-io.c | 1 -
util/qemu-sockets.c | 1 -
util/qemu-thread-win32.c | 1 -
target/xtensa/import_core.sh | 1 -
243 files changed, 1 insertion(+), 254 deletions(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index 0498acd16b78..ba32cc8b1f39 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -1,12 +1,3 @@
-/*
- * This file is supposed to be included only by .c files. No header file should
- * depend on qemu-common.h, as this would easily lead to circular header
- * dependencies.
- *
- * If a header file uses a definition from qemu-common.h, that definition
- * must be moved to a separate header file, and the header that uses it
- * must include that header.
- */
#ifndef QEMU_COMMON_H
#define QEMU_COMMON_H
diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
index f185b0830a75..0043f4d308ba 100644
--- a/accel/hvf/hvf-all.c
+++ b/accel/hvf/hvf-all.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "sysemu/hvf.h"
#include "sysemu/hvf_int.h"
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index c997c2e8e015..083ada76b124 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/qemu-print.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c
index bdaf2c943b49..6436cd9349a3 100644
--- a/accel/tcg/tcg-accel-ops-icount.c
+++ b/accel/tcg/tcg-accel-ops-icount.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/replay.h"
#include "sysemu/cpu-timers.h"
diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttcg.c
index ea2b741deb51..d50239e0e28f 100644
--- a/accel/tcg/tcg-accel-ops-mttcg.c
+++ b/accel/tcg/tcg-accel-ops-mttcg.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/replay.h"
#include "sysemu/cpu-timers.h"
diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
index b287110766ef..1a72149f0e46 100644
--- a/accel/tcg/tcg-accel-ops-rr.c
+++ b/accel/tcg/tcg-accel-ops-rr.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/replay.h"
#include "sysemu/cpu-timers.h"
diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
index ea7dcad674cf..684dc5a1371f 100644
--- a/accel/tcg/tcg-accel-ops.c
+++ b/accel/tcg/tcg-accel-ops.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/replay.h"
#include "sysemu/cpu-timers.h"
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index d6336a9c966d..47952eecd779 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sysemu/tcg.h"
#include "sysemu/cpu-timers.h"
#include "tcg/tcg.h"
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 5971cd53ab9f..a6e03c1e50b2 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#define NO_CPU_IO_DEFS
#include "trace.h"
diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
index 5ea8157dfcc8..316f118f5099 100644
--- a/audio/audio_win_int.c
+++ b/audio/audio_win_int.c
@@ -1,7 +1,6 @@
/* public domain */
#include "qemu/osdep.h"
-#include "qemu-common.h"
#define AUDIO_CAP "win-int"
#include <windows.h>
diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c
index b47f98b6a3aa..037292d2672f 100644
--- a/backends/hostmem-epc.c
+++ b/backends/hostmem-epc.c
@@ -12,7 +12,6 @@
#include <sys/ioctl.h>
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qom/object_interfaces.h"
#include "qapi/error.h"
#include "sysemu/hostmem.h"
diff --git a/backends/tpm/tpm_passthrough.c b/backends/tpm/tpm_passthrough.c
index d5558fae6cc5..5a2f74db1b38 100644
--- a/backends/tpm/tpm_passthrough.c
+++ b/backends/tpm/tpm_passthrough.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qemu/sockets.h"
diff --git a/block/file-posix.c b/block/file-posix.c
index 61b02d85ebf1..bfd9b2111143 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
diff --git a/block/io_uring.c b/block/io_uring.c
index 782afdb433e1..0b401512b973 100644
--- a/block/io_uring.c
+++ b/block/io_uring.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
#include <liburing.h>
-#include "qemu-common.h"
#include "block/aio.h"
#include "qemu/queue.h"
#include "block/block.h"
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index a17ff9f6ecce..d272478e7b0a 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -37,7 +37,6 @@
#include <utime.h>
#include "qemu.h"
-#include "qemu-common.h"
#include "signal-common.h"
#include "user/syscall-trace.h"
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 07aa0a634dff..e54e26de17b0 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qemu.h"
-#include "qemu-common.h"
static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
static __thread int mmap_lock_count;
diff --git a/chardev/char-fd.c b/chardev/char-fd.c
index 93c56913b49a..6ec9682b22f2 100644
--- a/chardev/char-fd.c
+++ b/chardev/char-fd.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/module.h"
#include "qemu/sockets.h"
#include "qapi/error.h"
diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
index 7eca5d9a56ae..66d3b8509183 100644
--- a/chardev/char-pipe.c
+++ b/chardev/char-pipe.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index d73d8b23903d..1e2863f532a8 100644
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "chardev/char.h"
#include "io/channel-file.h"
diff --git a/cpu.c b/cpu.c
index ab2c7c81e460..0fef70e18e74 100644
--- a/cpu.c
+++ b/cpu.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "exec/target_page.h"
diff --git a/crypto/cipher-afalg.c b/crypto/cipher-afalg.c
index c55cd28bf01c..3df8fc54c051 100644
--- a/crypto/cipher-afalg.c
+++ b/crypto/cipher-afalg.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
#include "qemu/sockets.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "crypto/cipher.h"
#include "cipherpriv.h"
diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c
index 4ac18c7c1db7..3ebea392920d 100644
--- a/crypto/hash-afalg.c
+++ b/crypto/hash-afalg.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "crypto/hash.h"
#include "crypto/hmac.h"
diff --git a/dump/dump.c b/dump/dump.c
index 5d71c47d06aa..e766ce1d7d91 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "elf.h"
#include "exec/hwaddr.h"
diff --git a/dump/win_dump.c b/dump/win_dump.c
index c5eb5a9aacd7..fbdbb7bd93a6 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "elf.h"
#include "exec/hwaddr.h"
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index d06a0f7b8326..2dde27922fe2 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -21,7 +21,6 @@
#include <linux/magic.h>
#endif
#include <cap-ng.h>
-#include "qemu-common.h"
#include "qemu/sockets.h"
#include "qemu/xattr.h"
#include "9p-iov-marshal.h"
diff --git a/gdbstub.c b/gdbstub.c
index c8375e3c3ffe..2c804d506629 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/ctype.h"
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
index 4c5e0fc217eb..99d115ff0db4 100644
--- a/hw/9pfs/9p-proxy.c
+++ b/hw/9pfs/9p-proxy.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include <sys/socket.h>
#include <sys/un.h>
-#include "qemu-common.h"
#include "9p.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index c78ed96d0eca..f4349eba83fb 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "elf.h"
#include "hw/loader.h"
diff --git a/hw/avr/boot.c b/hw/avr/boot.c
index cbede775cee2..617f3a144c85 100644
--- a/hw/avr/boot.c
+++ b/hw/avr/boot.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 8d9b2df6e725..8167301f0402 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -43,7 +43,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
diff --git a/hw/display/artist.c b/hw/display/artist.c
index 69a8f9eea8ba..8e121bb0b4dc 100644
--- a/hw/display/artist.c
+++ b/hw/display/artist.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index 4b7e78d91924..2e9656ae1c39 100644
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index d4d09d0df8d5..1b27b64f6d14 100644
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "ui/console.h"
diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c
index 1597921c51fc..8bdf4bac6e4b 100644
--- a/hw/display/virtio-gpu-udmabuf.c
+++ b/hw/display/virtio-gpu-udmabuf.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/iov.h"
#include "ui/console.h"
#include "hw/virtio/virtio-gpu.h"
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 31ce01b7c57c..08e5938ec7b7 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 98b30e0395ee..f7595c08577c 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -4,7 +4,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "elf.h"
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index c8b17af95353..0540047bad22 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "sysemu/block-backend.h"
#include "qemu/error-report.h"
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 4cf107baea34..bb6727279097 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -25,7 +25,6 @@
#include "qemu/option.h"
#include "qemu/cutils.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c
index 273e96a7b12d..aeb0624fe57e 100644
--- a/hw/input/vhost-user-input.c
+++ b/hw/input/vhost-user-input.c
@@ -7,7 +7,6 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/virtio/virtio-input.h"
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index f5bfc501bc15..9719d98a179e 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "trace.h"
#include "sysemu/kvm.h"
#include "hw/ppc/spapr.h"
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 93812ee206ea..655207e393dc 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -11,7 +11,6 @@
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/irq.h"
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 66ca5c0df6ef..099a758c6f6a 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -22,7 +22,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 8e630282e02c..7de8b5f83393 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "cpu.h"
#include "hw/boards.h"
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
index 03c030aa2cf0..8b92a9801a02 100644
--- a/hw/microblaze/boot.c
+++ b/hw/microblaze/boot.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "qemu/option.h"
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index c9f14e70a077..7b13098f9b1b 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index 4d6b44de342e..6598d7dddd59 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/clock.h"
#include "hw/mips/mips.h"
diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
index ae192db0c8b9..25534288dd81 100644
--- a/hw/mips/loongson3_virt.c
+++ b/hw/mips/loongson3_virt.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/units.h"
#include "qemu/cutils.h"
#include "qemu/datadir.h"
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index c4474b927c46..9ffdc5b8f187 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/bitops.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/clock.h"
#include "hw/southbridge/piix.h"
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index 30bc1c4f086f..39f64448f244 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "hw/clock.h"
#include "hw/mips/mips.h"
diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c
index 83020fe9ac9b..8d939fe31b1b 100644
--- a/hw/misc/sbsa_ec.c
+++ b/hw/misc/sbsa_ec.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/log.h"
#include "hw/sysbus.h"
#include "sysemu/runstate.h"
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index e7fc082518d2..6d50c395439a 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -27,7 +27,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/sysbus.h"
#include "hw/irq.h"
#include "hw/ptimer.h"
diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
index 8f084464155d..a32589e33be4 100644
--- a/hw/net/fsl_etsec/rings.c
+++ b/hw/net/fsl_etsec/rings.c
@@ -22,7 +22,6 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "net/checksum.h"
#include "qemu/log.h"
#include "etsec.h"
diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
index 9278fdce0b3d..7ccd3e514271 100644
--- a/hw/net/msf2-emac.c
+++ b/hw/net/msf2-emac.c
@@ -29,7 +29,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/log.h"
#include "qapi/error.h"
#include "hw/registerfields.h"
diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
index 9a2328935c1c..7c86bb52e571 100644
--- a/hw/net/npcm7xx_emc.c
+++ b/hw/net/npcm7xx_emc.c
@@ -32,7 +32,6 @@
/* For crc32 */
#include <zlib.h>
-#include "qemu-common.h"
#include "hw/irq.h"
#include "hw/qdev-clock.h"
#include "hw/qdev-properties.h"
diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
index e889595d5c2b..07b8d87633b6 100644
--- a/hw/nios2/boot.c
+++ b/hw/nios2/boot.c
@@ -30,7 +30,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
index fbc18dbd04c2..48edb3ae373d 100644
--- a/hw/nios2/generic_nommu.c
+++ b/hw/nios2/generic_nommu.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/char/serial.h"
#include "hw/boards.h"
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index ea2d56f9f2af..4125cbebcd38 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "sysemu/sysemu.h"
#include "sysemu/dma.h"
diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
index 00b3ff7d9098..cc9c4d6d3b33 100644
--- a/hw/pci-host/mv64361.c
+++ b/hw/pci-host/mv64361.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "hw/hw.h"
diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
index 6e9aa9d6ace2..4e68ad4f03fc 100644
--- a/hw/pci-host/pnv_phb3.c
+++ b/hw/pci-host/pnv_phb3.c
@@ -10,7 +10,6 @@
#include "qemu/log.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/pci-host/pnv_phb3_regs.h"
#include "hw/pci-host/pnv_phb3.h"
#include "hw/pci/pcie_host.h"
diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c
index 8bcbc2cc4f37..2f4112907b84 100644
--- a/hw/pci-host/pnv_phb3_msi.c
+++ b/hw/pci-host/pnv_phb3_msi.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/pci-host/pnv_phb3_regs.h"
#include "hw/pci-host/pnv_phb3.h"
#include "hw/ppc/pnv.h"
diff --git a/hw/pci-host/pnv_phb3_pbcq.c b/hw/pci-host/pnv_phb3_pbcq.c
index c7426cd27a20..82f70efa4311 100644
--- a/hw/pci-host/pnv_phb3_pbcq.c
+++ b/hw/pci-host/pnv_phb3_pbcq.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/log.h"
#include "target/ppc/cpu.h"
#include "hw/ppc/fdt.h"
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 11c97e27eb16..3c4c2dace0a3 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -10,7 +10,6 @@
#include "qemu/log.h"
#include "qapi/visitor.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "monitor/monitor.h"
#include "target/ppc/cpu.h"
#include "hw/pci-host/pnv_phb4_regs.h"
diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
index 6f1121a9489a..61bc0b503e3e 100644
--- a/hw/pci-host/pnv_phb4_pec.c
+++ b/hw/pci-host/pnv_phb4_pec.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/log.h"
#include "target/ppc/cpu.h"
#include "hw/ppc/fdt.h"
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index 6e514f75eb8f..7a105e4a63d3 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qemu/log.h"
diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
index eee45444ef73..bfb25ef6af85 100644
--- a/hw/pci-host/remote.c
+++ b/hw/pci-host/remote.c
@@ -22,7 +22,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index dae9119bfe5f..e99417e50110 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "hw/irq.h"
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index c7e6767f91a8..2bc3dce1fb7d 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 7b5a205309af..e8ef1a9e5d9b 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -47,7 +47,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "hw/ppc/ppc.h"
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 7016979a7cd0..fe2adb057b0c 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qapi/error.h"
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index d45008ac7131..56bf203dfddf 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/units.h"
#include "qapi/error.h"
#include "hw/hw.h"
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 00f57c9678e6..c5e48992d988 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qemu/cutils.h"
diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
index 75a22ce50b11..99f1e8d7f9f3 100644
--- a/hw/ppc/pnv_bmc.c
+++ b/hw/ppc/pnv_bmc.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "target/ppc/cpu.h"
#include "qemu/log.h"
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index 7e1a4ac9553b..32013b89836a 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -25,7 +25,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/ppc/ppc.h"
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 7fb620b9a056..efa90ef5ba73 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/error-report.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/error-report.h"
#include "net/net.h"
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 0737234d66e5..2f24598f55db 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index a4372ba1891e..cc11fcc8b24d 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/memalign.h"
#include "qapi/error.h"
diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
index d7c0e212baf8..a64098c375e0 100644
--- a/hw/ppc/spapr_numa.c
+++ b/hw/ppc/spapr_numa.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/ppc/spapr_numa.h"
#include "hw/pci-host/spapr.h"
#include "hw/ppc/fdt.h"
diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c
index 4678c79235f6..63b476c8f727 100644
--- a/hw/ppc/spapr_pci_nvlink2.c
+++ b/hw/ppc/spapr_pci_nvlink2.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/pci/pci.h"
#include "hw/pci-host/spapr.h"
#include "hw/ppc/spapr_numa.h"
diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c
index 2454086744b1..e10af35a1850 100644
--- a/hw/ppc/spapr_tpm_proxy.c
+++ b/hw/ppc/spapr_tpm_proxy.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/reset.h"
diff --git a/hw/ppc/spapr_vof.c b/hw/ppc/spapr_vof.c
index a33f940c32bb..09f29be0b9de 100644
--- a/hw/ppc/spapr_vof.c
+++ b/hw/ppc/spapr_vof.c
@@ -4,7 +4,6 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h"
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 9c575403b85c..b67a709ddce2 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "cpu.h"
diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c
index 2b63a6287561..8d96593677da 100644
--- a/hw/ppc/vof.c
+++ b/hw/ppc/vof.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu/range.h"
#include "qemu/units.h"
diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c
index 547d597f0feb..40dfee4bad43 100644
--- a/hw/remote/iohub.c
+++ b/hw/remote/iohub.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_ids.h"
diff --git a/hw/remote/machine.c b/hw/remote/machine.c
index 952105eab5a2..92d71d47bb9c 100644
--- a/hw/remote/machine.c
+++ b/hw/remote/machine.c
@@ -14,7 +14,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/remote/machine.h"
#include "exec/memory.h"
diff --git a/hw/remote/memory.c b/hw/remote/memory.c
index 6e21ab1a45c9..6d60da91e01c 100644
--- a/hw/remote/memory.c
+++ b/hw/remote/memory.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/remote/memory.h"
#include "exec/ram_addr.h"
diff --git a/hw/remote/message.c b/hw/remote/message.c
index 11d729845c5a..50f6bf2d495f 100644
--- a/hw/remote/message.c
+++ b/hw/remote/message.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/remote/machine.h"
#include "io/channel.h"
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
index 7e841820e521..2a4aa651ca26 100644
--- a/hw/remote/mpqemu-link.c
+++ b/hw/remote/mpqemu-link.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/module.h"
#include "hw/remote/mpqemu-link.h"
diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
index 0e893f3189e9..eb9918fe72bb 100644
--- a/hw/remote/proxy-memory-listener.c
+++ b/hw/remote/proxy-memory-listener.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/compiler.h"
#include "qemu/int128.h"
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index bad164299dd4..1c7786b52cf1 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -7,7 +7,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "hw/remote/proxy.h"
#include "hw/pci/pci.h"
diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
index 4f21254219f8..333e5ac44331 100644
--- a/hw/remote/remote-obj.c
+++ b/hw/remote/remote-obj.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/notify.h"
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index cae74fcbcd9a..0f179d36014a 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
#include "qemu/error-report.h"
diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index 75d1fec6ca46..64f897e5b10a 100644
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -20,7 +20,6 @@
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "hw/loader.h"
#include "hw/rx/rx62n.h"
#include "sysemu/qtest.h"
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index eb7fc4c4ae87..84971e537b3e 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -13,7 +13,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qapi/error.h"
#include "sysemu/reset.h"
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index cd67a7bac8e2..8e6fa0915137 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -47,7 +47,6 @@
#include "qemu/timer.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "qemu-common.h"
#include "sdmmc-internal.h"
#include "trace.h"
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index a9f24968275d..1e39d2e2d0ac 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/irq.h"
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 7f3a7c002780..fccaed1eb444 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/datadir.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
#include "qemu/error-report.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index cda7df36e312..6fd08e2298a6 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -26,7 +26,6 @@
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "cpu.h"
#include "hw/pci/pci.h"
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index e6b77a2a941d..5831395cef75 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include <wchar.h>
diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index 664cbd958323..6de58a76a7ff 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -20,7 +20,6 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/iov.h"
-#include "qemu-common.h"
#include "hw/qdev-properties.h"
#include "hw/virtio/virtio.h"
#include "sysemu/kvm.h"
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 35cbf1f21946..5aca40872695 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/iov.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
index 5419dca75e2c..5dd21c2c4408 100644
--- a/hw/virtio/virtio-pmem.c
+++ b/hw/virtio/virtio-pmem.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "hw/virtio/virtio-pmem.h"
diff --git a/io/channel-socket.c b/io/channel-socket.c
index 7a8d9f69c92d..9f5ddf68b687 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-sockets.h"
#include "qemu/module.h"
diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
index 31a66a4fa07c..3b273f62997a 100644
--- a/linux-user/aarch64/cpu_loop.c
+++ b/linux-user/aarch64/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c
index de6e0c901cdf..2ea039aa71f7 100644
--- a/linux-user/alpha/cpu_loop.c
+++ b/linux-user/alpha/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index 9dcb2e024eb0..683b8e47c2bd 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "elf.h"
diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c
index 0f46b3c1a87a..01e6ff16fc92 100644
--- a/linux-user/cris/cpu_loop.c
+++ b/linux-user/cris/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c
index 0d73934d31d5..b84e25bf71eb 100644
--- a/linux-user/hexagon/cpu_loop.c
+++ b/linux-user/hexagon/cpu_loop.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
index 90bffc1956aa..492701dd9af9 100644
--- a/linux-user/i386/cpu_loop.c
+++ b/linux-user/i386/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "qemu/timer.h"
#include "user-internals.h"
diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
index 928a18e3cf05..d1bf8548b747 100644
--- a/linux-user/m68k/cpu_loop.c
+++ b/linux-user/m68k/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/microblaze/cpu_loop.c b/linux-user/microblaze/cpu_loop.c
index 1a2556be2c5f..5ccf9e942eaa 100644
--- a/linux-user/microblaze/cpu_loop.c
+++ b/linux-user/microblaze/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
index 9bb12a07ba08..d5c1c7941d34 100644
--- a/linux-user/mips/cpu_loop.c
+++ b/linux-user/mips/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/openrisc/cpu_loop.c b/linux-user/openrisc/cpu_loop.c
index 7683bea0649e..a7aa586c8f96 100644
--- a/linux-user/openrisc/cpu_loop.c
+++ b/linux-user/openrisc/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/ppc/cpu_loop.c b/linux-user/ppc/cpu_loop.c
index b468f199e4d2..02204ad8bebb 100644
--- a/linux-user/ppc/cpu_loop.c
+++ b/linux-user/ppc/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "qemu/timer.h"
#include "user-internals.h"
diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
index 26d446f32379..29084c142196 100644
--- a/linux-user/riscv/cpu_loop.c
+++ b/linux-user/riscv/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu.h"
#include "user-internals.h"
diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c
index 7901dfe6f518..285bc60071a8 100644
--- a/linux-user/s390x/cpu_loop.c
+++ b/linux-user/s390x/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c
index 1bd313cb19a2..c805f9db1104 100644
--- a/linux-user/sh4/cpu_loop.c
+++ b/linux-user/sh4/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
index baf3d9ae011f..434c90a55f8f 100644
--- a/linux-user/sparc/cpu_loop.c
+++ b/linux-user/sparc/cpu_loop.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu.h"
#include "user-internals.h"
#include "cpu_loop-common.h"
diff --git a/linux-user/uname.c b/linux-user/uname.c
index 0856783b2190..415fdf31b62d 100644
--- a/linux-user/uname.c
+++ b/linux-user/uname.c
@@ -21,7 +21,6 @@
#include "qemu.h"
#include "user-internals.h"
-//#include "qemu-common.h"
#include "uname.h"
/* return highest utsname machine name for emulated instruction set
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 883cf1ca4bbf..5e7302cbb995 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -14,7 +14,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/option.h"
#include "monitor/monitor.h"
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 62554b5b3c8f..d5d096580577 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -13,7 +13,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "trace.h"
#include "qapi/error.h"
diff --git a/net/net.c b/net/net.c
index 9f17ab204422..a094cf1d2929 100644
--- a/net/net.c
+++ b/net/net.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "net/net.h"
#include "clients.h"
diff --git a/net/socket.c b/net/socket.c
index c4b80e9228d7..ea5220a2eb51 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -27,7 +27,6 @@
#include "clients.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "qemu/sockets.h"
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index e45a6d124eb6..7e65bd391f0b 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "tap_int.h"
#include "qemu/cutils.h"
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 5e70b9303710..3e24d232e782 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -24,7 +24,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "tap_int.h"
#include "tap-linux.h"
#include "net/tap.h"
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index d85224242b30..79919785c9f6 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -27,7 +27,6 @@
#include "tap_int.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
-#include "qemu-common.h"
#include <sys/ethernet.h>
#include <sys/sockio.h>
diff --git a/net/tap-win32.c b/net/tap-win32.c
index 6096972f5d47..7466f22e77a4 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -29,7 +29,6 @@
#include "qemu/osdep.h"
#include "tap_int.h"
-#include "qemu-common.h"
#include "clients.h" /* net_init_tap */
#include "net/eth.h"
#include "net/net.h"
diff --git a/net/tap.c b/net/tap.c
index c5cbeaa7a2be..6190fa699d2f 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -38,7 +38,6 @@
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/net/vde.c b/net/vde.c
index 99189cccb694..1083916bcf52 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -27,7 +27,6 @@
#include "net/net.h"
#include "clients.h"
-#include "qemu-common.h"
#include "qemu/option.h"
#include "qemu/main-loop.h"
#include "qapi/error.h"
diff --git a/os-posix.c b/os-posix.c
index 24692c8593f3..ee765f047dea 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -29,7 +29,6 @@
#include <grp.h>
#include <libgen.h>
-#include "qemu-common.h"
/* Needed early for CONFIG_BSD etc. */
#include "net/slirp.h"
#include "qemu/qemu-options.h"
diff --git a/os-win32.c b/os-win32.c
index 6f21b578417c..725ad652e8bb 100644
--- a/os-win32.c
+++ b/os-win32.c
@@ -26,7 +26,6 @@
#include "qemu/osdep.h"
#include <windows.h>
#include <mmsystem.h>
-#include "qemu-common.h"
#include "sysemu/runstate.h"
static BOOL WINAPI qemu_ctrl_handler(DWORD type)
diff --git a/page-vary-common.c b/page-vary-common.c
index 91755564985c..ab77672dd412 100644
--- a/page-vary-common.c
+++ b/page-vary-common.c
@@ -20,7 +20,6 @@
#define IN_PAGE_VARY 1
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "exec/page-vary.h"
/* WARNING: This file must *not* be complied with -flto. */
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 4d7a2392c097..9924277c826e 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -16,7 +16,6 @@
#include <sys/utsname.h>
#include <sys/wait.h>
#include <dirent.h>
-#include "qemu-common.h"
#include "guest-agent-core.h"
#include "qga-qapi-commands.h"
#include "qapi/error.h"
diff --git a/softmmu/cpu-throttle.c b/softmmu/cpu-throttle.c
index 8c2144ab95cc..d9bb30a223d8 100644
--- a/softmmu/cpu-throttle.c
+++ b/softmmu/cpu-throttle.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/thread.h"
#include "hw/core/cpu.h"
#include "qemu/main-loop.h"
diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c
index 204d946a1729..117408cb83af 100644
--- a/softmmu/cpu-timers.c
+++ b/softmmu/cpu-timers.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
diff --git a/softmmu/cpus.c b/softmmu/cpus.c
index 7b75bb66d5e6..668bef9b4d62 100644
--- a/softmmu/cpus.c
+++ b/softmmu/cpus.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "monitor/monitor.h"
#include "qemu/coroutine-tls.h"
#include "qapi/error.h"
diff --git a/softmmu/datadir.c b/softmmu/datadir.c
index 504c4665bed7..160cac999a6f 100644
--- a/softmmu/datadir.c
+++ b/softmmu/datadir.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/cutils.h"
#include "trace.h"
diff --git a/softmmu/icount.c b/softmmu/icount.c
index 21341a4ce49e..5ca271620db6 100644
--- a/softmmu/icount.c
+++ b/softmmu/icount.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "migration/vmstate.h"
#include "qapi/error.h"
diff --git a/softmmu/runstate.c b/softmmu/runstate.c
index e0d869b21aa4..fac7b63259e8 100644
--- a/softmmu/runstate.c
+++ b/softmmu/runstate.c
@@ -40,7 +40,6 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-events-run-state.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qemu/job.h"
diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
index d058a2a00d85..afa477aae656 100644
--- a/stubs/monitor-core.c
+++ b/stubs/monitor-core.c
@@ -1,6 +1,5 @@
#include "qemu/osdep.h"
#include "monitor/monitor.h"
-#include "qemu-common.h"
#include "qapi/qapi-emit-events.h"
Monitor *monitor_cur(void)
diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 8c34f86792ed..567e296b21c9 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -10,7 +10,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "sysemu/runstate.h"
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index bbf1ce7ba3bc..5fc37ac10a5b 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -13,7 +13,6 @@
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index 9ec8875150d6..17dd2f77d9f5 100644
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -16,7 +16,6 @@
#include <linux/elf.h>
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "qapi/error.h"
#include "cpu.h"
#include "qemu/timer.h"
diff --git a/target/hexagon/gdbstub.c b/target/hexagon/gdbstub.c
index 9c8c04c961b1..d152d01bfe7e 100644
--- a/target/hexagon/gdbstub.c
+++ b/target/hexagon/gdbstub.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "exec/gdbstub.h"
#include "cpu.h"
#include "internal.h"
diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c
index 81f665e21245..b185ee8de4fd 100644
--- a/target/i386/hax/hax-all.c
+++ b/target/i386/hax/hax-all.c
@@ -27,7 +27,6 @@
#include "cpu.h"
#include "exec/address-spaces.h"
-#include "qemu-common.h"
#include "qemu/accel.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index fc12c02fb217..f8833277ab6a 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -47,7 +47,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "qemu/memalign.h"
diff --git a/target/i386/hvf/x86.c b/target/i386/hvf/x86.c
index 91a3fe002c73..d086584f26d9 100644
--- a/target/i386/hvf/x86.c
+++ b/target/i386/hvf/x86.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "qemu-common.h"
#include "x86_decode.h"
#include "x86_emu.h"
#include "vmcs.h"
diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
index 32b0d131df86..f24dd50e48ff 100644
--- a/target/i386/hvf/x86_cpuid.c
+++ b/target/i386/hvf/x86_cpuid.c
@@ -21,7 +21,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "x86.h"
#include "vmx.h"
diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c
index 062713b1a450..3728d7705e21 100644
--- a/target/i386/hvf/x86_decode.c
+++ b/target/i386/hvf/x86_decode.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "panic.h"
#include "x86_decode.h"
#include "vmx.h"
diff --git a/target/i386/hvf/x86_descr.c b/target/i386/hvf/x86_descr.c
index af15c06ac5db..a484942cfcd4 100644
--- a/target/i386/hvf/x86_descr.c
+++ b/target/i386/hvf/x86_descr.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "vmx.h"
#include "x86_descr.h"
diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
index 050428795bbc..f5704f63e8da 100644
--- a/target/i386/hvf/x86_emu.c
+++ b/target/i386/hvf/x86_emu.c
@@ -37,7 +37,6 @@
#include "qemu/osdep.h"
#include "panic.h"
-#include "qemu-common.h"
#include "x86_decode.h"
#include "x86.h"
#include "x86_emu.h"
diff --git a/target/i386/hvf/x86_flags.c b/target/i386/hvf/x86_flags.c
index fecbca751770..03d6de5efc3e 100644
--- a/target/i386/hvf/x86_flags.c
+++ b/target/i386/hvf/x86_flags.c
@@ -23,7 +23,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "panic.h"
#include "cpu.h"
#include "x86_flags.h"
diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c
index df0b91cd4208..96d117567ee8 100644
--- a/target/i386/hvf/x86_mmu.c
+++ b/target/i386/hvf/x86_mmu.c
@@ -18,7 +18,6 @@
#include "qemu/osdep.h"
#include "panic.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "x86.h"
#include "x86_mmu.h"
diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
index d24daf6a4110..beaeec068731 100644
--- a/target/i386/hvf/x86_task.c
+++ b/target/i386/hvf/x86_task.c
@@ -8,7 +8,6 @@
// GNU General Public License for more details.
#include "qemu/osdep.h"
#include "panic.h"
-#include "qemu-common.h"
#include "qemu/error-report.h"
#include "sysemu/hvf.h"
diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c
index bec9fc581463..69d4fb8cf555 100644
--- a/target/i386/hvf/x86hvf.c
+++ b/target/i386/hvf/x86hvf.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "x86hvf.h"
#include "vmx.h"
#include "vmcs.h"
diff --git a/target/i386/kvm/sev-stub.c b/target/i386/kvm/sev-stub.c
index 6080c007a2e4..1be5341e8a6a 100644
--- a/target/i386/kvm/sev-stub.c
+++ b/target/i386/kvm/sev-stub.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "sev.h"
int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index 9f940413318c..b75738ee9cdf 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -11,7 +11,6 @@
#include "cpu.h"
#include "exec/address-spaces.h"
#include "exec/ioport.h"
-#include "qemu-common.h"
#include "qemu/accel.h"
#include "sysemu/nvmm.h"
#include "sysemu/cpus.h"
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 68a4ebe909ad..5560a22ea5c2 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -12,7 +12,6 @@
#include "cpu.h"
#include "exec/address-spaces.h"
#include "exec/ioport.h"
-#include "qemu-common.h"
#include "qemu/accel.h"
#include "sysemu/whpx.h"
#include "sysemu/cpus.h"
diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c
index bba36f3ec98f..c15df35ad60a 100644
--- a/target/i386/whpx/whpx-apic.c
+++ b/target/i386/whpx/whpx-apic.c
@@ -11,7 +11,6 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "hw/i386/apic_internal.h"
#include "hw/i386/apic-msidef.h"
diff --git a/target/mips/kvm.c b/target/mips/kvm.c
index 086debd9f013..caf70decd2a5 100644
--- a/target/mips/kvm.c
+++ b/target/mips/kvm.c
@@ -14,7 +14,6 @@
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "cpu.h"
#include "internal.h"
#include "qemu/error-report.h"
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index 5a7ad0c7108d..eda21c04434b 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -28,7 +28,6 @@
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#else
-#include "qemu-common.h"
#include "exec/softmmu-semi.h"
#endif
#include "qemu/log.h"
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 8644b85de847..f905a2af17a7 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -21,7 +21,6 @@
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "cpu.h"
diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
index e6b7cb6d4d5f..70b4cff06fbb 100644
--- a/target/riscv/kvm.c
+++ b/target/riscv/kvm.c
@@ -21,7 +21,6 @@
#include <linux/kvm.h>
-#include "qemu-common.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/target/rx/cpu.c b/target/rx/cpu.c
index 25a4aa2976d3..fb30080ac4ea 100644
--- a/target/rx/cpu.c
+++ b/target/rx/cpu.c
@@ -20,7 +20,6 @@
#include "qemu/qemu-print.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "qemu-common.h"
#include "migration/vmstate.h"
#include "exec/exec-all.h"
#include "hw/loader.h"
diff --git a/target/rx/gdbstub.c b/target/rx/gdbstub.c
index c811d4810b45..7eb2059a841b 100644
--- a/target/rx/gdbstub.c
+++ b/target/rx/gdbstub.c
@@ -16,7 +16,6 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "exec/gdbstub.h"
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index 6acf14d5ecb4..53098bf54104 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -24,7 +24,6 @@
#include <linux/kvm.h>
#include <asm/ptrace.h>
-#include "qemu-common.h"
#include "cpu.h"
#include "s390x-internal.h"
#include "kvm_s390x.h"
diff --git a/target/s390x/tcg/vec_fpu_helper.c b/target/s390x/tcg/vec_fpu_helper.c
index 1a779934715f..aa2cc8e4a6b5 100644
--- a/target/s390x/tcg/vec_fpu_helper.c
+++ b/target/s390x/tcg/vec_fpu_helper.c
@@ -10,7 +10,6 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "s390x-internal.h"
#include "vec.h"
diff --git a/target/s390x/tcg/vec_int_helper.c b/target/s390x/tcg/vec_int_helper.c
index 5561b3ed9096..b44859ee1630 100644
--- a/target/s390x/tcg/vec_int_helper.c
+++ b/target/s390x/tcg/vec_int_helper.c
@@ -10,7 +10,6 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "vec.h"
#include "exec/helper-proto.h"
diff --git a/target/s390x/tcg/vec_string_helper.c b/target/s390x/tcg/vec_string_helper.c
index ac315eb095c1..f8b54bba4a9d 100644
--- a/target/s390x/tcg/vec_string_helper.c
+++ b/target/s390x/tcg/vec_string_helper.c
@@ -10,7 +10,6 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "s390x-internal.h"
#include "vec.h"
diff --git a/target/tricore/gdbstub.c b/target/tricore/gdbstub.c
index 3ce55abb8e3b..ebf32defde3a 100644
--- a/target/tricore/gdbstub.c
+++ b/target/tricore/gdbstub.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "exec/gdbstub.h"
diff --git a/target/xtensa/core-de233_fpu.c b/target/xtensa/core-de233_fpu.c
index c7cbeb1b4834..41af8057fbb9 100644
--- a/target/xtensa/core-de233_fpu.c
+++ b/target/xtensa/core-de233_fpu.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "core-de233_fpu/core-isa.h"
diff --git a/target/xtensa/core-dsp3400.c b/target/xtensa/core-dsp3400.c
index 4e0bc8a8c46c..81e425c56828 100644
--- a/target/xtensa/core-dsp3400.c
+++ b/target/xtensa/core-dsp3400.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "core-dsp3400/core-isa.h"
diff --git a/target/xtensa/core-test_mmuhifi_c3.c b/target/xtensa/core-test_mmuhifi_c3.c
index 123c630b0da7..c0e5d32d1e47 100644
--- a/target/xtensa/core-test_mmuhifi_c3.c
+++ b/target/xtensa/core-test_mmuhifi_c3.c
@@ -28,7 +28,6 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "core-test_mmuhifi_c3/core-isa.h"
diff --git a/tcg/tci.c b/tcg/tci.c
index fe92b5d0844b..bdfac83492dd 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */
#include "exec/cpu_ldst.h"
#include "tcg/tcg-op.h"
diff --git a/tests/qtest/acpi-utils.c b/tests/qtest/acpi-utils.c
index 766c48e3a6a4..673fc975862c 100644
--- a/tests/qtest/acpi-utils.c
+++ b/tests/qtest/acpi-utils.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "qemu-common.h"
#include "qemu/bitmap.h"
#include "acpi-utils.h"
#include "boot-sector.h"
diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
index 8073ccc20521..aff5f3f79776 100644
--- a/tests/qtest/ahci-test.c
+++ b/tests/qtest/ahci-test.c
@@ -30,7 +30,6 @@
#include "libqos/ahci.h"
#include "libqos/pci-pc.h"
-#include "qemu-common.h"
#include "qapi/qmp/qdict.h"
#include "qemu/host-utils.h"
diff --git a/tests/qtest/aspeed_hace-test.c b/tests/qtest/aspeed_hace-test.c
index 09ee31545e41..58aa22014d04 100644
--- a/tests/qtest/aspeed_hace-test.c
+++ b/tests/qtest/aspeed_hace-test.c
@@ -8,7 +8,6 @@
#include "qemu/osdep.h"
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "qemu/bitops.h"
#define HACE_CMD 0x10
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index c4a2d1e1664b..5dddedabcdde 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -57,7 +57,6 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "qemu-common.h"
#include "hw/firmware/smbios.h"
#include "qemu/bitmap.h"
#include "acpi-utils.h"
diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
index ea8f264661c3..9d9825bc8145 100644
--- a/tests/qtest/boot-sector.c
+++ b/tests/qtest/boot-sector.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
#include "boot-sector.h"
-#include "qemu-common.h"
#include "libqos/libqtest.h"
#define LOW(x) ((x) & 0xff)
diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c
index a1c689414be5..7f5dd5f85a78 100644
--- a/tests/qtest/cpu-plug-test.c
+++ b/tests/qtest/cpu-plug-test.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqtest-single.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c
index 43c77aff045c..81043162dfdd 100644
--- a/tests/qtest/dbus-display-test.c
+++ b/tests/qtest/dbus-display-test.c
@@ -3,7 +3,6 @@
#include <gio/gio.h>
#include <gio/gunixfdlist.h>
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "dbus-display1.h"
static GDBusConnection*
diff --git a/tests/qtest/dbus-vmstate-test.c b/tests/qtest/dbus-vmstate-test.c
index aca9b98b7a35..a8acab763f5d 100644
--- a/tests/qtest/dbus-vmstate-test.c
+++ b/tests/qtest/dbus-vmstate-test.c
@@ -2,7 +2,6 @@
#include <glib/gstdio.h>
#include <gio/gio.h>
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "dbus-vmstate1.h"
#include "migration-helpers.h"
diff --git a/tests/qtest/device-introspect-test.c b/tests/qtest/device-introspect-test.c
index bbec166dbc2f..adf39b2518e8 100644
--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@@ -18,7 +18,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/qmp/qstring.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c
index e648fdd409cd..ddd6983ede14 100644
--- a/tests/qtest/e1000e-test.c
+++ b/tests/qtest/e1000e-test.c
@@ -25,9 +25,7 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqtest-single.h"
-#include "qemu-common.h"
#include "libqos/pci-pc.h"
#include "qemu/sockets.h"
#include "qemu/iov.h"
diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c
index f94cd8dd8e05..a0adc35bef7f 100644
--- a/tests/qtest/erst-test.c
+++ b/tests/qtest/erst-test.c
@@ -11,7 +11,6 @@
#include <glib/gstdio.h>
#include "libqos/libqos-pc.h"
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "hw/pci/pci.h"
diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c
index b0d40012e6a9..4aa72f36431f 100644
--- a/tests/qtest/fdc-test.c
+++ b/tests/qtest/fdc-test.c
@@ -27,7 +27,6 @@
#include "libqtest-single.h"
#include "qapi/qmp/qdict.h"
-#include "qemu-common.h"
/* TODO actually test the results and get rid of this */
#define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index 7a244c951e5e..dc891d838b6a 100644
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "exec/memory.h"
#include "qemu/main-loop.h"
diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index 64023c057408..da9c4c2792de 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/bswap.h"
#include "qapi/qmp/qlist.h"
#include "libqos/libqtest.h"
diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
index 19de3b410405..b7243a17b11d 100644
--- a/tests/qtest/ide-test.c
+++ b/tests/qtest/ide-test.c
@@ -30,7 +30,6 @@
#include "libqos/pci-pc.h"
#include "libqos/malloc-pc.h"
#include "qapi/qmp/qdict.h"
-#include "qemu-common.h"
#include "qemu/bswap.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/pci_regs.h"
diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c
index 19612e9405ae..ed431e34e68d 100644
--- a/tests/qtest/ipmi-bt-test.c
+++ b/tests/qtest/ipmi-bt-test.c
@@ -31,7 +31,6 @@
#include "libqtest-single.h"
-#include "qemu-common.h"
#define IPMI_IRQ 5
diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
index 4e8af42a9d04..95628a418579 100644
--- a/tests/qtest/ivshmem-test.c
+++ b/tests/qtest/ivshmem-test.c
@@ -14,7 +14,6 @@
#include "libqos/libqos-pc.h"
#include "libqos/libqos-spapr.h"
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#define TMPSHMSIZE (1 << 20)
static char *tmpshm;
diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
index eaa2096512e5..41c4be5efa93 100644
--- a/tests/qtest/libqos/ahci.c
+++ b/tests/qtest/libqos/ahci.c
@@ -28,7 +28,6 @@
#include "ahci.h"
#include "pci-pc.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "hw/pci/pci_ids.h"
diff --git a/tests/qtest/libqos/malloc-pc.c b/tests/qtest/libqos/malloc-pc.c
index f1e3b392a53c..bbd1b4827e54 100644
--- a/tests/qtest/libqos/malloc-pc.c
+++ b/tests/qtest/libqos/malloc-pc.c
@@ -16,8 +16,6 @@
#include "standard-headers/linux/qemu_fw_cfg.h"
-#include "qemu-common.h"
-
#define ALLOC_PAGE_SIZE (4096)
void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags)
diff --git a/tests/qtest/libqos/malloc-spapr.c b/tests/qtest/libqos/malloc-spapr.c
index 05b306c191d3..d90ed3c51d7d 100644
--- a/tests/qtest/libqos/malloc-spapr.c
+++ b/tests/qtest/libqos/malloc-spapr.c
@@ -8,8 +8,6 @@
#include "qemu/osdep.h"
#include "malloc-spapr.h"
-#include "qemu-common.h"
-
#define SPAPR_PAGE_SIZE 4096
/* Memory must be a multiple of 256 MB,
diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c
index f708b0143262..f0c8f950c805 100644
--- a/tests/qtest/libqos/malloc.c
+++ b/tests/qtest/libqos/malloc.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "malloc.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
typedef struct MemBlock {
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index dc5566ccfd60..7b5890dcc487 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -21,7 +21,6 @@
#include <sys/un.h>
#include "libqos/libqtest.h"
-#include "qemu-common.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c
index 138101b46ac2..8ca18074b9f9 100644
--- a/tests/qtest/machine-none-test.c
+++ b/tests/qtest/machine-none-test.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
diff --git a/tests/qtest/npcm7xx_emc-test.c b/tests/qtest/npcm7xx_emc-test.c
index 7c435ac91576..a353fef0ca13 100644
--- a/tests/qtest/npcm7xx_emc-test.c
+++ b/tests/qtest/npcm7xx_emc-test.c
@@ -15,7 +15,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqos/libqos.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qnum.h"
diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
index 32bbae33c597..3cb47d2c5496 100644
--- a/tests/qtest/pxe-test.c
+++ b/tests/qtest/pxe-test.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "qemu-common.h"
#include "libqos/libqtest.h"
#include "boot-sector.h"
#include "libqos/libqos-spapr.h"
diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
index eb34af843b79..6b162e12b5aa 100644
--- a/tests/qtest/qom-test.c
+++ b/tests/qtest/qom-test.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
#include "qemu/cutils.h"
diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
index 450604926492..8fa3313cc333 100644
--- a/tests/qtest/rtl8139-test.c
+++ b/tests/qtest/rtl8139-test.c
@@ -11,7 +11,6 @@
#include "libqtest-single.h"
#include "libqos/pci-pc.h"
#include "qemu/timer.h"
-#include "qemu-common.h"
/* Tests only initialization so far. TODO: Replace with functional tests */
static void nop(void)
diff --git a/tests/qtest/test-filter-mirror.c b/tests/qtest/test-filter-mirror.c
index da4f94de727a..fdf66cebd62f 100644
--- a/tests/qtest/test-filter-mirror.c
+++ b/tests/qtest/test-filter-mirror.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qemu/iov.h"
diff --git a/tests/qtest/test-filter-redirector.c b/tests/qtest/test-filter-redirector.c
index fc16cf7e8d5f..339d3c04cedc 100644
--- a/tests/qtest/test-filter-redirector.c
+++ b/tests/qtest/test-filter-redirector.c
@@ -51,7 +51,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqos/libqtest.h"
#include "qapi/qmp/qdict.h"
#include "qemu/iov.h"
diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c
index 39138db7744b..b39c9055b309 100644
--- a/tests/qtest/test-x86-cpuid-compat.c
+++ b/tests/qtest/test-x86-cpuid-compat.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qnum.h"
diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
index a71395849f33..fc9f2b94982d 100644
--- a/tests/qtest/virtio-net-test.c
+++ b/tests/qtest/virtio-net-test.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "libqtest-single.h"
#include "qemu/iov.h"
#include "qemu/module.h"
diff --git a/tests/unit/check-qjson.c b/tests/unit/check-qjson.c
index c845f91d4377..c4e0f851bfc6 100644
--- a/tests/unit/check-qjson.c
+++ b/tests/unit/check-qjson.c
@@ -21,7 +21,6 @@
#include "qapi/qmp/qnum.h"
#include "qapi/qmp/qstring.h"
#include "qemu/unicode.h"
-#include "qemu-common.h"
static QString *from_json_str(const char *jstr, bool single, Error **errp)
{
diff --git a/tests/unit/check-qnull.c b/tests/unit/check-qnull.c
index ebf21db83ccc..5ceacc65d7f3 100644
--- a/tests/unit/check-qnull.c
+++ b/tests/unit/check-qnull.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
#include "qapi/qmp/qnull.h"
-#include "qemu-common.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "qapi/error.h"
diff --git a/tests/unit/check-qnum.c b/tests/unit/check-qnum.c
index b85fca23029e..bf7fe45bacc4 100644
--- a/tests/unit/check-qnum.c
+++ b/tests/unit/check-qnum.c
@@ -15,7 +15,6 @@
#include "qemu/osdep.h"
#include "qapi/qmp/qnum.h"
-#include "qemu-common.h"
/*
* Public Interface test-cases
diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c
index 7903ebf4cf80..0ed094e55f3a 100644
--- a/tests/unit/check-qobject.c
+++ b/tests/unit/check-qobject.c
@@ -15,7 +15,6 @@
#include "qapi/qmp/qnull.h"
#include "qapi/qmp/qnum.h"
#include "qapi/qmp/qstring.h"
-#include "qemu-common.h"
#include <math.h>
diff --git a/tests/unit/check-qstring.c b/tests/unit/check-qstring.c
index 4bf977209342..bd861f4f8b47 100644
--- a/tests/unit/check-qstring.c
+++ b/tests/unit/check-qstring.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
#include "qapi/qmp/qstring.h"
-#include "qemu-common.h"
/*
* Public Interface test-cases
diff --git a/tests/unit/socket-helpers.c b/tests/unit/socket-helpers.c
index ef31664d0224..0a9e090a68dd 100644
--- a/tests/unit/socket-helpers.c
+++ b/tests/unit/socket-helpers.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/sockets.h"
#include "socket-helpers.h"
diff --git a/tests/unit/test-clone-visitor.c b/tests/unit/test-clone-visitor.c
index 5d48e125b8e4..ce67585305f6 100644
--- a/tests/unit/test-clone-visitor.c
+++ b/tests/unit/test-clone-visitor.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/clone-visitor.h"
#include "test-qapi-visit.h"
diff --git a/tests/unit/test-forward-visitor.c b/tests/unit/test-forward-visitor.c
index 348f7e4e81c8..01de15522711 100644
--- a/tests/unit/test-forward-visitor.c
+++ b/tests/unit/test-forward-visitor.c
@@ -9,7 +9,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/forward-visitor.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/error.h"
diff --git a/tests/unit/test-iov.c b/tests/unit/test-iov.c
index 5371066fb6a4..0d2ba9ba87d9 100644
--- a/tests/unit/test-iov.c
+++ b/tests/unit/test-iov.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c
index ccb819f193d9..05703a4e515f 100644
--- a/tests/unit/test-logging.c
+++ b/tests/unit/test-logging.c
@@ -27,7 +27,6 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/log.h"
diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c
index d58c3b78f208..7d961d716afb 100644
--- a/tests/unit/test-qmp-event.c
+++ b/tests/unit/test-qmp-event.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
#include "qapi/qmp/qbool.h"
diff --git a/tests/unit/test-qobject-input-visitor.c b/tests/unit/test-qobject-input-visitor.c
index 22538f814099..aed08eaebcee 100644
--- a/tests/unit/test-qobject-input-visitor.c
+++ b/tests/unit/test-qobject-input-visitor.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-introspect.h"
#include "qapi/qobject-input-visitor.h"
diff --git a/tests/unit/test-qobject-output-visitor.c b/tests/unit/test-qobject-output-visitor.c
index 6af4c33eec15..66b27fad66bb 100644
--- a/tests/unit/test-qobject-output-visitor.c
+++ b/tests/unit/test-qobject-output-visitor.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qobject-output-visitor.h"
#include "test-qapi-visit.h"
diff --git a/tests/unit/test-string-input-visitor.c b/tests/unit/test-string-input-visitor.c
index 249faafc9d79..25094d3ffcef 100644
--- a/tests/unit/test-string-input-visitor.c
+++ b/tests/unit/test-string-input-visitor.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/string-input-visitor.h"
#include "test-qapi-visit.h"
diff --git a/tests/unit/test-string-output-visitor.c b/tests/unit/test-string-output-visitor.c
index e2bedc5c7c92..7ef305361eb7 100644
--- a/tests/unit/test-string-output-visitor.c
+++ b/tests/unit/test-string-output-visitor.c
@@ -12,7 +12,6 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/string-output-visitor.h"
#include "test-qapi-visit.h"
diff --git a/tests/unit/test-thread-pool.c b/tests/unit/test-thread-pool.c
index 70dc6314a1ef..6020e65d6986 100644
--- a/tests/unit/test-thread-pool.c
+++ b/tests/unit/test-thread-pool.c
@@ -1,5 +1,4 @@
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "block/aio.h"
#include "block/thread-pool.h"
#include "block/block.h"
diff --git a/tests/unit/test-util-sockets.c b/tests/unit/test-util-sockets.c
index 896247e3ed36..63909ccb2b54 100644
--- a/tests/unit/test-util-sockets.c
+++ b/tests/unit/test-util-sockets.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/sockets.h"
#include "qapi/error.h"
#include "socket-helpers.h"
diff --git a/tests/unit/test-visitor-serialization.c b/tests/unit/test-visitor-serialization.c
index 462995864775..907263d0307c 100644
--- a/tests/unit/test-visitor-serialization.c
+++ b/tests/unit/test-visitor-serialization.c
@@ -14,7 +14,6 @@
#include "qemu/osdep.h"
#include <float.h>
-#include "qemu-common.h"
#include "test-qapi-visit.h"
#include "qapi/error.h"
#include "qapi/qmp/qjson.h"
diff --git a/tests/unit/test-xbzrle.c b/tests/unit/test-xbzrle.c
index 795d6f1cbabb..ef951b6e5405 100644
--- a/tests/unit/test-xbzrle.c
+++ b/tests/unit/test-xbzrle.c
@@ -11,7 +11,6 @@
*
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "../migration/xbzrle.h"
diff --git a/ui/gtk-clipboard.c b/ui/gtk-clipboard.c
index d58fd761abdf..8d8a636fd1fa 100644
--- a/ui/gtk-clipboard.c
+++ b/ui/gtk-clipboard.c
@@ -19,7 +19,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/main-loop.h"
#include "ui/gtk.h"
diff --git a/ui/keymaps.c b/ui/keymaps.c
index d4a647464bbf..6ceaa97085ab 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/datadir.h"
#include "keymaps.h"
#include "trace.h"
diff --git a/ui/vdagent.c b/ui/vdagent.c
index 02861edfb13c..aa6167f0b492 100644
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -1,6 +1,5 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "include/qemu-common.h"
#include "chardev/char.h"
#include "qemu/buffer.h"
#include "qemu/option.h"
diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c
index d48f75eb1ab4..8aeadfaa218a 100644
--- a/ui/vnc-clipboard.c
+++ b/ui/vnc-clipboard.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "vnc.h"
#include "vnc-jobs.h"
diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 7b86a4713dfd..5a4b8a4fc0f6 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -34,7 +34,7 @@
#ifdef CONFIG_VNC_PNG
/* The following define is needed by pngconf.h. Otherwise it won't compile,
- because setjmp.h was already included by qemu-common.h. */
+ because setjmp.h was already included by osdep.h. */
#define PNG_SKIP_SETJMP_CHECK
#include <png.h>
#endif
diff --git a/ui/vnc.c b/ui/vnc.c
index 5cbeebb8d1fd..6261d922953b 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -25,7 +25,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "vnc.h"
#include "vnc-jobs.h"
#include "trace.h"
diff --git a/util/aio-win32.c b/util/aio-win32.c
index 7aac89df3a30..44003d645ecd 100644
--- a/util/aio-win32.c
+++ b/util/aio-win32.c
@@ -16,7 +16,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "block/block.h"
#include "qemu/main-loop.h"
#include "qemu/queue.h"
diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
index e99b8a4f9c8c..e2690c5f4142 100644
--- a/util/coroutine-sigaltstack.c
+++ b/util/coroutine-sigaltstack.c
@@ -27,7 +27,6 @@
#endif
#include "qemu/osdep.h"
#include <pthread.h>
-#include "qemu-common.h"
#include "qemu/coroutine_int.h"
#ifdef CONFIG_SAFESTACK
diff --git a/util/coroutine-win32.c b/util/coroutine-win32.c
index de6bd4fd3e4e..c196f956d27e 100644
--- a/util/coroutine-win32.c
+++ b/util/coroutine-win32.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/coroutine_int.h"
typedef struct
diff --git a/util/cutils.c b/util/cutils.c
index aaf2ced29142..a01a3a754049 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -26,7 +26,6 @@
#include "qemu/host-utils.h"
#include <math.h>
-#include "qemu-common.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index 16294e98d434..8dc30c51414d 100644
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/event_notifier.h"
#include "qemu/main-loop.h"
diff --git a/util/event_notifier-win32.c b/util/event_notifier-win32.c
index 62c53b0a9909..9352da4699c7 100644
--- a/util/event_notifier-win32.c
+++ b/util/event_notifier-win32.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/event_notifier.h"
#include "qemu/main-loop.h"
diff --git a/util/iov.c b/util/iov.c
index 58c7b3eeee5f..22d6996ccec0 100644
--- a/util/iov.c
+++ b/util/iov.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
#include "qemu/cutils.h"
diff --git a/util/osdep.c b/util/osdep.c
index 97dc9bc65b45..1ea2398686ee 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/sockets.h"
#include "qemu/error-report.h"
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index fae25be3e779..c0125cd572ed 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -31,7 +31,6 @@
#include <glib/gprintf.h>
-#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "trace.h"
#include "qapi/error.h"
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 91d2f45cfe1f..b69e50b3f182 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -32,7 +32,6 @@
#include "qemu/osdep.h"
#include <windows.h>
-#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/main-loop.h"
#include "trace.h"
diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
index 7f5839cb769e..d791932d63b9 100644
--- a/util/qemu-coroutine-io.c
+++ b/util/qemu-coroutine-io.c
@@ -23,7 +23,6 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/sockets.h"
#include "qemu/coroutine.h"
#include "qemu/iov.h"
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index e8f45a7d30a5..13b5b197f9ea 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -21,7 +21,6 @@
#include <linux/vm_sockets.h>
#endif /* CONFIG_AF_VSOCK */
-#include "qemu-common.h"
#include "monitor/monitor.h"
#include "qapi/clone-visitor.h"
#include "qapi/error.h"
diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c
index 52eb19f3511a..a2d5a6e8259f 100644
--- a/util/qemu-thread-win32.c
+++ b/util/qemu-thread-win32.c
@@ -12,7 +12,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu-common.h"
#include "qemu/thread.h"
#include "qemu/notify.h"
#include "qemu-thread-common.h"
diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
index df66d09393af..b4c15556c2c4 100755
--- a/target/xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
@@ -42,7 +42,6 @@ cat <<EOF > "${TARGET}.c"
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/gdbstub.h"
-#include "qemu-common.h"
#include "qemu/host-utils.h"
#include "core-$NAME/core-isa.h"
--
2.35.1.273.ge6ebfd0e8cbb
^ permalink raw reply related [flat|nested] 79+ messages in thread* Re: [PATCH 32/32] Remove qemu-common.h include from most units
2022-03-23 15:57 ` marcandre.lureau
@ 2022-04-05 15:02 ` Ani Sinha
-1 siblings, 0 replies; 79+ messages in thread
From: Ani Sinha @ 2022-04-05 15:02 UTC (permalink / raw)
To: marcandre.lureau
Cc: John G Johnson, Alexey Kardashevskiy, Li Zhijian,
Markus Armbruster, KONRAD Frederic, open list:raw, Stefan Berger,
Alex Bennée, Huacai Chen, Halil Pasic, Kamil Rytarowski,
Hervé Poussineau, Christian Borntraeger, Michael Roth,
Alexander Bulekov, Stefan Hajnoczi, John Snow, Aarushi Mehta,
Kevin Wolf, Andrew Jeffery, Chris Wulff,
Philippe Mathieu-Daudé,
Subbaraya Sundeep, Zhang Chen, open list:sPAPR (pseries),
Igor Mammedov, Gerd Hoffmann, Fam Zheng, Peter Maydell,
David Hildenbrand, Yanan Wang, Max Filippov, Alistair Francis,
Yoshinori Sato, Helge Deller, Qiuhao Li, Artyom Tarasenko,
Stefano Garzarella, Eric Farman, Corey Minyard, Stefan Weil,
Julia Suvorova, Greg Kurz, Cameron Esfahani, Bandan Das,
Alexander Graf, Michael Rolnik, Cédric Le Goater,
open list:RISC-V TCG CPUs, Cornelia Huck,
open list:S390-ccw boot, Tyrone Ting, Hanna Reitz,
open list:ARM PrimeCell and...,
Wenchao Wang, Aurelien Jarno, Elena Ufimtseva, Jason Wang,
Bin Meng, Taylor Simpson, Colin Xu, Edgar E. Iglesias,
Daniel Henrique Barboza, Joel Stanley, Aleksandar Rikalo,
Mark Cave-Ayland, Fabien Chouteau, Roman Bolshakov,
Sunil Muthuswamy, Eduardo Habkost, Bastian Koppelmann,
Laurent Vivier, open list:Overall KVM CPUs, Michael S. Tsirkin,
Christian Schoenebeck, qemu-devel, open list:X86 HAXM CPUs,
Warner Losh, Marek Vasut, Jagannathan Raman, Havard Skinnemoen,
Reinoud Zandijk, Kyle Evans, Richard Henderson, David Gibson,
Daniel P. Berrangé,
Darren Kenny, Eric Auger, Thomas Huth, Marcelo Tosatti,
Palmer Dabbelt, Paolo Bonzini
[-- Attachment #1: Type: text/plain, Size: 87951 bytes --]
On Wed, Mar 23, 2022 at 9:32 PM <marcandre.lureau@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Empty patch descriptions are not a good idea. Please explain why this
removal does not break things and maybe why the header got included
initiatively.
> ---
> include/qemu-common.h | 9 ---------
> accel/hvf/hvf-all.c | 1 -
> accel/tcg/cpu-exec.c | 1 -
> accel/tcg/tcg-accel-ops-icount.c | 1 -
> accel/tcg/tcg-accel-ops-mttcg.c | 1 -
> accel/tcg/tcg-accel-ops-rr.c | 1 -
> accel/tcg/tcg-accel-ops.c | 1 -
> accel/tcg/tcg-all.c | 1 -
> accel/tcg/translate-all.c | 1 -
> audio/audio_win_int.c | 1 -
> backends/hostmem-epc.c | 1 -
> backends/tpm/tpm_passthrough.c | 1 -
> block/file-posix.c | 1 -
> block/io_uring.c | 1 -
> bsd-user/freebsd/os-syscall.c | 1 -
> bsd-user/mmap.c | 1 -
> chardev/char-fd.c | 1 -
> chardev/char-pipe.c | 1 -
> chardev/char-pty.c | 1 -
> cpu.c | 1 -
> crypto/cipher-afalg.c | 1 -
> crypto/hash-afalg.c | 1 -
> dump/dump.c | 1 -
> dump/win_dump.c | 1 -
> fsdev/virtfs-proxy-helper.c | 1 -
> gdbstub.c | 1 -
> hw/9pfs/9p-proxy.c | 1 -
> hw/alpha/dp264.c | 1 -
> hw/avr/boot.c | 1 -
> hw/core/loader.c | 1 -
> hw/display/artist.c | 1 -
> hw/display/cg3.c | 1 -
> hw/display/tcx.c | 1 -
> hw/display/virtio-gpu-udmabuf.c | 1 -
> hw/dma/pl330.c | 1 -
> hw/hppa/machine.c | 1 -
> hw/i386/pc_sysfw.c | 1 -
> hw/i386/x86.c | 1 -
> hw/input/vhost-user-input.c | 1 -
> hw/intc/xics_kvm.c | 1 -
> hw/m68k/mcf5208.c | 1 -
> hw/m68k/q800.c | 1 -
> hw/m68k/virt.c | 1 -
> hw/microblaze/boot.c | 1 -
> hw/mips/fuloong2e.c | 1 -
> hw/mips/jazz.c | 1 -
> hw/mips/loongson3_virt.c | 1 -
> hw/mips/malta.c | 1 -
> hw/mips/mipssim.c | 1 -
> hw/misc/sbsa_ec.c | 1 -
> hw/net/fsl_etsec/etsec.c | 1 -
> hw/net/fsl_etsec/rings.c | 1 -
> hw/net/msf2-emac.c | 1 -
> hw/net/npcm7xx_emc.c | 1 -
> hw/nios2/boot.c | 1 -
> hw/nios2/generic_nommu.c | 1 -
> hw/nvram/fw_cfg.c | 1 -
> hw/pci-host/mv64361.c | 1 -
> hw/pci-host/pnv_phb3.c | 1 -
> hw/pci-host/pnv_phb3_msi.c | 1 -
> hw/pci-host/pnv_phb3_pbcq.c | 1 -
> hw/pci-host/pnv_phb4.c | 1 -
> hw/pci-host/pnv_phb4_pec.c | 1 -
> hw/pci-host/raven.c | 1 -
> hw/pci-host/remote.c | 1 -
> hw/pci/pci.c | 1 -
> hw/ppc/e500.c | 1 -
> hw/ppc/mac_newworld.c | 1 -
> hw/ppc/mac_oldworld.c | 1 -
> hw/ppc/pegasos2.c | 1 -
> hw/ppc/pnv.c | 1 -
> hw/ppc/pnv_bmc.c | 1 -
> hw/ppc/ppc405_boards.c | 1 -
> hw/ppc/ppc440_bamboo.c | 1 -
> hw/ppc/sam460ex.c | 1 -
> hw/ppc/spapr.c | 1 -
> hw/ppc/spapr_numa.c | 1 -
> hw/ppc/spapr_pci_nvlink2.c | 1 -
> hw/ppc/spapr_tpm_proxy.c | 1 -
> hw/ppc/spapr_vof.c | 1 -
> hw/ppc/virtex_ml507.c | 1 -
> hw/ppc/vof.c | 1 -
> hw/remote/iohub.c | 1 -
> hw/remote/machine.c | 1 -
> hw/remote/memory.c | 1 -
> hw/remote/message.c | 1 -
> hw/remote/mpqemu-link.c | 1 -
> hw/remote/proxy-memory-listener.c | 1 -
> hw/remote/proxy.c | 1 -
> hw/remote/remote-obj.c | 1 -
> hw/riscv/boot.c | 1 -
> hw/rx/rx-gdbsim.c | 1 -
> hw/s390x/ipl.c | 1 -
> hw/sd/sd.c | 1 -
> hw/sparc/leon3.c | 1 -
> hw/sparc/sun4m.c | 1 -
> hw/sparc64/sun4u.c | 1 -
> hw/usb/dev-mtp.c | 1 -
> hw/virtio/virtio-iommu.c | 1 -
> hw/virtio/virtio-mem.c | 1 -
> hw/virtio/virtio-pmem.c | 1 -
> io/channel-socket.c | 1 -
> linux-user/aarch64/cpu_loop.c | 1 -
> linux-user/alpha/cpu_loop.c | 1 -
> linux-user/arm/cpu_loop.c | 1 -
> linux-user/cris/cpu_loop.c | 1 -
> linux-user/hexagon/cpu_loop.c | 1 -
> linux-user/i386/cpu_loop.c | 1 -
> linux-user/m68k/cpu_loop.c | 1 -
> linux-user/microblaze/cpu_loop.c | 1 -
> linux-user/mips/cpu_loop.c | 1 -
> linux-user/openrisc/cpu_loop.c | 1 -
> linux-user/ppc/cpu_loop.c | 1 -
> linux-user/riscv/cpu_loop.c | 1 -
> linux-user/s390x/cpu_loop.c | 1 -
> linux-user/sh4/cpu_loop.c | 1 -
> linux-user/sparc/cpu_loop.c | 1 -
> linux-user/uname.c | 1 -
> monitor/qmp-cmds.c | 1 -
> net/colo-compare.c | 1 -
> net/net.c | 1 -
> net/socket.c | 1 -
> net/tap-bsd.c | 1 -
> net/tap-linux.c | 1 -
> net/tap-solaris.c | 1 -
> net/tap-win32.c | 1 -
> net/tap.c | 1 -
> net/vde.c | 1 -
> os-posix.c | 1 -
> os-win32.c | 1 -
> page-vary-common.c | 1 -
> qga/commands-posix.c | 1 -
> softmmu/cpu-throttle.c | 1 -
> softmmu/cpu-timers.c | 1 -
> softmmu/cpus.c | 1 -
> softmmu/datadir.c | 1 -
> softmmu/icount.c | 1 -
> softmmu/runstate.c | 1 -
> stubs/monitor-core.c | 1 -
> target/arm/hvf/hvf.c | 1 -
> target/arm/kvm.c | 1 -
> target/arm/kvm64.c | 1 -
> target/hexagon/gdbstub.c | 1 -
> target/i386/hax/hax-all.c | 1 -
> target/i386/hvf/hvf.c | 1 -
> target/i386/hvf/x86.c | 1 -
> target/i386/hvf/x86_cpuid.c | 1 -
> target/i386/hvf/x86_decode.c | 1 -
> target/i386/hvf/x86_descr.c | 1 -
> target/i386/hvf/x86_emu.c | 1 -
> target/i386/hvf/x86_flags.c | 1 -
> target/i386/hvf/x86_mmu.c | 1 -
> target/i386/hvf/x86_task.c | 1 -
> target/i386/hvf/x86hvf.c | 1 -
> target/i386/kvm/sev-stub.c | 1 -
> target/i386/nvmm/nvmm-all.c | 1 -
> target/i386/whpx/whpx-all.c | 1 -
> target/i386/whpx/whpx-apic.c | 1 -
> target/mips/kvm.c | 1 -
> target/nios2/nios2-semi.c | 1 -
> target/ppc/kvm.c | 1 -
> target/riscv/kvm.c | 1 -
> target/rx/cpu.c | 1 -
> target/rx/gdbstub.c | 1 -
> target/s390x/kvm/kvm.c | 1 -
> target/s390x/tcg/vec_fpu_helper.c | 1 -
> target/s390x/tcg/vec_int_helper.c | 1 -
> target/s390x/tcg/vec_string_helper.c | 1 -
> target/tricore/gdbstub.c | 1 -
> target/xtensa/core-de233_fpu.c | 1 -
> target/xtensa/core-dsp3400.c | 1 -
> target/xtensa/core-test_mmuhifi_c3.c | 1 -
> tcg/tci.c | 1 -
> tests/qtest/acpi-utils.c | 1 -
> tests/qtest/ahci-test.c | 1 -
> tests/qtest/aspeed_hace-test.c | 1 -
> tests/qtest/bios-tables-test.c | 1 -
> tests/qtest/boot-sector.c | 1 -
> tests/qtest/cpu-plug-test.c | 1 -
> tests/qtest/dbus-display-test.c | 1 -
> tests/qtest/dbus-vmstate-test.c | 1 -
> tests/qtest/device-introspect-test.c | 1 -
> tests/qtest/e1000e-test.c | 2 --
> tests/qtest/erst-test.c | 1 -
> tests/qtest/fdc-test.c | 1 -
> tests/qtest/fuzz/qos_fuzz.c | 1 -
> tests/qtest/hd-geo-test.c | 1 -
> tests/qtest/ide-test.c | 1 -
> tests/qtest/ipmi-bt-test.c | 1 -
> tests/qtest/ivshmem-test.c | 1 -
> tests/qtest/libqos/ahci.c | 1 -
> tests/qtest/libqos/malloc-pc.c | 2 --
> tests/qtest/libqos/malloc-spapr.c | 2 --
> tests/qtest/libqos/malloc.c | 1 -
> tests/qtest/libqtest.c | 1 -
> tests/qtest/machine-none-test.c | 1 -
> tests/qtest/npcm7xx_emc-test.c | 1 -
> tests/qtest/pxe-test.c | 1 -
> tests/qtest/qom-test.c | 1 -
> tests/qtest/rtl8139-test.c | 1 -
> tests/qtest/test-filter-mirror.c | 1 -
> tests/qtest/test-filter-redirector.c | 1 -
> tests/qtest/test-x86-cpuid-compat.c | 1 -
> tests/qtest/virtio-net-test.c | 1 -
> tests/unit/check-qjson.c | 1 -
> tests/unit/check-qnull.c | 1 -
> tests/unit/check-qnum.c | 1 -
> tests/unit/check-qobject.c | 1 -
> tests/unit/check-qstring.c | 1 -
> tests/unit/socket-helpers.c | 1 -
> tests/unit/test-clone-visitor.c | 1 -
> tests/unit/test-forward-visitor.c | 1 -
> tests/unit/test-iov.c | 1 -
> tests/unit/test-logging.c | 1 -
> tests/unit/test-qmp-event.c | 1 -
> tests/unit/test-qobject-input-visitor.c | 1 -
> tests/unit/test-qobject-output-visitor.c | 1 -
> tests/unit/test-string-input-visitor.c | 1 -
> tests/unit/test-string-output-visitor.c | 1 -
> tests/unit/test-thread-pool.c | 1 -
> tests/unit/test-util-sockets.c | 1 -
> tests/unit/test-visitor-serialization.c | 1 -
> tests/unit/test-xbzrle.c | 1 -
> ui/gtk-clipboard.c | 1 -
> ui/keymaps.c | 1 -
> ui/vdagent.c | 1 -
> ui/vnc-clipboard.c | 1 -
> ui/vnc-enc-tight.c | 2 +-
> ui/vnc.c | 1 -
> util/aio-win32.c | 1 -
> util/coroutine-sigaltstack.c | 1 -
> util/coroutine-win32.c | 1 -
> util/cutils.c | 1 -
> util/event_notifier-posix.c | 1 -
> util/event_notifier-win32.c | 1 -
> util/iov.c | 1 -
> util/osdep.c | 1 -
> util/oslib-posix.c | 1 -
> util/oslib-win32.c | 1 -
> util/qemu-coroutine-io.c | 1 -
> util/qemu-sockets.c | 1 -
> util/qemu-thread-win32.c | 1 -
> target/xtensa/import_core.sh | 1 -
> 243 files changed, 1 insertion(+), 254 deletions(-)
>
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index 0498acd16b78..ba32cc8b1f39 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -1,12 +1,3 @@
> -/*
> - * This file is supposed to be included only by .c files. No header file
> should
> - * depend on qemu-common.h, as this would easily lead to circular header
> - * dependencies.
> - *
> - * If a header file uses a definition from qemu-common.h, that definition
> - * must be moved to a separate header file, and the header that uses it
> - * must include that header.
> - */
> #ifndef QEMU_COMMON_H
> #define QEMU_COMMON_H
>
> diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
> index f185b0830a75..0043f4d308ba 100644
> --- a/accel/hvf/hvf-all.c
> +++ b/accel/hvf/hvf-all.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "sysemu/hvf.h"
> #include "sysemu/hvf_int.h"
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index c997c2e8e015..083ada76b124 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/qemu-print.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-machine.h"
> diff --git a/accel/tcg/tcg-accel-ops-icount.c
> b/accel/tcg/tcg-accel-ops-icount.c
> index bdaf2c943b49..6436cd9349a3 100644
> --- a/accel/tcg/tcg-accel-ops-icount.c
> +++ b/accel/tcg/tcg-accel-ops-icount.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops-mttcg.c
> b/accel/tcg/tcg-accel-ops-mttcg.c
> index ea2b741deb51..d50239e0e28f 100644
> --- a/accel/tcg/tcg-accel-ops-mttcg.c
> +++ b/accel/tcg/tcg-accel-ops-mttcg.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
> index b287110766ef..1a72149f0e46 100644
> --- a/accel/tcg/tcg-accel-ops-rr.c
> +++ b/accel/tcg/tcg-accel-ops-rr.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
> index ea7dcad674cf..684dc5a1371f 100644
> --- a/accel/tcg/tcg-accel-ops.c
> +++ b/accel/tcg/tcg-accel-ops.c
> @@ -26,7 +26,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
> index d6336a9c966d..47952eecd779 100644
> --- a/accel/tcg/tcg-all.c
> +++ b/accel/tcg/tcg-all.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/cpu-timers.h"
> #include "tcg/tcg.h"
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index 5971cd53ab9f..a6e03c1e50b2 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #define NO_CPU_IO_DEFS
> #include "trace.h"
> diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
> index 5ea8157dfcc8..316f118f5099 100644
> --- a/audio/audio_win_int.c
> +++ b/audio/audio_win_int.c
> @@ -1,7 +1,6 @@
> /* public domain */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #define AUDIO_CAP "win-int"
> #include <windows.h>
> diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c
> index b47f98b6a3aa..037292d2672f 100644
> --- a/backends/hostmem-epc.c
> +++ b/backends/hostmem-epc.c
> @@ -12,7 +12,6 @@
> #include <sys/ioctl.h>
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qom/object_interfaces.h"
> #include "qapi/error.h"
> #include "sysemu/hostmem.h"
> diff --git a/backends/tpm/tpm_passthrough.c
> b/backends/tpm/tpm_passthrough.c
> index d5558fae6cc5..5a2f74db1b38 100644
> --- a/backends/tpm/tpm_passthrough.c
> +++ b/backends/tpm/tpm_passthrough.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/module.h"
> #include "qemu/sockets.h"
> diff --git a/block/file-posix.c b/block/file-posix.c
> index 61b02d85ebf1..bfd9b2111143 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/block/io_uring.c b/block/io_uring.c
> index 782afdb433e1..0b401512b973 100644
> --- a/block/io_uring.c
> +++ b/block/io_uring.c
> @@ -10,7 +10,6 @@
> */
> #include "qemu/osdep.h"
> #include <liburing.h>
> -#include "qemu-common.h"
> #include "block/aio.h"
> #include "qemu/queue.h"
> #include "block/block.h"
> diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
> index a17ff9f6ecce..d272478e7b0a 100644
> --- a/bsd-user/freebsd/os-syscall.c
> +++ b/bsd-user/freebsd/os-syscall.c
> @@ -37,7 +37,6 @@
> #include <utime.h>
>
> #include "qemu.h"
> -#include "qemu-common.h"
> #include "signal-common.h"
> #include "user/syscall-trace.h"
>
> diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> index 07aa0a634dff..e54e26de17b0 100644
> --- a/bsd-user/mmap.c
> +++ b/bsd-user/mmap.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
>
> #include "qemu.h"
> -#include "qemu-common.h"
>
> static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
> static __thread int mmap_lock_count;
> diff --git a/chardev/char-fd.c b/chardev/char-fd.c
> index 93c56913b49a..6ec9682b22f2 100644
> --- a/chardev/char-fd.c
> +++ b/chardev/char-fd.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/module.h"
> #include "qemu/sockets.h"
> #include "qapi/error.h"
> diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
> index 7eca5d9a56ae..66d3b8509183 100644
> --- a/chardev/char-pipe.c
> +++ b/chardev/char-pipe.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/main-loop.h"
> #include "qemu/module.h"
> diff --git a/chardev/char-pty.c b/chardev/char-pty.c
> index d73d8b23903d..1e2863f532a8 100644
> --- a/chardev/char-pty.c
> +++ b/chardev/char-pty.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "chardev/char.h"
> #include "io/channel-file.h"
> diff --git a/cpu.c b/cpu.c
> index ab2c7c81e460..0fef70e18e74 100644
> --- a/cpu.c
> +++ b/cpu.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
>
> #include "exec/target_page.h"
> diff --git a/crypto/cipher-afalg.c b/crypto/cipher-afalg.c
> index c55cd28bf01c..3df8fc54c051 100644
> --- a/crypto/cipher-afalg.c
> +++ b/crypto/cipher-afalg.c
> @@ -12,7 +12,6 @@
> */
> #include "qemu/osdep.h"
> #include "qemu/sockets.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "crypto/cipher.h"
> #include "cipherpriv.h"
> diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c
> index 4ac18c7c1db7..3ebea392920d 100644
> --- a/crypto/hash-afalg.c
> +++ b/crypto/hash-afalg.c
> @@ -13,7 +13,6 @@
> #include "qemu/osdep.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "crypto/hash.h"
> #include "crypto/hmac.h"
> diff --git a/dump/dump.c b/dump/dump.c
> index 5d71c47d06aa..e766ce1d7d91 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "elf.h"
> #include "exec/hwaddr.h"
> diff --git a/dump/win_dump.c b/dump/win_dump.c
> index c5eb5a9aacd7..fbdbb7bd93a6 100644
> --- a/dump/win_dump.c
> +++ b/dump/win_dump.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "elf.h"
> #include "exec/hwaddr.h"
> diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
> index d06a0f7b8326..2dde27922fe2 100644
> --- a/fsdev/virtfs-proxy-helper.c
> +++ b/fsdev/virtfs-proxy-helper.c
> @@ -21,7 +21,6 @@
> #include <linux/magic.h>
> #endif
> #include <cap-ng.h>
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "qemu/xattr.h"
> #include "9p-iov-marshal.h"
> diff --git a/gdbstub.c b/gdbstub.c
> index c8375e3c3ffe..2c804d506629 100644
> --- a/gdbstub.c
> +++ b/gdbstub.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "qemu/ctype.h"
> diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
> index 4c5e0fc217eb..99d115ff0db4 100644
> --- a/hw/9pfs/9p-proxy.c
> +++ b/hw/9pfs/9p-proxy.c
> @@ -18,7 +18,6 @@
> #include "qemu/osdep.h"
> #include <sys/socket.h>
> #include <sys/un.h>
> -#include "qemu-common.h"
> #include "9p.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
> index c78ed96d0eca..f4349eba83fb 100644
> --- a/hw/alpha/dp264.c
> +++ b/hw/alpha/dp264.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "elf.h"
> #include "hw/loader.h"
> diff --git a/hw/avr/boot.c b/hw/avr/boot.c
> index cbede775cee2..617f3a144c85 100644
> --- a/hw/avr/boot.c
> +++ b/hw/avr/boot.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/loader.h"
> #include "elf.h"
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 8d9b2df6e725..8167301f0402 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -43,7 +43,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-machine.h"
> diff --git a/hw/display/artist.c b/hw/display/artist.c
> index 69a8f9eea8ba..8e121bb0b4dc 100644
> --- a/hw/display/artist.c
> +++ b/hw/display/artist.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> diff --git a/hw/display/cg3.c b/hw/display/cg3.c
> index 4b7e78d91924..2e9656ae1c39 100644
> --- a/hw/display/cg3.c
> +++ b/hw/display/cg3.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> diff --git a/hw/display/tcx.c b/hw/display/tcx.c
> index d4d09d0df8d5..1b27b64f6d14 100644
> --- a/hw/display/tcx.c
> +++ b/hw/display/tcx.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "ui/console.h"
> diff --git a/hw/display/virtio-gpu-udmabuf.c
> b/hw/display/virtio-gpu-udmabuf.c
> index 1597921c51fc..8bdf4bac6e4b 100644
> --- a/hw/display/virtio-gpu-udmabuf.c
> +++ b/hw/display/virtio-gpu-udmabuf.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "ui/console.h"
> #include "hw/virtio/virtio-gpu.h"
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 31ce01b7c57c..08e5938ec7b7 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/irq.h"
> #include "hw/qdev-properties.h"
> #include "hw/sysbus.h"
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index 98b30e0395ee..f7595c08577c 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -4,7 +4,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "elf.h"
> diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
> index c8b17af95353..0540047bad22 100644
> --- a/hw/i386/pc_sysfw.c
> +++ b/hw/i386/pc_sysfw.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "sysemu/block-backend.h"
> #include "qemu/error-report.h"
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 4cf107baea34..bb6727279097 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -25,7 +25,6 @@
> #include "qemu/option.h"
> #include "qemu/cutils.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qapi/qmp/qerror.h"
> diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c
> index 273e96a7b12d..aeb0624fe57e 100644
> --- a/hw/input/vhost-user-input.c
> +++ b/hw/input/vhost-user-input.c
> @@ -7,7 +7,6 @@
> #include "qemu/osdep.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
>
> #include "hw/virtio/virtio-input.h"
>
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index f5bfc501bc15..9719d98a179e 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -27,7 +27,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "trace.h"
> #include "sysemu/kvm.h"
> #include "hw/ppc/spapr.h"
> diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
> index 93812ee206ea..655207e393dc 100644
> --- a/hw/m68k/mcf5208.c
> +++ b/hw/m68k/mcf5208.c
> @@ -11,7 +11,6 @@
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/irq.h"
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index 66ca5c0df6ef..099a758c6f6a 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -22,7 +22,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "sysemu/sysemu.h"
> #include "cpu.h"
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index 8e630282e02c..7de8b5f83393 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "sysemu/sysemu.h"
> #include "cpu.h"
> #include "hw/boards.h"
> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
> index 03c030aa2cf0..8b92a9801a02 100644
> --- a/hw/microblaze/boot.c
> +++ b/hw/microblaze/boot.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "qemu/option.h"
> diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
> index c9f14e70a077..7b13098f9b1b 100644
> --- a/hw/mips/fuloong2e.c
> +++ b/hw/mips/fuloong2e.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
> index 4d6b44de342e..6598d7dddd59 100644
> --- a/hw/mips/jazz.c
> +++ b/hw/mips/jazz.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/mips/mips.h"
> diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
> index ae192db0c8b9..25534288dd81 100644
> --- a/hw/mips/loongson3_virt.c
> +++ b/hw/mips/loongson3_virt.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qemu/cutils.h"
> #include "qemu/datadir.h"
> diff --git a/hw/mips/malta.c b/hw/mips/malta.c
> index c4474b927c46..9ffdc5b8f187 100644
> --- a/hw/mips/malta.c
> +++ b/hw/mips/malta.c
> @@ -25,7 +25,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qemu/bitops.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/southbridge/piix.h"
> diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
> index 30bc1c4f086f..39f64448f244 100644
> --- a/hw/mips/mipssim.c
> +++ b/hw/mips/mipssim.c
> @@ -27,7 +27,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/mips/mips.h"
> diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c
> index 83020fe9ac9b..8d939fe31b1b 100644
> --- a/hw/misc/sbsa_ec.c
> +++ b/hw/misc/sbsa_ec.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "hw/sysbus.h"
> #include "sysemu/runstate.h"
> diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
> index e7fc082518d2..6d50c395439a 100644
> --- a/hw/net/fsl_etsec/etsec.c
> +++ b/hw/net/fsl_etsec/etsec.c
> @@ -27,7 +27,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/sysbus.h"
> #include "hw/irq.h"
> #include "hw/ptimer.h"
> diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
> index 8f084464155d..a32589e33be4 100644
> --- a/hw/net/fsl_etsec/rings.c
> +++ b/hw/net/fsl_etsec/rings.c
> @@ -22,7 +22,6 @@
> * THE SOFTWARE.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "net/checksum.h"
> #include "qemu/log.h"
> #include "etsec.h"
> diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
> index 9278fdce0b3d..7ccd3e514271 100644
> --- a/hw/net/msf2-emac.c
> +++ b/hw/net/msf2-emac.c
> @@ -29,7 +29,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> #include "hw/registerfields.h"
> diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
> index 9a2328935c1c..7c86bb52e571 100644
> --- a/hw/net/npcm7xx_emc.c
> +++ b/hw/net/npcm7xx_emc.c
> @@ -32,7 +32,6 @@
> /* For crc32 */
> #include <zlib.h>
>
> -#include "qemu-common.h"
> #include "hw/irq.h"
> #include "hw/qdev-clock.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
> index e889595d5c2b..07b8d87633b6 100644
> --- a/hw/nios2/boot.c
> +++ b/hw/nios2/boot.c
> @@ -30,7 +30,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/option.h"
> #include "qemu/config-file.h"
> diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
> index fbc18dbd04c2..48edb3ae373d 100644
> --- a/hw/nios2/generic_nommu.c
> +++ b/hw/nios2/generic_nommu.c
> @@ -28,7 +28,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
>
> #include "hw/char/serial.h"
> #include "hw/boards.h"
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index ea2d56f9f2af..4125cbebcd38 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "sysemu/sysemu.h"
> #include "sysemu/dma.h"
> diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
> index 00b3ff7d9098..cc9c4d6d3b33 100644
> --- a/hw/pci-host/mv64361.c
> +++ b/hw/pci-host/mv64361.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
> index 6e9aa9d6ace2..4e68ad4f03fc 100644
> --- a/hw/pci-host/pnv_phb3.c
> +++ b/hw/pci-host/pnv_phb3.c
> @@ -10,7 +10,6 @@
> #include "qemu/log.h"
> #include "qapi/visitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci-host/pnv_phb3_regs.h"
> #include "hw/pci-host/pnv_phb3.h"
> #include "hw/pci/pcie_host.h"
> diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c
> index 8bcbc2cc4f37..2f4112907b84 100644
> --- a/hw/pci-host/pnv_phb3_msi.c
> +++ b/hw/pci-host/pnv_phb3_msi.c
> @@ -9,7 +9,6 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci-host/pnv_phb3_regs.h"
> #include "hw/pci-host/pnv_phb3.h"
> #include "hw/ppc/pnv.h"
> diff --git a/hw/pci-host/pnv_phb3_pbcq.c b/hw/pci-host/pnv_phb3_pbcq.c
> index c7426cd27a20..82f70efa4311 100644
> --- a/hw/pci-host/pnv_phb3_pbcq.c
> +++ b/hw/pci-host/pnv_phb3_pbcq.c
> @@ -8,7 +8,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "target/ppc/cpu.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
> index 11c97e27eb16..3c4c2dace0a3 100644
> --- a/hw/pci-host/pnv_phb4.c
> +++ b/hw/pci-host/pnv_phb4.c
> @@ -10,7 +10,6 @@
> #include "qemu/log.h"
> #include "qapi/visitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "target/ppc/cpu.h"
> #include "hw/pci-host/pnv_phb4_regs.h"
> diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
> index 6f1121a9489a..61bc0b503e3e 100644
> --- a/hw/pci-host/pnv_phb4_pec.c
> +++ b/hw/pci-host/pnv_phb4_pec.c
> @@ -8,7 +8,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "target/ppc/cpu.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
> index 6e514f75eb8f..7a105e4a63d3 100644
> --- a/hw/pci-host/raven.c
> +++ b/hw/pci-host/raven.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/log.h"
> diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
> index eee45444ef73..bfb25ef6af85 100644
> --- a/hw/pci-host/remote.c
> +++ b/hw/pci-host/remote.c
> @@ -22,7 +22,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_host.h"
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index dae9119bfe5f..e99417e50110 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "hw/irq.h"
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index c7e6767f91a8..2bc3dce1fb7d 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 7b5a205309af..e8ef1a9e5d9b 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -47,7 +47,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "hw/ppc/ppc.h"
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 7016979a7cd0..fe2adb057b0c 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> index d45008ac7131..56bf203dfddf 100644
> --- a/hw/ppc/pegasos2.c
> +++ b/hw/ppc/pegasos2.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 00f57c9678e6..c5e48992d988 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/cutils.h"
> diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
> index 75a22ce50b11..99f1e8d7f9f3 100644
> --- a/hw/ppc/pnv_bmc.c
> +++ b/hw/ppc/pnv_bmc.c
> @@ -17,7 +17,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "target/ppc/cpu.h"
> #include "qemu/log.h"
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index 7e1a4ac9553b..32013b89836a 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -25,7 +25,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/ppc/ppc.h"
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index 7fb620b9a056..efa90ef5ba73 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -14,7 +14,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/error-report.h"
> #include "net/net.h"
> diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
> index 0737234d66e5..2f24598f55db 100644
> --- a/hw/ppc/sam460ex.c
> +++ b/hw/ppc/sam460ex.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index a4372ba1891e..cc11fcc8b24d 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/memalign.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
> index d7c0e212baf8..a64098c375e0 100644
> --- a/hw/ppc/spapr_numa.c
> +++ b/hw/ppc/spapr_numa.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/ppc/spapr_numa.h"
> #include "hw/pci-host/spapr.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c
> index 4678c79235f6..63b476c8f727 100644
> --- a/hw/ppc/spapr_pci_nvlink2.c
> +++ b/hw/ppc/spapr_pci_nvlink2.c
> @@ -23,7 +23,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci/pci.h"
> #include "hw/pci-host/spapr.h"
> #include "hw/ppc/spapr_numa.h"
> diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c
> index 2454086744b1..e10af35a1850 100644
> --- a/hw/ppc/spapr_tpm_proxy.c
> +++ b/hw/ppc/spapr_tpm_proxy.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "sysemu/reset.h"
> diff --git a/hw/ppc/spapr_vof.c b/hw/ppc/spapr_vof.c
> index a33f940c32bb..09f29be0b9de 100644
> --- a/hw/ppc/spapr_vof.c
> +++ b/hw/ppc/spapr_vof.c
> @@ -4,7 +4,6 @@
> * SPDX-License-Identifier: GPL-2.0-or-later
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "hw/ppc/spapr.h"
> #include "hw/ppc/spapr_vio.h"
> diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
> index 9c575403b85c..b67a709ddce2 100644
> --- a/hw/ppc/virtex_ml507.c
> +++ b/hw/ppc/virtex_ml507.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "cpu.h"
> diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c
> index 2b63a6287561..8d96593677da 100644
> --- a/hw/ppc/vof.c
> +++ b/hw/ppc/vof.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/range.h"
> #include "qemu/units.h"
> diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c
> index 547d597f0feb..40dfee4bad43 100644
> --- a/hw/remote/iohub.c
> +++ b/hw/remote/iohub.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_ids.h"
> diff --git a/hw/remote/machine.c b/hw/remote/machine.c
> index 952105eab5a2..92d71d47bb9c 100644
> --- a/hw/remote/machine.c
> +++ b/hw/remote/machine.c
> @@ -14,7 +14,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/machine.h"
> #include "exec/memory.h"
> diff --git a/hw/remote/memory.c b/hw/remote/memory.c
> index 6e21ab1a45c9..6d60da91e01c 100644
> --- a/hw/remote/memory.c
> +++ b/hw/remote/memory.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/memory.h"
> #include "exec/ram_addr.h"
> diff --git a/hw/remote/message.c b/hw/remote/message.c
> index 11d729845c5a..50f6bf2d495f 100644
> --- a/hw/remote/message.c
> +++ b/hw/remote/message.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/machine.h"
> #include "io/channel.h"
> diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
> index 7e841820e521..2a4aa651ca26 100644
> --- a/hw/remote/mpqemu-link.c
> +++ b/hw/remote/mpqemu-link.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/module.h"
> #include "hw/remote/mpqemu-link.h"
> diff --git a/hw/remote/proxy-memory-listener.c
> b/hw/remote/proxy-memory-listener.c
> index 0e893f3189e9..eb9918fe72bb 100644
> --- a/hw/remote/proxy-memory-listener.c
> +++ b/hw/remote/proxy-memory-listener.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/compiler.h"
> #include "qemu/int128.h"
> diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
> index bad164299dd4..1c7786b52cf1 100644
> --- a/hw/remote/proxy.c
> +++ b/hw/remote/proxy.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/proxy.h"
> #include "hw/pci/pci.h"
> diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
> index 4f21254219f8..333e5ac44331 100644
> --- a/hw/remote/remote-obj.c
> +++ b/hw/remote/remote-obj.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/error-report.h"
> #include "qemu/notify.h"
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index cae74fcbcd9a..0f179d36014a 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
> index 75d1fec6ca46..64f897e5b10a 100644
> --- a/hw/rx/rx-gdbsim.c
> +++ b/hw/rx/rx-gdbsim.c
> @@ -20,7 +20,6 @@
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/loader.h"
> #include "hw/rx/rx62n.h"
> #include "sysemu/qtest.h"
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index eb7fc4c4ae87..84971e537b3e 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -13,7 +13,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "sysemu/reset.h"
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index cd67a7bac8e2..8e6fa0915137 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -47,7 +47,6 @@
> #include "qemu/timer.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> -#include "qemu-common.h"
> #include "sdmmc-internal.h"
> #include "trace.h"
>
> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
> index a9f24968275d..1e39d2e2d0ac 100644
> --- a/hw/sparc/leon3.c
> +++ b/hw/sparc/leon3.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/irq.h"
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 7f3a7c002780..fccaed1eb444 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "qemu/datadir.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "hw/sysbus.h"
> #include "qemu/error-report.h"
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index cda7df36e312..6fd08e2298a6 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/pci/pci.h"
> diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
> index e6b77a2a941d..5831395cef75 100644
> --- a/hw/usb/dev-mtp.c
> +++ b/hw/usb/dev-mtp.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include <wchar.h>
> diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
> index 664cbd958323..6de58a76a7ff 100644
> --- a/hw/virtio/virtio-iommu.c
> +++ b/hw/virtio/virtio-iommu.c
> @@ -20,7 +20,6 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "qemu/iov.h"
> -#include "qemu-common.h"
> #include "hw/qdev-properties.h"
> #include "hw/virtio/virtio.h"
> #include "sysemu/kvm.h"
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index 35cbf1f21946..5aca40872695 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
> index 5419dca75e2c..5dd21c2c4408 100644
> --- a/hw/virtio/virtio-pmem.c
> +++ b/hw/virtio/virtio-pmem.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> #include "hw/virtio/virtio-pmem.h"
> diff --git a/io/channel-socket.c b/io/channel-socket.c
> index 7a8d9f69c92d..9f5ddf68b687 100644
> --- a/io/channel-socket.c
> +++ b/io/channel-socket.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/qapi-visit-sockets.h"
> #include "qemu/module.h"
> diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
> index 31a66a4fa07c..3b273f62997a 100644
> --- a/linux-user/aarch64/cpu_loop.c
> +++ b/linux-user/aarch64/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c
> index de6e0c901cdf..2ea039aa71f7 100644
> --- a/linux-user/alpha/cpu_loop.c
> +++ b/linux-user/alpha/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
> index 9dcb2e024eb0..683b8e47c2bd 100644
> --- a/linux-user/arm/cpu_loop.c
> +++ b/linux-user/arm/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "elf.h"
> diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c
> index 0f46b3c1a87a..01e6ff16fc92 100644
> --- a/linux-user/cris/cpu_loop.c
> +++ b/linux-user/cris/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c
> index 0d73934d31d5..b84e25bf71eb 100644
> --- a/linux-user/hexagon/cpu_loop.c
> +++ b/linux-user/hexagon/cpu_loop.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
> index 90bffc1956aa..492701dd9af9 100644
> --- a/linux-user/i386/cpu_loop.c
> +++ b/linux-user/i386/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "qemu/timer.h"
> #include "user-internals.h"
> diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
> index 928a18e3cf05..d1bf8548b747 100644
> --- a/linux-user/m68k/cpu_loop.c
> +++ b/linux-user/m68k/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/microblaze/cpu_loop.c
> b/linux-user/microblaze/cpu_loop.c
> index 1a2556be2c5f..5ccf9e942eaa 100644
> --- a/linux-user/microblaze/cpu_loop.c
> +++ b/linux-user/microblaze/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
> index 9bb12a07ba08..d5c1c7941d34 100644
> --- a/linux-user/mips/cpu_loop.c
> +++ b/linux-user/mips/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/openrisc/cpu_loop.c
> b/linux-user/openrisc/cpu_loop.c
> index 7683bea0649e..a7aa586c8f96 100644
> --- a/linux-user/openrisc/cpu_loop.c
> +++ b/linux-user/openrisc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/ppc/cpu_loop.c b/linux-user/ppc/cpu_loop.c
> index b468f199e4d2..02204ad8bebb 100644
> --- a/linux-user/ppc/cpu_loop.c
> +++ b/linux-user/ppc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "qemu/timer.h"
> #include "user-internals.h"
> diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
> index 26d446f32379..29084c142196 100644
> --- a/linux-user/riscv/cpu_loop.c
> +++ b/linux-user/riscv/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu.h"
> #include "user-internals.h"
> diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c
> index 7901dfe6f518..285bc60071a8 100644
> --- a/linux-user/s390x/cpu_loop.c
> +++ b/linux-user/s390x/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c
> index 1bd313cb19a2..c805f9db1104 100644
> --- a/linux-user/sh4/cpu_loop.c
> +++ b/linux-user/sh4/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
> index baf3d9ae011f..434c90a55f8f 100644
> --- a/linux-user/sparc/cpu_loop.c
> +++ b/linux-user/sparc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/uname.c b/linux-user/uname.c
> index 0856783b2190..415fdf31b62d 100644
> --- a/linux-user/uname.c
> +++ b/linux-user/uname.c
> @@ -21,7 +21,6 @@
>
> #include "qemu.h"
> #include "user-internals.h"
> -//#include "qemu-common.h"
> #include "uname.h"
>
> /* return highest utsname machine name for emulated instruction set
> diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
> index 883cf1ca4bbf..5e7302cbb995 100644
> --- a/monitor/qmp-cmds.c
> +++ b/monitor/qmp-cmds.c
> @@ -14,7 +14,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/option.h"
> #include "monitor/monitor.h"
> diff --git a/net/colo-compare.c b/net/colo-compare.c
> index 62554b5b3c8f..d5d096580577 100644
> --- a/net/colo-compare.c
> +++ b/net/colo-compare.c
> @@ -13,7 +13,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "trace.h"
> #include "qapi/error.h"
> diff --git a/net/net.c b/net/net.c
> index 9f17ab204422..a094cf1d2929 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "net/net.h"
> #include "clients.h"
> diff --git a/net/socket.c b/net/socket.c
> index c4b80e9228d7..ea5220a2eb51 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -27,7 +27,6 @@
> #include "clients.h"
> #include "monitor/monitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/option.h"
> #include "qemu/sockets.h"
> diff --git a/net/tap-bsd.c b/net/tap-bsd.c
> index e45a6d124eb6..7e65bd391f0b 100644
> --- a/net/tap-bsd.c
> +++ b/net/tap-bsd.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "tap_int.h"
> #include "qemu/cutils.h"
> diff --git a/net/tap-linux.c b/net/tap-linux.c
> index 5e70b9303710..3e24d232e782 100644
> --- a/net/tap-linux.c
> +++ b/net/tap-linux.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "tap_int.h"
> #include "tap-linux.h"
> #include "net/tap.h"
> diff --git a/net/tap-solaris.c b/net/tap-solaris.c
> index d85224242b30..79919785c9f6 100644
> --- a/net/tap-solaris.c
> +++ b/net/tap-solaris.c
> @@ -27,7 +27,6 @@
> #include "tap_int.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> -#include "qemu-common.h"
>
> #include <sys/ethernet.h>
> #include <sys/sockio.h>
> diff --git a/net/tap-win32.c b/net/tap-win32.c
> index 6096972f5d47..7466f22e77a4 100644
> --- a/net/tap-win32.c
> +++ b/net/tap-win32.c
> @@ -29,7 +29,6 @@
> #include "qemu/osdep.h"
> #include "tap_int.h"
>
> -#include "qemu-common.h"
> #include "clients.h" /* net_init_tap */
> #include "net/eth.h"
> #include "net/net.h"
> diff --git a/net/tap.c b/net/tap.c
> index c5cbeaa7a2be..6190fa699d2f 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -38,7 +38,6 @@
> #include "monitor/monitor.h"
> #include "sysemu/sysemu.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/net/vde.c b/net/vde.c
> index 99189cccb694..1083916bcf52 100644
> --- a/net/vde.c
> +++ b/net/vde.c
> @@ -27,7 +27,6 @@
>
> #include "net/net.h"
> #include "clients.h"
> -#include "qemu-common.h"
> #include "qemu/option.h"
> #include "qemu/main-loop.h"
> #include "qapi/error.h"
> diff --git a/os-posix.c b/os-posix.c
> index 24692c8593f3..ee765f047dea 100644
> --- a/os-posix.c
> +++ b/os-posix.c
> @@ -29,7 +29,6 @@
> #include <grp.h>
> #include <libgen.h>
>
> -#include "qemu-common.h"
> /* Needed early for CONFIG_BSD etc. */
> #include "net/slirp.h"
> #include "qemu/qemu-options.h"
> diff --git a/os-win32.c b/os-win32.c
> index 6f21b578417c..725ad652e8bb 100644
> --- a/os-win32.c
> +++ b/os-win32.c
> @@ -26,7 +26,6 @@
> #include "qemu/osdep.h"
> #include <windows.h>
> #include <mmsystem.h>
> -#include "qemu-common.h"
> #include "sysemu/runstate.h"
>
> static BOOL WINAPI qemu_ctrl_handler(DWORD type)
> diff --git a/page-vary-common.c b/page-vary-common.c
> index 91755564985c..ab77672dd412 100644
> --- a/page-vary-common.c
> +++ b/page-vary-common.c
> @@ -20,7 +20,6 @@
> #define IN_PAGE_VARY 1
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/page-vary.h"
>
> /* WARNING: This file must *not* be complied with -flto. */
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index 4d7a2392c097..9924277c826e 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -16,7 +16,6 @@
> #include <sys/utsname.h>
> #include <sys/wait.h>
> #include <dirent.h>
> -#include "qemu-common.h"
> #include "guest-agent-core.h"
> #include "qga-qapi-commands.h"
> #include "qapi/error.h"
> diff --git a/softmmu/cpu-throttle.c b/softmmu/cpu-throttle.c
> index 8c2144ab95cc..d9bb30a223d8 100644
> --- a/softmmu/cpu-throttle.c
> +++ b/softmmu/cpu-throttle.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/thread.h"
> #include "hw/core/cpu.h"
> #include "qemu/main-loop.h"
> diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c
> index 204d946a1729..117408cb83af 100644
> --- a/softmmu/cpu-timers.c
> +++ b/softmmu/cpu-timers.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> diff --git a/softmmu/cpus.c b/softmmu/cpus.c
> index 7b75bb66d5e6..668bef9b4d62 100644
> --- a/softmmu/cpus.c
> +++ b/softmmu/cpus.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "qemu/coroutine-tls.h"
> #include "qapi/error.h"
> diff --git a/softmmu/datadir.c b/softmmu/datadir.c
> index 504c4665bed7..160cac999a6f 100644
> --- a/softmmu/datadir.c
> +++ b/softmmu/datadir.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/cutils.h"
> #include "trace.h"
> diff --git a/softmmu/icount.c b/softmmu/icount.c
> index 21341a4ce49e..5ca271620db6 100644
> --- a/softmmu/icount.c
> +++ b/softmmu/icount.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> diff --git a/softmmu/runstate.c b/softmmu/runstate.c
> index e0d869b21aa4..fac7b63259e8 100644
> --- a/softmmu/runstate.c
> +++ b/softmmu/runstate.c
> @@ -40,7 +40,6 @@
> #include "qapi/error.h"
> #include "qapi/qapi-commands-run-state.h"
> #include "qapi/qapi-events-run-state.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qemu/job.h"
> diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
> index d058a2a00d85..afa477aae656 100644
> --- a/stubs/monitor-core.c
> +++ b/stubs/monitor-core.c
> @@ -1,6 +1,5 @@
> #include "qemu/osdep.h"
> #include "monitor/monitor.h"
> -#include "qemu-common.h"
> #include "qapi/qapi-emit-events.h"
>
> Monitor *monitor_cur(void)
> diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
> index 8c34f86792ed..567e296b21c9 100644
> --- a/target/arm/hvf/hvf.c
> +++ b/target/arm/hvf/hvf.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
>
> #include "sysemu/runstate.h"
> diff --git a/target/arm/kvm.c b/target/arm/kvm.c
> index bbf1ce7ba3bc..5fc37ac10a5b 100644
> --- a/target/arm/kvm.c
> +++ b/target/arm/kvm.c
> @@ -13,7 +13,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
> index 9ec8875150d6..17dd2f77d9f5 100644
> --- a/target/arm/kvm64.c
> +++ b/target/arm/kvm64.c
> @@ -16,7 +16,6 @@
> #include <linux/elf.h>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "cpu.h"
> #include "qemu/timer.h"
> diff --git a/target/hexagon/gdbstub.c b/target/hexagon/gdbstub.c
> index 9c8c04c961b1..d152d01bfe7e 100644
> --- a/target/hexagon/gdbstub.c
> +++ b/target/hexagon/gdbstub.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/gdbstub.h"
> #include "cpu.h"
> #include "internal.h"
> diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c
> index 81f665e21245..b185ee8de4fd 100644
> --- a/target/i386/hax/hax-all.c
> +++ b/target/i386/hax/hax-all.c
> @@ -27,7 +27,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
>
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/reset.h"
> #include "sysemu/runstate.h"
> diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
> index fc12c02fb217..f8833277ab6a 100644
> --- a/target/i386/hvf/hvf.c
> +++ b/target/i386/hvf/hvf.c
> @@ -47,7 +47,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/memalign.h"
>
> diff --git a/target/i386/hvf/x86.c b/target/i386/hvf/x86.c
> index 91a3fe002c73..d086584f26d9 100644
> --- a/target/i386/hvf/x86.c
> +++ b/target/i386/hvf/x86.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
>
> #include "cpu.h"
> -#include "qemu-common.h"
> #include "x86_decode.h"
> #include "x86_emu.h"
> #include "vmcs.h"
> diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
> index 32b0d131df86..f24dd50e48ff 100644
> --- a/target/i386/hvf/x86_cpuid.c
> +++ b/target/i386/hvf/x86_cpuid.c
> @@ -21,7 +21,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "x86.h"
> #include "vmx.h"
> diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c
> index 062713b1a450..3728d7705e21 100644
> --- a/target/i386/hvf/x86_decode.c
> +++ b/target/i386/hvf/x86_decode.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "panic.h"
> #include "x86_decode.h"
> #include "vmx.h"
> diff --git a/target/i386/hvf/x86_descr.c b/target/i386/hvf/x86_descr.c
> index af15c06ac5db..a484942cfcd4 100644
> --- a/target/i386/hvf/x86_descr.c
> +++ b/target/i386/hvf/x86_descr.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "vmx.h"
> #include "x86_descr.h"
>
> diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
> index 050428795bbc..f5704f63e8da 100644
> --- a/target/i386/hvf/x86_emu.c
> +++ b/target/i386/hvf/x86_emu.c
> @@ -37,7 +37,6 @@
>
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "x86_decode.h"
> #include "x86.h"
> #include "x86_emu.h"
> diff --git a/target/i386/hvf/x86_flags.c b/target/i386/hvf/x86_flags.c
> index fecbca751770..03d6de5efc3e 100644
> --- a/target/i386/hvf/x86_flags.c
> +++ b/target/i386/hvf/x86_flags.c
> @@ -23,7 +23,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "panic.h"
> #include "cpu.h"
> #include "x86_flags.h"
> diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c
> index df0b91cd4208..96d117567ee8 100644
> --- a/target/i386/hvf/x86_mmu.c
> +++ b/target/i386/hvf/x86_mmu.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "x86.h"
> #include "x86_mmu.h"
> diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
> index d24daf6a4110..beaeec068731 100644
> --- a/target/i386/hvf/x86_task.c
> +++ b/target/i386/hvf/x86_task.c
> @@ -8,7 +8,6 @@
> // GNU General Public License for more details.
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
>
> #include "sysemu/hvf.h"
> diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c
> index bec9fc581463..69d4fb8cf555 100644
> --- a/target/i386/hvf/x86hvf.c
> +++ b/target/i386/hvf/x86hvf.c
> @@ -19,7 +19,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "x86hvf.h"
> #include "vmx.h"
> #include "vmcs.h"
> diff --git a/target/i386/kvm/sev-stub.c b/target/i386/kvm/sev-stub.c
> index 6080c007a2e4..1be5341e8a6a 100644
> --- a/target/i386/kvm/sev-stub.c
> +++ b/target/i386/kvm/sev-stub.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sev.h"
>
> int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
> diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
> index 9f940413318c..b75738ee9cdf 100644
> --- a/target/i386/nvmm/nvmm-all.c
> +++ b/target/i386/nvmm/nvmm-all.c
> @@ -11,7 +11,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
> #include "exec/ioport.h"
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/nvmm.h"
> #include "sysemu/cpus.h"
> diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
> index 68a4ebe909ad..5560a22ea5c2 100644
> --- a/target/i386/whpx/whpx-all.c
> +++ b/target/i386/whpx/whpx-all.c
> @@ -12,7 +12,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
> #include "exec/ioport.h"
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/whpx.h"
> #include "sysemu/cpus.h"
> diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c
> index bba36f3ec98f..c15df35ad60a 100644
> --- a/target/i386/whpx/whpx-apic.c
> +++ b/target/i386/whpx/whpx-apic.c
> @@ -11,7 +11,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "hw/i386/apic_internal.h"
> #include "hw/i386/apic-msidef.h"
> diff --git a/target/mips/kvm.c b/target/mips/kvm.c
> index 086debd9f013..caf70decd2a5 100644
> --- a/target/mips/kvm.c
> +++ b/target/mips/kvm.c
> @@ -14,7 +14,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "internal.h"
> #include "qemu/error-report.h"
> diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
> index 5a7ad0c7108d..eda21c04434b 100644
> --- a/target/nios2/nios2-semi.c
> +++ b/target/nios2/nios2-semi.c
> @@ -28,7 +28,6 @@
> #if defined(CONFIG_USER_ONLY)
> #include "qemu.h"
> #else
> -#include "qemu-common.h"
> #include "exec/softmmu-semi.h"
> #endif
> #include "qemu/log.h"
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 8644b85de847..f905a2af17a7 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -21,7 +21,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "cpu.h"
> diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
> index e6b7cb6d4d5f..70b4cff06fbb 100644
> --- a/target/riscv/kvm.c
> +++ b/target/riscv/kvm.c
> @@ -21,7 +21,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/target/rx/cpu.c b/target/rx/cpu.c
> index 25a4aa2976d3..fb30080ac4ea 100644
> --- a/target/rx/cpu.c
> +++ b/target/rx/cpu.c
> @@ -20,7 +20,6 @@
> #include "qemu/qemu-print.h"
> #include "qapi/error.h"
> #include "cpu.h"
> -#include "qemu-common.h"
> #include "migration/vmstate.h"
> #include "exec/exec-all.h"
> #include "hw/loader.h"
> diff --git a/target/rx/gdbstub.c b/target/rx/gdbstub.c
> index c811d4810b45..7eb2059a841b 100644
> --- a/target/rx/gdbstub.c
> +++ b/target/rx/gdbstub.c
> @@ -16,7 +16,6 @@
> * this program. If not, see <http://www.gnu.org/licenses/>.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
>
> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
> index 6acf14d5ecb4..53098bf54104 100644
> --- a/target/s390x/kvm/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -24,7 +24,6 @@
> #include <linux/kvm.h>
> #include <asm/ptrace.h>
>
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "kvm_s390x.h"
> diff --git a/target/s390x/tcg/vec_fpu_helper.c
> b/target/s390x/tcg/vec_fpu_helper.c
> index 1a779934715f..aa2cc8e4a6b5 100644
> --- a/target/s390x/tcg/vec_fpu_helper.c
> +++ b/target/s390x/tcg/vec_fpu_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "vec.h"
> diff --git a/target/s390x/tcg/vec_int_helper.c
> b/target/s390x/tcg/vec_int_helper.c
> index 5561b3ed9096..b44859ee1630 100644
> --- a/target/s390x/tcg/vec_int_helper.c
> +++ b/target/s390x/tcg/vec_int_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "vec.h"
> #include "exec/helper-proto.h"
> diff --git a/target/s390x/tcg/vec_string_helper.c
> b/target/s390x/tcg/vec_string_helper.c
> index ac315eb095c1..f8b54bba4a9d 100644
> --- a/target/s390x/tcg/vec_string_helper.c
> +++ b/target/s390x/tcg/vec_string_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "vec.h"
> diff --git a/target/tricore/gdbstub.c b/target/tricore/gdbstub.c
> index 3ce55abb8e3b..ebf32defde3a 100644
> --- a/target/tricore/gdbstub.c
> +++ b/target/tricore/gdbstub.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/gdbstub.h"
>
>
> diff --git a/target/xtensa/core-de233_fpu.c
> b/target/xtensa/core-de233_fpu.c
> index c7cbeb1b4834..41af8057fbb9 100644
> --- a/target/xtensa/core-de233_fpu.c
> +++ b/target/xtensa/core-de233_fpu.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-de233_fpu/core-isa.h"
> diff --git a/target/xtensa/core-dsp3400.c b/target/xtensa/core-dsp3400.c
> index 4e0bc8a8c46c..81e425c56828 100644
> --- a/target/xtensa/core-dsp3400.c
> +++ b/target/xtensa/core-dsp3400.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-dsp3400/core-isa.h"
> diff --git a/target/xtensa/core-test_mmuhifi_c3.c
> b/target/xtensa/core-test_mmuhifi_c3.c
> index 123c630b0da7..c0e5d32d1e47 100644
> --- a/target/xtensa/core-test_mmuhifi_c3.c
> +++ b/target/xtensa/core-test_mmuhifi_c3.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-test_mmuhifi_c3/core-isa.h"
> diff --git a/tcg/tci.c b/tcg/tci.c
> index fe92b5d0844b..bdfac83492dd 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */
> #include "exec/cpu_ldst.h"
> #include "tcg/tcg-op.h"
> diff --git a/tests/qtest/acpi-utils.c b/tests/qtest/acpi-utils.c
> index 766c48e3a6a4..673fc975862c 100644
> --- a/tests/qtest/acpi-utils.c
> +++ b/tests/qtest/acpi-utils.c
> @@ -14,7 +14,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "qemu/bitmap.h"
> #include "acpi-utils.h"
> #include "boot-sector.h"
> diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
> index 8073ccc20521..aff5f3f79776 100644
> --- a/tests/qtest/ahci-test.c
> +++ b/tests/qtest/ahci-test.c
> @@ -30,7 +30,6 @@
> #include "libqos/ahci.h"
> #include "libqos/pci-pc.h"
>
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/host-utils.h"
>
> diff --git a/tests/qtest/aspeed_hace-test.c
> b/tests/qtest/aspeed_hace-test.c
> index 09ee31545e41..58aa22014d04 100644
> --- a/tests/qtest/aspeed_hace-test.c
> +++ b/tests/qtest/aspeed_hace-test.c
> @@ -8,7 +8,6 @@
> #include "qemu/osdep.h"
>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "qemu/bitops.h"
>
> #define HACE_CMD 0x10
> diff --git a/tests/qtest/bios-tables-test.c
> b/tests/qtest/bios-tables-test.c
> index c4a2d1e1664b..5dddedabcdde 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -57,7 +57,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "hw/firmware/smbios.h"
> #include "qemu/bitmap.h"
> #include "acpi-utils.h"
> diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
> index ea8f264661c3..9d9825bc8145 100644
> --- a/tests/qtest/boot-sector.c
> +++ b/tests/qtest/boot-sector.c
> @@ -12,7 +12,6 @@
> */
> #include "qemu/osdep.h"
> #include "boot-sector.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
>
> #define LOW(x) ((x) & 0xff)
> diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c
> index a1c689414be5..7f5dd5f85a78 100644
> --- a/tests/qtest/cpu-plug-test.c
> +++ b/tests/qtest/cpu-plug-test.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> diff --git a/tests/qtest/dbus-display-test.c
> b/tests/qtest/dbus-display-test.c
> index 43c77aff045c..81043162dfdd 100644
> --- a/tests/qtest/dbus-display-test.c
> +++ b/tests/qtest/dbus-display-test.c
> @@ -3,7 +3,6 @@
> #include <gio/gio.h>
> #include <gio/gunixfdlist.h>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "dbus-display1.h"
>
> static GDBusConnection*
> diff --git a/tests/qtest/dbus-vmstate-test.c
> b/tests/qtest/dbus-vmstate-test.c
> index aca9b98b7a35..a8acab763f5d 100644
> --- a/tests/qtest/dbus-vmstate-test.c
> +++ b/tests/qtest/dbus-vmstate-test.c
> @@ -2,7 +2,6 @@
> #include <glib/gstdio.h>
> #include <gio/gio.h>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "dbus-vmstate1.h"
> #include "migration-helpers.h"
>
> diff --git a/tests/qtest/device-introspect-test.c
> b/tests/qtest/device-introspect-test.c
> index bbec166dbc2f..adf39b2518e8 100644
> --- a/tests/qtest/device-introspect-test.c
> +++ b/tests/qtest/device-introspect-test.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/qmp/qstring.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c
> index e648fdd409cd..ddd6983ede14 100644
> --- a/tests/qtest/e1000e-test.c
> +++ b/tests/qtest/e1000e-test.c
> @@ -25,9 +25,7 @@
>
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> -#include "qemu-common.h"
> #include "libqos/pci-pc.h"
> #include "qemu/sockets.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c
> index f94cd8dd8e05..a0adc35bef7f 100644
> --- a/tests/qtest/erst-test.c
> +++ b/tests/qtest/erst-test.c
> @@ -11,7 +11,6 @@
> #include <glib/gstdio.h>
> #include "libqos/libqos-pc.h"
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
>
> diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c
> index b0d40012e6a9..4aa72f36431f 100644
> --- a/tests/qtest/fdc-test.c
> +++ b/tests/qtest/fdc-test.c
> @@ -27,7 +27,6 @@
>
> #include "libqtest-single.h"
> #include "qapi/qmp/qdict.h"
> -#include "qemu-common.h"
>
> /* TODO actually test the results and get rid of this */
> #define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
> diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
> index 7a244c951e5e..dc891d838b6a 100644
> --- a/tests/qtest/fuzz/qos_fuzz.c
> +++ b/tests/qtest/fuzz/qos_fuzz.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "exec/memory.h"
> #include "qemu/main-loop.h"
>
> diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
> index 64023c057408..da9c4c2792de 100644
> --- a/tests/qtest/hd-geo-test.c
> +++ b/tests/qtest/hd-geo-test.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/bswap.h"
> #include "qapi/qmp/qlist.h"
> #include "libqos/libqtest.h"
> diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
> index 19de3b410405..b7243a17b11d 100644
> --- a/tests/qtest/ide-test.c
> +++ b/tests/qtest/ide-test.c
> @@ -30,7 +30,6 @@
> #include "libqos/pci-pc.h"
> #include "libqos/malloc-pc.h"
> #include "qapi/qmp/qdict.h"
> -#include "qemu-common.h"
> #include "qemu/bswap.h"
> #include "hw/pci/pci_ids.h"
> #include "hw/pci/pci_regs.h"
> diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c
> index 19612e9405ae..ed431e34e68d 100644
> --- a/tests/qtest/ipmi-bt-test.c
> +++ b/tests/qtest/ipmi-bt-test.c
> @@ -31,7 +31,6 @@
>
>
> #include "libqtest-single.h"
> -#include "qemu-common.h"
>
> #define IPMI_IRQ 5
>
> diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
> index 4e8af42a9d04..95628a418579 100644
> --- a/tests/qtest/ivshmem-test.c
> +++ b/tests/qtest/ivshmem-test.c
> @@ -14,7 +14,6 @@
> #include "libqos/libqos-pc.h"
> #include "libqos/libqos-spapr.h"
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
>
> #define TMPSHMSIZE (1 << 20)
> static char *tmpshm;
> diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
> index eaa2096512e5..41c4be5efa93 100644
> --- a/tests/qtest/libqos/ahci.c
> +++ b/tests/qtest/libqos/ahci.c
> @@ -28,7 +28,6 @@
> #include "ahci.h"
> #include "pci-pc.h"
>
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "hw/pci/pci_ids.h"
> diff --git a/tests/qtest/libqos/malloc-pc.c
> b/tests/qtest/libqos/malloc-pc.c
> index f1e3b392a53c..bbd1b4827e54 100644
> --- a/tests/qtest/libqos/malloc-pc.c
> +++ b/tests/qtest/libqos/malloc-pc.c
> @@ -16,8 +16,6 @@
>
> #include "standard-headers/linux/qemu_fw_cfg.h"
>
> -#include "qemu-common.h"
> -
> #define ALLOC_PAGE_SIZE (4096)
>
> void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags)
> diff --git a/tests/qtest/libqos/malloc-spapr.c
> b/tests/qtest/libqos/malloc-spapr.c
> index 05b306c191d3..d90ed3c51d7d 100644
> --- a/tests/qtest/libqos/malloc-spapr.c
> +++ b/tests/qtest/libqos/malloc-spapr.c
> @@ -8,8 +8,6 @@
> #include "qemu/osdep.h"
> #include "malloc-spapr.h"
>
> -#include "qemu-common.h"
> -
> #define SPAPR_PAGE_SIZE 4096
>
> /* Memory must be a multiple of 256 MB,
> diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c
> index f708b0143262..f0c8f950c805 100644
> --- a/tests/qtest/libqos/malloc.c
> +++ b/tests/qtest/libqos/malloc.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
> #include "malloc.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> typedef struct MemBlock {
> diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
> index dc5566ccfd60..7b5890dcc487 100644
> --- a/tests/qtest/libqtest.c
> +++ b/tests/qtest/libqtest.c
> @@ -21,7 +21,6 @@
> #include <sys/un.h>
>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> #include "qapi/error.h"
> diff --git a/tests/qtest/machine-none-test.c
> b/tests/qtest/machine-none-test.c
> index 138101b46ac2..8ca18074b9f9 100644
> --- a/tests/qtest/machine-none-test.c
> +++ b/tests/qtest/machine-none-test.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> diff --git a/tests/qtest/npcm7xx_emc-test.c
> b/tests/qtest/npcm7xx_emc-test.c
> index 7c435ac91576..a353fef0ca13 100644
> --- a/tests/qtest/npcm7xx_emc-test.c
> +++ b/tests/qtest/npcm7xx_emc-test.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqos.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qnum.h"
> diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
> index 32bbae33c597..3cb47d2c5496 100644
> --- a/tests/qtest/pxe-test.c
> +++ b/tests/qtest/pxe-test.c
> @@ -14,7 +14,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "boot-sector.h"
> #include "libqos/libqos-spapr.h"
> diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
> index eb34af843b79..6b162e12b5aa 100644
> --- a/tests/qtest/qom-test.c
> +++ b/tests/qtest/qom-test.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> #include "qemu/cutils.h"
> diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
> index 450604926492..8fa3313cc333 100644
> --- a/tests/qtest/rtl8139-test.c
> +++ b/tests/qtest/rtl8139-test.c
> @@ -11,7 +11,6 @@
> #include "libqtest-single.h"
> #include "libqos/pci-pc.h"
> #include "qemu/timer.h"
> -#include "qemu-common.h"
>
> /* Tests only initialization so far. TODO: Replace with functional tests
> */
> static void nop(void)
> diff --git a/tests/qtest/test-filter-mirror.c
> b/tests/qtest/test-filter-mirror.c
> index da4f94de727a..fdf66cebd62f 100644
> --- a/tests/qtest/test-filter-mirror.c
> +++ b/tests/qtest/test-filter-mirror.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/test-filter-redirector.c
> b/tests/qtest/test-filter-redirector.c
> index fc16cf7e8d5f..339d3c04cedc 100644
> --- a/tests/qtest/test-filter-redirector.c
> +++ b/tests/qtest/test-filter-redirector.c
> @@ -51,7 +51,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/test-x86-cpuid-compat.c
> b/tests/qtest/test-x86-cpuid-compat.c
> index 39138db7744b..b39c9055b309 100644
> --- a/tests/qtest/test-x86-cpuid-compat.c
> +++ b/tests/qtest/test-x86-cpuid-compat.c
> @@ -1,5 +1,4 @@
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> #include "qapi/qmp/qnum.h"
> diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
> index a71395849f33..fc9f2b94982d 100644
> --- a/tests/qtest/virtio-net-test.c
> +++ b/tests/qtest/virtio-net-test.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> #include "qemu/iov.h"
> #include "qemu/module.h"
> diff --git a/tests/unit/check-qjson.c b/tests/unit/check-qjson.c
> index c845f91d4377..c4e0f851bfc6 100644
> --- a/tests/unit/check-qjson.c
> +++ b/tests/unit/check-qjson.c
> @@ -21,7 +21,6 @@
> #include "qapi/qmp/qnum.h"
> #include "qapi/qmp/qstring.h"
> #include "qemu/unicode.h"
> -#include "qemu-common.h"
>
> static QString *from_json_str(const char *jstr, bool single, Error **errp)
> {
> diff --git a/tests/unit/check-qnull.c b/tests/unit/check-qnull.c
> index ebf21db83ccc..5ceacc65d7f3 100644
> --- a/tests/unit/check-qnull.c
> +++ b/tests/unit/check-qnull.c
> @@ -9,7 +9,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qnull.h"
> -#include "qemu-common.h"
> #include "qapi/qobject-input-visitor.h"
> #include "qapi/qobject-output-visitor.h"
> #include "qapi/error.h"
> diff --git a/tests/unit/check-qnum.c b/tests/unit/check-qnum.c
> index b85fca23029e..bf7fe45bacc4 100644
> --- a/tests/unit/check-qnum.c
> +++ b/tests/unit/check-qnum.c
> @@ -15,7 +15,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qnum.h"
> -#include "qemu-common.h"
>
> /*
> * Public Interface test-cases
> diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c
> index 7903ebf4cf80..0ed094e55f3a 100644
> --- a/tests/unit/check-qobject.c
> +++ b/tests/unit/check-qobject.c
> @@ -15,7 +15,6 @@
> #include "qapi/qmp/qnull.h"
> #include "qapi/qmp/qnum.h"
> #include "qapi/qmp/qstring.h"
> -#include "qemu-common.h"
>
> #include <math.h>
>
> diff --git a/tests/unit/check-qstring.c b/tests/unit/check-qstring.c
> index 4bf977209342..bd861f4f8b47 100644
> --- a/tests/unit/check-qstring.c
> +++ b/tests/unit/check-qstring.c
> @@ -12,7 +12,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qstring.h"
> -#include "qemu-common.h"
>
> /*
> * Public Interface test-cases
> diff --git a/tests/unit/socket-helpers.c b/tests/unit/socket-helpers.c
> index ef31664d0224..0a9e090a68dd 100644
> --- a/tests/unit/socket-helpers.c
> +++ b/tests/unit/socket-helpers.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osde
[-- Attachment #2: Type: text/html, Size: 108730 bytes --]
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 32/32] Remove qemu-common.h include from most units
@ 2022-04-05 15:02 ` Ani Sinha
0 siblings, 0 replies; 79+ messages in thread
From: Ani Sinha @ 2022-04-05 15:02 UTC (permalink / raw)
To: marcandre.lureau
Cc: Aarushi Mehta, Aleksandar Rikalo, Alex Bennée,
Alexander Bulekov, Alexander Graf, Alexey Kardashevskiy,
Alistair Francis, Andrew Jeffery, Artyom Tarasenko,
Aurelien Jarno, BALATON Zoltan, Bandan Das, Bastian Koppelmann,
Bin Meng, Cameron Esfahani, Chris Wulff, Christian Borntraeger,
Christian Schoenebeck, Colin Xu, Corey Minyard, Cornelia Huck,
Cédric Le Goater, Daniel Henrique Barboza,
Daniel P. Berrangé,
Darren Kenny, David Gibson, David Hildenbrand, Edgar E. Iglesias,
Eduardo Habkost, Elena Ufimtseva, Eric Auger, Eric Farman,
Fabien Chouteau, Fam Zheng, Gerd Hoffmann, Greg Kurz,
Halil Pasic, Hanna Reitz, Havard Skinnemoen, Helge Deller,
Hervé Poussineau, Huacai Chen, Igor Mammedov,
Jagannathan Raman, Jason Wang, Jiaxun Yang, Joel Stanley,
John G Johnson, John Snow, Julia Suvorova, KONRAD Frederic,
Kamil Rytarowski, Kevin Wolf, Kyle Evans, Laurent Vivier,
Li Zhijian, Marcel Apfelbaum, Marcelo Tosatti, Marek Vasut,
Mark Cave-Ayland, Markus Armbruster, Max Filippov,
Michael Rolnik, Michael Roth, Michael S. Tsirkin, Palmer Dabbelt,
Paolo Bonzini, Peter Maydell, Philippe Mathieu-Daudé,
Qiuhao Li, Reinoud Zandijk, Richard Henderson, Roman Bolshakov,
Stefan Berger, Stefan Hajnoczi, Stefan Weil, Stefano Garzarella,
Subbaraya Sundeep, Sunil Muthuswamy, Taylor Simpson, Thomas Huth,
Tyrone Ting, Warner Losh, Wenchao Wang, Yanan Wang,
Yoshinori Sato, Zhang Chen, open list:ARM PrimeCell and...,
open list:Overall KVM CPUs, open list:RISC-V TCG CPUs,
open list:S390-ccw boot, open list:X86 HAXM CPUs, open list:raw,
open list:sPAPR (pseries),
qemu-devel
[-- Attachment #1: Type: text/plain, Size: 87951 bytes --]
On Wed, Mar 23, 2022 at 9:32 PM <marcandre.lureau@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Empty patch descriptions are not a good idea. Please explain why this
removal does not break things and maybe why the header got included
initiatively.
> ---
> include/qemu-common.h | 9 ---------
> accel/hvf/hvf-all.c | 1 -
> accel/tcg/cpu-exec.c | 1 -
> accel/tcg/tcg-accel-ops-icount.c | 1 -
> accel/tcg/tcg-accel-ops-mttcg.c | 1 -
> accel/tcg/tcg-accel-ops-rr.c | 1 -
> accel/tcg/tcg-accel-ops.c | 1 -
> accel/tcg/tcg-all.c | 1 -
> accel/tcg/translate-all.c | 1 -
> audio/audio_win_int.c | 1 -
> backends/hostmem-epc.c | 1 -
> backends/tpm/tpm_passthrough.c | 1 -
> block/file-posix.c | 1 -
> block/io_uring.c | 1 -
> bsd-user/freebsd/os-syscall.c | 1 -
> bsd-user/mmap.c | 1 -
> chardev/char-fd.c | 1 -
> chardev/char-pipe.c | 1 -
> chardev/char-pty.c | 1 -
> cpu.c | 1 -
> crypto/cipher-afalg.c | 1 -
> crypto/hash-afalg.c | 1 -
> dump/dump.c | 1 -
> dump/win_dump.c | 1 -
> fsdev/virtfs-proxy-helper.c | 1 -
> gdbstub.c | 1 -
> hw/9pfs/9p-proxy.c | 1 -
> hw/alpha/dp264.c | 1 -
> hw/avr/boot.c | 1 -
> hw/core/loader.c | 1 -
> hw/display/artist.c | 1 -
> hw/display/cg3.c | 1 -
> hw/display/tcx.c | 1 -
> hw/display/virtio-gpu-udmabuf.c | 1 -
> hw/dma/pl330.c | 1 -
> hw/hppa/machine.c | 1 -
> hw/i386/pc_sysfw.c | 1 -
> hw/i386/x86.c | 1 -
> hw/input/vhost-user-input.c | 1 -
> hw/intc/xics_kvm.c | 1 -
> hw/m68k/mcf5208.c | 1 -
> hw/m68k/q800.c | 1 -
> hw/m68k/virt.c | 1 -
> hw/microblaze/boot.c | 1 -
> hw/mips/fuloong2e.c | 1 -
> hw/mips/jazz.c | 1 -
> hw/mips/loongson3_virt.c | 1 -
> hw/mips/malta.c | 1 -
> hw/mips/mipssim.c | 1 -
> hw/misc/sbsa_ec.c | 1 -
> hw/net/fsl_etsec/etsec.c | 1 -
> hw/net/fsl_etsec/rings.c | 1 -
> hw/net/msf2-emac.c | 1 -
> hw/net/npcm7xx_emc.c | 1 -
> hw/nios2/boot.c | 1 -
> hw/nios2/generic_nommu.c | 1 -
> hw/nvram/fw_cfg.c | 1 -
> hw/pci-host/mv64361.c | 1 -
> hw/pci-host/pnv_phb3.c | 1 -
> hw/pci-host/pnv_phb3_msi.c | 1 -
> hw/pci-host/pnv_phb3_pbcq.c | 1 -
> hw/pci-host/pnv_phb4.c | 1 -
> hw/pci-host/pnv_phb4_pec.c | 1 -
> hw/pci-host/raven.c | 1 -
> hw/pci-host/remote.c | 1 -
> hw/pci/pci.c | 1 -
> hw/ppc/e500.c | 1 -
> hw/ppc/mac_newworld.c | 1 -
> hw/ppc/mac_oldworld.c | 1 -
> hw/ppc/pegasos2.c | 1 -
> hw/ppc/pnv.c | 1 -
> hw/ppc/pnv_bmc.c | 1 -
> hw/ppc/ppc405_boards.c | 1 -
> hw/ppc/ppc440_bamboo.c | 1 -
> hw/ppc/sam460ex.c | 1 -
> hw/ppc/spapr.c | 1 -
> hw/ppc/spapr_numa.c | 1 -
> hw/ppc/spapr_pci_nvlink2.c | 1 -
> hw/ppc/spapr_tpm_proxy.c | 1 -
> hw/ppc/spapr_vof.c | 1 -
> hw/ppc/virtex_ml507.c | 1 -
> hw/ppc/vof.c | 1 -
> hw/remote/iohub.c | 1 -
> hw/remote/machine.c | 1 -
> hw/remote/memory.c | 1 -
> hw/remote/message.c | 1 -
> hw/remote/mpqemu-link.c | 1 -
> hw/remote/proxy-memory-listener.c | 1 -
> hw/remote/proxy.c | 1 -
> hw/remote/remote-obj.c | 1 -
> hw/riscv/boot.c | 1 -
> hw/rx/rx-gdbsim.c | 1 -
> hw/s390x/ipl.c | 1 -
> hw/sd/sd.c | 1 -
> hw/sparc/leon3.c | 1 -
> hw/sparc/sun4m.c | 1 -
> hw/sparc64/sun4u.c | 1 -
> hw/usb/dev-mtp.c | 1 -
> hw/virtio/virtio-iommu.c | 1 -
> hw/virtio/virtio-mem.c | 1 -
> hw/virtio/virtio-pmem.c | 1 -
> io/channel-socket.c | 1 -
> linux-user/aarch64/cpu_loop.c | 1 -
> linux-user/alpha/cpu_loop.c | 1 -
> linux-user/arm/cpu_loop.c | 1 -
> linux-user/cris/cpu_loop.c | 1 -
> linux-user/hexagon/cpu_loop.c | 1 -
> linux-user/i386/cpu_loop.c | 1 -
> linux-user/m68k/cpu_loop.c | 1 -
> linux-user/microblaze/cpu_loop.c | 1 -
> linux-user/mips/cpu_loop.c | 1 -
> linux-user/openrisc/cpu_loop.c | 1 -
> linux-user/ppc/cpu_loop.c | 1 -
> linux-user/riscv/cpu_loop.c | 1 -
> linux-user/s390x/cpu_loop.c | 1 -
> linux-user/sh4/cpu_loop.c | 1 -
> linux-user/sparc/cpu_loop.c | 1 -
> linux-user/uname.c | 1 -
> monitor/qmp-cmds.c | 1 -
> net/colo-compare.c | 1 -
> net/net.c | 1 -
> net/socket.c | 1 -
> net/tap-bsd.c | 1 -
> net/tap-linux.c | 1 -
> net/tap-solaris.c | 1 -
> net/tap-win32.c | 1 -
> net/tap.c | 1 -
> net/vde.c | 1 -
> os-posix.c | 1 -
> os-win32.c | 1 -
> page-vary-common.c | 1 -
> qga/commands-posix.c | 1 -
> softmmu/cpu-throttle.c | 1 -
> softmmu/cpu-timers.c | 1 -
> softmmu/cpus.c | 1 -
> softmmu/datadir.c | 1 -
> softmmu/icount.c | 1 -
> softmmu/runstate.c | 1 -
> stubs/monitor-core.c | 1 -
> target/arm/hvf/hvf.c | 1 -
> target/arm/kvm.c | 1 -
> target/arm/kvm64.c | 1 -
> target/hexagon/gdbstub.c | 1 -
> target/i386/hax/hax-all.c | 1 -
> target/i386/hvf/hvf.c | 1 -
> target/i386/hvf/x86.c | 1 -
> target/i386/hvf/x86_cpuid.c | 1 -
> target/i386/hvf/x86_decode.c | 1 -
> target/i386/hvf/x86_descr.c | 1 -
> target/i386/hvf/x86_emu.c | 1 -
> target/i386/hvf/x86_flags.c | 1 -
> target/i386/hvf/x86_mmu.c | 1 -
> target/i386/hvf/x86_task.c | 1 -
> target/i386/hvf/x86hvf.c | 1 -
> target/i386/kvm/sev-stub.c | 1 -
> target/i386/nvmm/nvmm-all.c | 1 -
> target/i386/whpx/whpx-all.c | 1 -
> target/i386/whpx/whpx-apic.c | 1 -
> target/mips/kvm.c | 1 -
> target/nios2/nios2-semi.c | 1 -
> target/ppc/kvm.c | 1 -
> target/riscv/kvm.c | 1 -
> target/rx/cpu.c | 1 -
> target/rx/gdbstub.c | 1 -
> target/s390x/kvm/kvm.c | 1 -
> target/s390x/tcg/vec_fpu_helper.c | 1 -
> target/s390x/tcg/vec_int_helper.c | 1 -
> target/s390x/tcg/vec_string_helper.c | 1 -
> target/tricore/gdbstub.c | 1 -
> target/xtensa/core-de233_fpu.c | 1 -
> target/xtensa/core-dsp3400.c | 1 -
> target/xtensa/core-test_mmuhifi_c3.c | 1 -
> tcg/tci.c | 1 -
> tests/qtest/acpi-utils.c | 1 -
> tests/qtest/ahci-test.c | 1 -
> tests/qtest/aspeed_hace-test.c | 1 -
> tests/qtest/bios-tables-test.c | 1 -
> tests/qtest/boot-sector.c | 1 -
> tests/qtest/cpu-plug-test.c | 1 -
> tests/qtest/dbus-display-test.c | 1 -
> tests/qtest/dbus-vmstate-test.c | 1 -
> tests/qtest/device-introspect-test.c | 1 -
> tests/qtest/e1000e-test.c | 2 --
> tests/qtest/erst-test.c | 1 -
> tests/qtest/fdc-test.c | 1 -
> tests/qtest/fuzz/qos_fuzz.c | 1 -
> tests/qtest/hd-geo-test.c | 1 -
> tests/qtest/ide-test.c | 1 -
> tests/qtest/ipmi-bt-test.c | 1 -
> tests/qtest/ivshmem-test.c | 1 -
> tests/qtest/libqos/ahci.c | 1 -
> tests/qtest/libqos/malloc-pc.c | 2 --
> tests/qtest/libqos/malloc-spapr.c | 2 --
> tests/qtest/libqos/malloc.c | 1 -
> tests/qtest/libqtest.c | 1 -
> tests/qtest/machine-none-test.c | 1 -
> tests/qtest/npcm7xx_emc-test.c | 1 -
> tests/qtest/pxe-test.c | 1 -
> tests/qtest/qom-test.c | 1 -
> tests/qtest/rtl8139-test.c | 1 -
> tests/qtest/test-filter-mirror.c | 1 -
> tests/qtest/test-filter-redirector.c | 1 -
> tests/qtest/test-x86-cpuid-compat.c | 1 -
> tests/qtest/virtio-net-test.c | 1 -
> tests/unit/check-qjson.c | 1 -
> tests/unit/check-qnull.c | 1 -
> tests/unit/check-qnum.c | 1 -
> tests/unit/check-qobject.c | 1 -
> tests/unit/check-qstring.c | 1 -
> tests/unit/socket-helpers.c | 1 -
> tests/unit/test-clone-visitor.c | 1 -
> tests/unit/test-forward-visitor.c | 1 -
> tests/unit/test-iov.c | 1 -
> tests/unit/test-logging.c | 1 -
> tests/unit/test-qmp-event.c | 1 -
> tests/unit/test-qobject-input-visitor.c | 1 -
> tests/unit/test-qobject-output-visitor.c | 1 -
> tests/unit/test-string-input-visitor.c | 1 -
> tests/unit/test-string-output-visitor.c | 1 -
> tests/unit/test-thread-pool.c | 1 -
> tests/unit/test-util-sockets.c | 1 -
> tests/unit/test-visitor-serialization.c | 1 -
> tests/unit/test-xbzrle.c | 1 -
> ui/gtk-clipboard.c | 1 -
> ui/keymaps.c | 1 -
> ui/vdagent.c | 1 -
> ui/vnc-clipboard.c | 1 -
> ui/vnc-enc-tight.c | 2 +-
> ui/vnc.c | 1 -
> util/aio-win32.c | 1 -
> util/coroutine-sigaltstack.c | 1 -
> util/coroutine-win32.c | 1 -
> util/cutils.c | 1 -
> util/event_notifier-posix.c | 1 -
> util/event_notifier-win32.c | 1 -
> util/iov.c | 1 -
> util/osdep.c | 1 -
> util/oslib-posix.c | 1 -
> util/oslib-win32.c | 1 -
> util/qemu-coroutine-io.c | 1 -
> util/qemu-sockets.c | 1 -
> util/qemu-thread-win32.c | 1 -
> target/xtensa/import_core.sh | 1 -
> 243 files changed, 1 insertion(+), 254 deletions(-)
>
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index 0498acd16b78..ba32cc8b1f39 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -1,12 +1,3 @@
> -/*
> - * This file is supposed to be included only by .c files. No header file
> should
> - * depend on qemu-common.h, as this would easily lead to circular header
> - * dependencies.
> - *
> - * If a header file uses a definition from qemu-common.h, that definition
> - * must be moved to a separate header file, and the header that uses it
> - * must include that header.
> - */
> #ifndef QEMU_COMMON_H
> #define QEMU_COMMON_H
>
> diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
> index f185b0830a75..0043f4d308ba 100644
> --- a/accel/hvf/hvf-all.c
> +++ b/accel/hvf/hvf-all.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "sysemu/hvf.h"
> #include "sysemu/hvf_int.h"
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index c997c2e8e015..083ada76b124 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/qemu-print.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-machine.h"
> diff --git a/accel/tcg/tcg-accel-ops-icount.c
> b/accel/tcg/tcg-accel-ops-icount.c
> index bdaf2c943b49..6436cd9349a3 100644
> --- a/accel/tcg/tcg-accel-ops-icount.c
> +++ b/accel/tcg/tcg-accel-ops-icount.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops-mttcg.c
> b/accel/tcg/tcg-accel-ops-mttcg.c
> index ea2b741deb51..d50239e0e28f 100644
> --- a/accel/tcg/tcg-accel-ops-mttcg.c
> +++ b/accel/tcg/tcg-accel-ops-mttcg.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
> index b287110766ef..1a72149f0e46 100644
> --- a/accel/tcg/tcg-accel-ops-rr.c
> +++ b/accel/tcg/tcg-accel-ops-rr.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
> index ea7dcad674cf..684dc5a1371f 100644
> --- a/accel/tcg/tcg-accel-ops.c
> +++ b/accel/tcg/tcg-accel-ops.c
> @@ -26,7 +26,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
> index d6336a9c966d..47952eecd779 100644
> --- a/accel/tcg/tcg-all.c
> +++ b/accel/tcg/tcg-all.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/cpu-timers.h"
> #include "tcg/tcg.h"
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index 5971cd53ab9f..a6e03c1e50b2 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #define NO_CPU_IO_DEFS
> #include "trace.h"
> diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
> index 5ea8157dfcc8..316f118f5099 100644
> --- a/audio/audio_win_int.c
> +++ b/audio/audio_win_int.c
> @@ -1,7 +1,6 @@
> /* public domain */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #define AUDIO_CAP "win-int"
> #include <windows.h>
> diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c
> index b47f98b6a3aa..037292d2672f 100644
> --- a/backends/hostmem-epc.c
> +++ b/backends/hostmem-epc.c
> @@ -12,7 +12,6 @@
> #include <sys/ioctl.h>
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qom/object_interfaces.h"
> #include "qapi/error.h"
> #include "sysemu/hostmem.h"
> diff --git a/backends/tpm/tpm_passthrough.c
> b/backends/tpm/tpm_passthrough.c
> index d5558fae6cc5..5a2f74db1b38 100644
> --- a/backends/tpm/tpm_passthrough.c
> +++ b/backends/tpm/tpm_passthrough.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/module.h"
> #include "qemu/sockets.h"
> diff --git a/block/file-posix.c b/block/file-posix.c
> index 61b02d85ebf1..bfd9b2111143 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/block/io_uring.c b/block/io_uring.c
> index 782afdb433e1..0b401512b973 100644
> --- a/block/io_uring.c
> +++ b/block/io_uring.c
> @@ -10,7 +10,6 @@
> */
> #include "qemu/osdep.h"
> #include <liburing.h>
> -#include "qemu-common.h"
> #include "block/aio.h"
> #include "qemu/queue.h"
> #include "block/block.h"
> diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
> index a17ff9f6ecce..d272478e7b0a 100644
> --- a/bsd-user/freebsd/os-syscall.c
> +++ b/bsd-user/freebsd/os-syscall.c
> @@ -37,7 +37,6 @@
> #include <utime.h>
>
> #include "qemu.h"
> -#include "qemu-common.h"
> #include "signal-common.h"
> #include "user/syscall-trace.h"
>
> diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> index 07aa0a634dff..e54e26de17b0 100644
> --- a/bsd-user/mmap.c
> +++ b/bsd-user/mmap.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
>
> #include "qemu.h"
> -#include "qemu-common.h"
>
> static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
> static __thread int mmap_lock_count;
> diff --git a/chardev/char-fd.c b/chardev/char-fd.c
> index 93c56913b49a..6ec9682b22f2 100644
> --- a/chardev/char-fd.c
> +++ b/chardev/char-fd.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/module.h"
> #include "qemu/sockets.h"
> #include "qapi/error.h"
> diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
> index 7eca5d9a56ae..66d3b8509183 100644
> --- a/chardev/char-pipe.c
> +++ b/chardev/char-pipe.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/main-loop.h"
> #include "qemu/module.h"
> diff --git a/chardev/char-pty.c b/chardev/char-pty.c
> index d73d8b23903d..1e2863f532a8 100644
> --- a/chardev/char-pty.c
> +++ b/chardev/char-pty.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "chardev/char.h"
> #include "io/channel-file.h"
> diff --git a/cpu.c b/cpu.c
> index ab2c7c81e460..0fef70e18e74 100644
> --- a/cpu.c
> +++ b/cpu.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
>
> #include "exec/target_page.h"
> diff --git a/crypto/cipher-afalg.c b/crypto/cipher-afalg.c
> index c55cd28bf01c..3df8fc54c051 100644
> --- a/crypto/cipher-afalg.c
> +++ b/crypto/cipher-afalg.c
> @@ -12,7 +12,6 @@
> */
> #include "qemu/osdep.h"
> #include "qemu/sockets.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "crypto/cipher.h"
> #include "cipherpriv.h"
> diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c
> index 4ac18c7c1db7..3ebea392920d 100644
> --- a/crypto/hash-afalg.c
> +++ b/crypto/hash-afalg.c
> @@ -13,7 +13,6 @@
> #include "qemu/osdep.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "crypto/hash.h"
> #include "crypto/hmac.h"
> diff --git a/dump/dump.c b/dump/dump.c
> index 5d71c47d06aa..e766ce1d7d91 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "elf.h"
> #include "exec/hwaddr.h"
> diff --git a/dump/win_dump.c b/dump/win_dump.c
> index c5eb5a9aacd7..fbdbb7bd93a6 100644
> --- a/dump/win_dump.c
> +++ b/dump/win_dump.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "elf.h"
> #include "exec/hwaddr.h"
> diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
> index d06a0f7b8326..2dde27922fe2 100644
> --- a/fsdev/virtfs-proxy-helper.c
> +++ b/fsdev/virtfs-proxy-helper.c
> @@ -21,7 +21,6 @@
> #include <linux/magic.h>
> #endif
> #include <cap-ng.h>
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "qemu/xattr.h"
> #include "9p-iov-marshal.h"
> diff --git a/gdbstub.c b/gdbstub.c
> index c8375e3c3ffe..2c804d506629 100644
> --- a/gdbstub.c
> +++ b/gdbstub.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "qemu/ctype.h"
> diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
> index 4c5e0fc217eb..99d115ff0db4 100644
> --- a/hw/9pfs/9p-proxy.c
> +++ b/hw/9pfs/9p-proxy.c
> @@ -18,7 +18,6 @@
> #include "qemu/osdep.h"
> #include <sys/socket.h>
> #include <sys/un.h>
> -#include "qemu-common.h"
> #include "9p.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
> index c78ed96d0eca..f4349eba83fb 100644
> --- a/hw/alpha/dp264.c
> +++ b/hw/alpha/dp264.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "elf.h"
> #include "hw/loader.h"
> diff --git a/hw/avr/boot.c b/hw/avr/boot.c
> index cbede775cee2..617f3a144c85 100644
> --- a/hw/avr/boot.c
> +++ b/hw/avr/boot.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/loader.h"
> #include "elf.h"
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 8d9b2df6e725..8167301f0402 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -43,7 +43,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-machine.h"
> diff --git a/hw/display/artist.c b/hw/display/artist.c
> index 69a8f9eea8ba..8e121bb0b4dc 100644
> --- a/hw/display/artist.c
> +++ b/hw/display/artist.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> diff --git a/hw/display/cg3.c b/hw/display/cg3.c
> index 4b7e78d91924..2e9656ae1c39 100644
> --- a/hw/display/cg3.c
> +++ b/hw/display/cg3.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> diff --git a/hw/display/tcx.c b/hw/display/tcx.c
> index d4d09d0df8d5..1b27b64f6d14 100644
> --- a/hw/display/tcx.c
> +++ b/hw/display/tcx.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "ui/console.h"
> diff --git a/hw/display/virtio-gpu-udmabuf.c
> b/hw/display/virtio-gpu-udmabuf.c
> index 1597921c51fc..8bdf4bac6e4b 100644
> --- a/hw/display/virtio-gpu-udmabuf.c
> +++ b/hw/display/virtio-gpu-udmabuf.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "ui/console.h"
> #include "hw/virtio/virtio-gpu.h"
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 31ce01b7c57c..08e5938ec7b7 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/irq.h"
> #include "hw/qdev-properties.h"
> #include "hw/sysbus.h"
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index 98b30e0395ee..f7595c08577c 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -4,7 +4,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "elf.h"
> diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
> index c8b17af95353..0540047bad22 100644
> --- a/hw/i386/pc_sysfw.c
> +++ b/hw/i386/pc_sysfw.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "sysemu/block-backend.h"
> #include "qemu/error-report.h"
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 4cf107baea34..bb6727279097 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -25,7 +25,6 @@
> #include "qemu/option.h"
> #include "qemu/cutils.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qapi/qmp/qerror.h"
> diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c
> index 273e96a7b12d..aeb0624fe57e 100644
> --- a/hw/input/vhost-user-input.c
> +++ b/hw/input/vhost-user-input.c
> @@ -7,7 +7,6 @@
> #include "qemu/osdep.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
>
> #include "hw/virtio/virtio-input.h"
>
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index f5bfc501bc15..9719d98a179e 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -27,7 +27,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "trace.h"
> #include "sysemu/kvm.h"
> #include "hw/ppc/spapr.h"
> diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
> index 93812ee206ea..655207e393dc 100644
> --- a/hw/m68k/mcf5208.c
> +++ b/hw/m68k/mcf5208.c
> @@ -11,7 +11,6 @@
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/irq.h"
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index 66ca5c0df6ef..099a758c6f6a 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -22,7 +22,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "sysemu/sysemu.h"
> #include "cpu.h"
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index 8e630282e02c..7de8b5f83393 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "sysemu/sysemu.h"
> #include "cpu.h"
> #include "hw/boards.h"
> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
> index 03c030aa2cf0..8b92a9801a02 100644
> --- a/hw/microblaze/boot.c
> +++ b/hw/microblaze/boot.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "qemu/option.h"
> diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
> index c9f14e70a077..7b13098f9b1b 100644
> --- a/hw/mips/fuloong2e.c
> +++ b/hw/mips/fuloong2e.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
> index 4d6b44de342e..6598d7dddd59 100644
> --- a/hw/mips/jazz.c
> +++ b/hw/mips/jazz.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/mips/mips.h"
> diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
> index ae192db0c8b9..25534288dd81 100644
> --- a/hw/mips/loongson3_virt.c
> +++ b/hw/mips/loongson3_virt.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qemu/cutils.h"
> #include "qemu/datadir.h"
> diff --git a/hw/mips/malta.c b/hw/mips/malta.c
> index c4474b927c46..9ffdc5b8f187 100644
> --- a/hw/mips/malta.c
> +++ b/hw/mips/malta.c
> @@ -25,7 +25,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qemu/bitops.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/southbridge/piix.h"
> diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
> index 30bc1c4f086f..39f64448f244 100644
> --- a/hw/mips/mipssim.c
> +++ b/hw/mips/mipssim.c
> @@ -27,7 +27,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/mips/mips.h"
> diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c
> index 83020fe9ac9b..8d939fe31b1b 100644
> --- a/hw/misc/sbsa_ec.c
> +++ b/hw/misc/sbsa_ec.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "hw/sysbus.h"
> #include "sysemu/runstate.h"
> diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
> index e7fc082518d2..6d50c395439a 100644
> --- a/hw/net/fsl_etsec/etsec.c
> +++ b/hw/net/fsl_etsec/etsec.c
> @@ -27,7 +27,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/sysbus.h"
> #include "hw/irq.h"
> #include "hw/ptimer.h"
> diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
> index 8f084464155d..a32589e33be4 100644
> --- a/hw/net/fsl_etsec/rings.c
> +++ b/hw/net/fsl_etsec/rings.c
> @@ -22,7 +22,6 @@
> * THE SOFTWARE.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "net/checksum.h"
> #include "qemu/log.h"
> #include "etsec.h"
> diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
> index 9278fdce0b3d..7ccd3e514271 100644
> --- a/hw/net/msf2-emac.c
> +++ b/hw/net/msf2-emac.c
> @@ -29,7 +29,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> #include "hw/registerfields.h"
> diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
> index 9a2328935c1c..7c86bb52e571 100644
> --- a/hw/net/npcm7xx_emc.c
> +++ b/hw/net/npcm7xx_emc.c
> @@ -32,7 +32,6 @@
> /* For crc32 */
> #include <zlib.h>
>
> -#include "qemu-common.h"
> #include "hw/irq.h"
> #include "hw/qdev-clock.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
> index e889595d5c2b..07b8d87633b6 100644
> --- a/hw/nios2/boot.c
> +++ b/hw/nios2/boot.c
> @@ -30,7 +30,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/option.h"
> #include "qemu/config-file.h"
> diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
> index fbc18dbd04c2..48edb3ae373d 100644
> --- a/hw/nios2/generic_nommu.c
> +++ b/hw/nios2/generic_nommu.c
> @@ -28,7 +28,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
>
> #include "hw/char/serial.h"
> #include "hw/boards.h"
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index ea2d56f9f2af..4125cbebcd38 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "sysemu/sysemu.h"
> #include "sysemu/dma.h"
> diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
> index 00b3ff7d9098..cc9c4d6d3b33 100644
> --- a/hw/pci-host/mv64361.c
> +++ b/hw/pci-host/mv64361.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
> index 6e9aa9d6ace2..4e68ad4f03fc 100644
> --- a/hw/pci-host/pnv_phb3.c
> +++ b/hw/pci-host/pnv_phb3.c
> @@ -10,7 +10,6 @@
> #include "qemu/log.h"
> #include "qapi/visitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci-host/pnv_phb3_regs.h"
> #include "hw/pci-host/pnv_phb3.h"
> #include "hw/pci/pcie_host.h"
> diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c
> index 8bcbc2cc4f37..2f4112907b84 100644
> --- a/hw/pci-host/pnv_phb3_msi.c
> +++ b/hw/pci-host/pnv_phb3_msi.c
> @@ -9,7 +9,6 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci-host/pnv_phb3_regs.h"
> #include "hw/pci-host/pnv_phb3.h"
> #include "hw/ppc/pnv.h"
> diff --git a/hw/pci-host/pnv_phb3_pbcq.c b/hw/pci-host/pnv_phb3_pbcq.c
> index c7426cd27a20..82f70efa4311 100644
> --- a/hw/pci-host/pnv_phb3_pbcq.c
> +++ b/hw/pci-host/pnv_phb3_pbcq.c
> @@ -8,7 +8,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "target/ppc/cpu.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
> index 11c97e27eb16..3c4c2dace0a3 100644
> --- a/hw/pci-host/pnv_phb4.c
> +++ b/hw/pci-host/pnv_phb4.c
> @@ -10,7 +10,6 @@
> #include "qemu/log.h"
> #include "qapi/visitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "target/ppc/cpu.h"
> #include "hw/pci-host/pnv_phb4_regs.h"
> diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
> index 6f1121a9489a..61bc0b503e3e 100644
> --- a/hw/pci-host/pnv_phb4_pec.c
> +++ b/hw/pci-host/pnv_phb4_pec.c
> @@ -8,7 +8,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "target/ppc/cpu.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
> index 6e514f75eb8f..7a105e4a63d3 100644
> --- a/hw/pci-host/raven.c
> +++ b/hw/pci-host/raven.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/log.h"
> diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
> index eee45444ef73..bfb25ef6af85 100644
> --- a/hw/pci-host/remote.c
> +++ b/hw/pci-host/remote.c
> @@ -22,7 +22,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_host.h"
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index dae9119bfe5f..e99417e50110 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "hw/irq.h"
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index c7e6767f91a8..2bc3dce1fb7d 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 7b5a205309af..e8ef1a9e5d9b 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -47,7 +47,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "hw/ppc/ppc.h"
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 7016979a7cd0..fe2adb057b0c 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> index d45008ac7131..56bf203dfddf 100644
> --- a/hw/ppc/pegasos2.c
> +++ b/hw/ppc/pegasos2.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 00f57c9678e6..c5e48992d988 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/cutils.h"
> diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
> index 75a22ce50b11..99f1e8d7f9f3 100644
> --- a/hw/ppc/pnv_bmc.c
> +++ b/hw/ppc/pnv_bmc.c
> @@ -17,7 +17,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "target/ppc/cpu.h"
> #include "qemu/log.h"
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index 7e1a4ac9553b..32013b89836a 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -25,7 +25,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/ppc/ppc.h"
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index 7fb620b9a056..efa90ef5ba73 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -14,7 +14,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/error-report.h"
> #include "net/net.h"
> diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
> index 0737234d66e5..2f24598f55db 100644
> --- a/hw/ppc/sam460ex.c
> +++ b/hw/ppc/sam460ex.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index a4372ba1891e..cc11fcc8b24d 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/memalign.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
> index d7c0e212baf8..a64098c375e0 100644
> --- a/hw/ppc/spapr_numa.c
> +++ b/hw/ppc/spapr_numa.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/ppc/spapr_numa.h"
> #include "hw/pci-host/spapr.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c
> index 4678c79235f6..63b476c8f727 100644
> --- a/hw/ppc/spapr_pci_nvlink2.c
> +++ b/hw/ppc/spapr_pci_nvlink2.c
> @@ -23,7 +23,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci/pci.h"
> #include "hw/pci-host/spapr.h"
> #include "hw/ppc/spapr_numa.h"
> diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c
> index 2454086744b1..e10af35a1850 100644
> --- a/hw/ppc/spapr_tpm_proxy.c
> +++ b/hw/ppc/spapr_tpm_proxy.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "sysemu/reset.h"
> diff --git a/hw/ppc/spapr_vof.c b/hw/ppc/spapr_vof.c
> index a33f940c32bb..09f29be0b9de 100644
> --- a/hw/ppc/spapr_vof.c
> +++ b/hw/ppc/spapr_vof.c
> @@ -4,7 +4,6 @@
> * SPDX-License-Identifier: GPL-2.0-or-later
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "hw/ppc/spapr.h"
> #include "hw/ppc/spapr_vio.h"
> diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
> index 9c575403b85c..b67a709ddce2 100644
> --- a/hw/ppc/virtex_ml507.c
> +++ b/hw/ppc/virtex_ml507.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "cpu.h"
> diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c
> index 2b63a6287561..8d96593677da 100644
> --- a/hw/ppc/vof.c
> +++ b/hw/ppc/vof.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/range.h"
> #include "qemu/units.h"
> diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c
> index 547d597f0feb..40dfee4bad43 100644
> --- a/hw/remote/iohub.c
> +++ b/hw/remote/iohub.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_ids.h"
> diff --git a/hw/remote/machine.c b/hw/remote/machine.c
> index 952105eab5a2..92d71d47bb9c 100644
> --- a/hw/remote/machine.c
> +++ b/hw/remote/machine.c
> @@ -14,7 +14,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/machine.h"
> #include "exec/memory.h"
> diff --git a/hw/remote/memory.c b/hw/remote/memory.c
> index 6e21ab1a45c9..6d60da91e01c 100644
> --- a/hw/remote/memory.c
> +++ b/hw/remote/memory.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/memory.h"
> #include "exec/ram_addr.h"
> diff --git a/hw/remote/message.c b/hw/remote/message.c
> index 11d729845c5a..50f6bf2d495f 100644
> --- a/hw/remote/message.c
> +++ b/hw/remote/message.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/machine.h"
> #include "io/channel.h"
> diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
> index 7e841820e521..2a4aa651ca26 100644
> --- a/hw/remote/mpqemu-link.c
> +++ b/hw/remote/mpqemu-link.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/module.h"
> #include "hw/remote/mpqemu-link.h"
> diff --git a/hw/remote/proxy-memory-listener.c
> b/hw/remote/proxy-memory-listener.c
> index 0e893f3189e9..eb9918fe72bb 100644
> --- a/hw/remote/proxy-memory-listener.c
> +++ b/hw/remote/proxy-memory-listener.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/compiler.h"
> #include "qemu/int128.h"
> diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
> index bad164299dd4..1c7786b52cf1 100644
> --- a/hw/remote/proxy.c
> +++ b/hw/remote/proxy.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/proxy.h"
> #include "hw/pci/pci.h"
> diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
> index 4f21254219f8..333e5ac44331 100644
> --- a/hw/remote/remote-obj.c
> +++ b/hw/remote/remote-obj.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/error-report.h"
> #include "qemu/notify.h"
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index cae74fcbcd9a..0f179d36014a 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
> index 75d1fec6ca46..64f897e5b10a 100644
> --- a/hw/rx/rx-gdbsim.c
> +++ b/hw/rx/rx-gdbsim.c
> @@ -20,7 +20,6 @@
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/loader.h"
> #include "hw/rx/rx62n.h"
> #include "sysemu/qtest.h"
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index eb7fc4c4ae87..84971e537b3e 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -13,7 +13,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "sysemu/reset.h"
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index cd67a7bac8e2..8e6fa0915137 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -47,7 +47,6 @@
> #include "qemu/timer.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> -#include "qemu-common.h"
> #include "sdmmc-internal.h"
> #include "trace.h"
>
> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
> index a9f24968275d..1e39d2e2d0ac 100644
> --- a/hw/sparc/leon3.c
> +++ b/hw/sparc/leon3.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/irq.h"
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 7f3a7c002780..fccaed1eb444 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "qemu/datadir.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "hw/sysbus.h"
> #include "qemu/error-report.h"
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index cda7df36e312..6fd08e2298a6 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/pci/pci.h"
> diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
> index e6b77a2a941d..5831395cef75 100644
> --- a/hw/usb/dev-mtp.c
> +++ b/hw/usb/dev-mtp.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include <wchar.h>
> diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
> index 664cbd958323..6de58a76a7ff 100644
> --- a/hw/virtio/virtio-iommu.c
> +++ b/hw/virtio/virtio-iommu.c
> @@ -20,7 +20,6 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "qemu/iov.h"
> -#include "qemu-common.h"
> #include "hw/qdev-properties.h"
> #include "hw/virtio/virtio.h"
> #include "sysemu/kvm.h"
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index 35cbf1f21946..5aca40872695 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
> index 5419dca75e2c..5dd21c2c4408 100644
> --- a/hw/virtio/virtio-pmem.c
> +++ b/hw/virtio/virtio-pmem.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> #include "hw/virtio/virtio-pmem.h"
> diff --git a/io/channel-socket.c b/io/channel-socket.c
> index 7a8d9f69c92d..9f5ddf68b687 100644
> --- a/io/channel-socket.c
> +++ b/io/channel-socket.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/qapi-visit-sockets.h"
> #include "qemu/module.h"
> diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
> index 31a66a4fa07c..3b273f62997a 100644
> --- a/linux-user/aarch64/cpu_loop.c
> +++ b/linux-user/aarch64/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c
> index de6e0c901cdf..2ea039aa71f7 100644
> --- a/linux-user/alpha/cpu_loop.c
> +++ b/linux-user/alpha/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
> index 9dcb2e024eb0..683b8e47c2bd 100644
> --- a/linux-user/arm/cpu_loop.c
> +++ b/linux-user/arm/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "elf.h"
> diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c
> index 0f46b3c1a87a..01e6ff16fc92 100644
> --- a/linux-user/cris/cpu_loop.c
> +++ b/linux-user/cris/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c
> index 0d73934d31d5..b84e25bf71eb 100644
> --- a/linux-user/hexagon/cpu_loop.c
> +++ b/linux-user/hexagon/cpu_loop.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
> index 90bffc1956aa..492701dd9af9 100644
> --- a/linux-user/i386/cpu_loop.c
> +++ b/linux-user/i386/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "qemu/timer.h"
> #include "user-internals.h"
> diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
> index 928a18e3cf05..d1bf8548b747 100644
> --- a/linux-user/m68k/cpu_loop.c
> +++ b/linux-user/m68k/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/microblaze/cpu_loop.c
> b/linux-user/microblaze/cpu_loop.c
> index 1a2556be2c5f..5ccf9e942eaa 100644
> --- a/linux-user/microblaze/cpu_loop.c
> +++ b/linux-user/microblaze/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
> index 9bb12a07ba08..d5c1c7941d34 100644
> --- a/linux-user/mips/cpu_loop.c
> +++ b/linux-user/mips/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/openrisc/cpu_loop.c
> b/linux-user/openrisc/cpu_loop.c
> index 7683bea0649e..a7aa586c8f96 100644
> --- a/linux-user/openrisc/cpu_loop.c
> +++ b/linux-user/openrisc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/ppc/cpu_loop.c b/linux-user/ppc/cpu_loop.c
> index b468f199e4d2..02204ad8bebb 100644
> --- a/linux-user/ppc/cpu_loop.c
> +++ b/linux-user/ppc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "qemu/timer.h"
> #include "user-internals.h"
> diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
> index 26d446f32379..29084c142196 100644
> --- a/linux-user/riscv/cpu_loop.c
> +++ b/linux-user/riscv/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu.h"
> #include "user-internals.h"
> diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c
> index 7901dfe6f518..285bc60071a8 100644
> --- a/linux-user/s390x/cpu_loop.c
> +++ b/linux-user/s390x/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c
> index 1bd313cb19a2..c805f9db1104 100644
> --- a/linux-user/sh4/cpu_loop.c
> +++ b/linux-user/sh4/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
> index baf3d9ae011f..434c90a55f8f 100644
> --- a/linux-user/sparc/cpu_loop.c
> +++ b/linux-user/sparc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/uname.c b/linux-user/uname.c
> index 0856783b2190..415fdf31b62d 100644
> --- a/linux-user/uname.c
> +++ b/linux-user/uname.c
> @@ -21,7 +21,6 @@
>
> #include "qemu.h"
> #include "user-internals.h"
> -//#include "qemu-common.h"
> #include "uname.h"
>
> /* return highest utsname machine name for emulated instruction set
> diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
> index 883cf1ca4bbf..5e7302cbb995 100644
> --- a/monitor/qmp-cmds.c
> +++ b/monitor/qmp-cmds.c
> @@ -14,7 +14,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/option.h"
> #include "monitor/monitor.h"
> diff --git a/net/colo-compare.c b/net/colo-compare.c
> index 62554b5b3c8f..d5d096580577 100644
> --- a/net/colo-compare.c
> +++ b/net/colo-compare.c
> @@ -13,7 +13,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "trace.h"
> #include "qapi/error.h"
> diff --git a/net/net.c b/net/net.c
> index 9f17ab204422..a094cf1d2929 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "net/net.h"
> #include "clients.h"
> diff --git a/net/socket.c b/net/socket.c
> index c4b80e9228d7..ea5220a2eb51 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -27,7 +27,6 @@
> #include "clients.h"
> #include "monitor/monitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/option.h"
> #include "qemu/sockets.h"
> diff --git a/net/tap-bsd.c b/net/tap-bsd.c
> index e45a6d124eb6..7e65bd391f0b 100644
> --- a/net/tap-bsd.c
> +++ b/net/tap-bsd.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "tap_int.h"
> #include "qemu/cutils.h"
> diff --git a/net/tap-linux.c b/net/tap-linux.c
> index 5e70b9303710..3e24d232e782 100644
> --- a/net/tap-linux.c
> +++ b/net/tap-linux.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "tap_int.h"
> #include "tap-linux.h"
> #include "net/tap.h"
> diff --git a/net/tap-solaris.c b/net/tap-solaris.c
> index d85224242b30..79919785c9f6 100644
> --- a/net/tap-solaris.c
> +++ b/net/tap-solaris.c
> @@ -27,7 +27,6 @@
> #include "tap_int.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> -#include "qemu-common.h"
>
> #include <sys/ethernet.h>
> #include <sys/sockio.h>
> diff --git a/net/tap-win32.c b/net/tap-win32.c
> index 6096972f5d47..7466f22e77a4 100644
> --- a/net/tap-win32.c
> +++ b/net/tap-win32.c
> @@ -29,7 +29,6 @@
> #include "qemu/osdep.h"
> #include "tap_int.h"
>
> -#include "qemu-common.h"
> #include "clients.h" /* net_init_tap */
> #include "net/eth.h"
> #include "net/net.h"
> diff --git a/net/tap.c b/net/tap.c
> index c5cbeaa7a2be..6190fa699d2f 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -38,7 +38,6 @@
> #include "monitor/monitor.h"
> #include "sysemu/sysemu.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/net/vde.c b/net/vde.c
> index 99189cccb694..1083916bcf52 100644
> --- a/net/vde.c
> +++ b/net/vde.c
> @@ -27,7 +27,6 @@
>
> #include "net/net.h"
> #include "clients.h"
> -#include "qemu-common.h"
> #include "qemu/option.h"
> #include "qemu/main-loop.h"
> #include "qapi/error.h"
> diff --git a/os-posix.c b/os-posix.c
> index 24692c8593f3..ee765f047dea 100644
> --- a/os-posix.c
> +++ b/os-posix.c
> @@ -29,7 +29,6 @@
> #include <grp.h>
> #include <libgen.h>
>
> -#include "qemu-common.h"
> /* Needed early for CONFIG_BSD etc. */
> #include "net/slirp.h"
> #include "qemu/qemu-options.h"
> diff --git a/os-win32.c b/os-win32.c
> index 6f21b578417c..725ad652e8bb 100644
> --- a/os-win32.c
> +++ b/os-win32.c
> @@ -26,7 +26,6 @@
> #include "qemu/osdep.h"
> #include <windows.h>
> #include <mmsystem.h>
> -#include "qemu-common.h"
> #include "sysemu/runstate.h"
>
> static BOOL WINAPI qemu_ctrl_handler(DWORD type)
> diff --git a/page-vary-common.c b/page-vary-common.c
> index 91755564985c..ab77672dd412 100644
> --- a/page-vary-common.c
> +++ b/page-vary-common.c
> @@ -20,7 +20,6 @@
> #define IN_PAGE_VARY 1
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/page-vary.h"
>
> /* WARNING: This file must *not* be complied with -flto. */
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index 4d7a2392c097..9924277c826e 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -16,7 +16,6 @@
> #include <sys/utsname.h>
> #include <sys/wait.h>
> #include <dirent.h>
> -#include "qemu-common.h"
> #include "guest-agent-core.h"
> #include "qga-qapi-commands.h"
> #include "qapi/error.h"
> diff --git a/softmmu/cpu-throttle.c b/softmmu/cpu-throttle.c
> index 8c2144ab95cc..d9bb30a223d8 100644
> --- a/softmmu/cpu-throttle.c
> +++ b/softmmu/cpu-throttle.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/thread.h"
> #include "hw/core/cpu.h"
> #include "qemu/main-loop.h"
> diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c
> index 204d946a1729..117408cb83af 100644
> --- a/softmmu/cpu-timers.c
> +++ b/softmmu/cpu-timers.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> diff --git a/softmmu/cpus.c b/softmmu/cpus.c
> index 7b75bb66d5e6..668bef9b4d62 100644
> --- a/softmmu/cpus.c
> +++ b/softmmu/cpus.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "qemu/coroutine-tls.h"
> #include "qapi/error.h"
> diff --git a/softmmu/datadir.c b/softmmu/datadir.c
> index 504c4665bed7..160cac999a6f 100644
> --- a/softmmu/datadir.c
> +++ b/softmmu/datadir.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/cutils.h"
> #include "trace.h"
> diff --git a/softmmu/icount.c b/softmmu/icount.c
> index 21341a4ce49e..5ca271620db6 100644
> --- a/softmmu/icount.c
> +++ b/softmmu/icount.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> diff --git a/softmmu/runstate.c b/softmmu/runstate.c
> index e0d869b21aa4..fac7b63259e8 100644
> --- a/softmmu/runstate.c
> +++ b/softmmu/runstate.c
> @@ -40,7 +40,6 @@
> #include "qapi/error.h"
> #include "qapi/qapi-commands-run-state.h"
> #include "qapi/qapi-events-run-state.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qemu/job.h"
> diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
> index d058a2a00d85..afa477aae656 100644
> --- a/stubs/monitor-core.c
> +++ b/stubs/monitor-core.c
> @@ -1,6 +1,5 @@
> #include "qemu/osdep.h"
> #include "monitor/monitor.h"
> -#include "qemu-common.h"
> #include "qapi/qapi-emit-events.h"
>
> Monitor *monitor_cur(void)
> diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
> index 8c34f86792ed..567e296b21c9 100644
> --- a/target/arm/hvf/hvf.c
> +++ b/target/arm/hvf/hvf.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
>
> #include "sysemu/runstate.h"
> diff --git a/target/arm/kvm.c b/target/arm/kvm.c
> index bbf1ce7ba3bc..5fc37ac10a5b 100644
> --- a/target/arm/kvm.c
> +++ b/target/arm/kvm.c
> @@ -13,7 +13,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
> index 9ec8875150d6..17dd2f77d9f5 100644
> --- a/target/arm/kvm64.c
> +++ b/target/arm/kvm64.c
> @@ -16,7 +16,6 @@
> #include <linux/elf.h>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "cpu.h"
> #include "qemu/timer.h"
> diff --git a/target/hexagon/gdbstub.c b/target/hexagon/gdbstub.c
> index 9c8c04c961b1..d152d01bfe7e 100644
> --- a/target/hexagon/gdbstub.c
> +++ b/target/hexagon/gdbstub.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/gdbstub.h"
> #include "cpu.h"
> #include "internal.h"
> diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c
> index 81f665e21245..b185ee8de4fd 100644
> --- a/target/i386/hax/hax-all.c
> +++ b/target/i386/hax/hax-all.c
> @@ -27,7 +27,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
>
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/reset.h"
> #include "sysemu/runstate.h"
> diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
> index fc12c02fb217..f8833277ab6a 100644
> --- a/target/i386/hvf/hvf.c
> +++ b/target/i386/hvf/hvf.c
> @@ -47,7 +47,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/memalign.h"
>
> diff --git a/target/i386/hvf/x86.c b/target/i386/hvf/x86.c
> index 91a3fe002c73..d086584f26d9 100644
> --- a/target/i386/hvf/x86.c
> +++ b/target/i386/hvf/x86.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
>
> #include "cpu.h"
> -#include "qemu-common.h"
> #include "x86_decode.h"
> #include "x86_emu.h"
> #include "vmcs.h"
> diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
> index 32b0d131df86..f24dd50e48ff 100644
> --- a/target/i386/hvf/x86_cpuid.c
> +++ b/target/i386/hvf/x86_cpuid.c
> @@ -21,7 +21,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "x86.h"
> #include "vmx.h"
> diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c
> index 062713b1a450..3728d7705e21 100644
> --- a/target/i386/hvf/x86_decode.c
> +++ b/target/i386/hvf/x86_decode.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "panic.h"
> #include "x86_decode.h"
> #include "vmx.h"
> diff --git a/target/i386/hvf/x86_descr.c b/target/i386/hvf/x86_descr.c
> index af15c06ac5db..a484942cfcd4 100644
> --- a/target/i386/hvf/x86_descr.c
> +++ b/target/i386/hvf/x86_descr.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "vmx.h"
> #include "x86_descr.h"
>
> diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
> index 050428795bbc..f5704f63e8da 100644
> --- a/target/i386/hvf/x86_emu.c
> +++ b/target/i386/hvf/x86_emu.c
> @@ -37,7 +37,6 @@
>
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "x86_decode.h"
> #include "x86.h"
> #include "x86_emu.h"
> diff --git a/target/i386/hvf/x86_flags.c b/target/i386/hvf/x86_flags.c
> index fecbca751770..03d6de5efc3e 100644
> --- a/target/i386/hvf/x86_flags.c
> +++ b/target/i386/hvf/x86_flags.c
> @@ -23,7 +23,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "panic.h"
> #include "cpu.h"
> #include "x86_flags.h"
> diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c
> index df0b91cd4208..96d117567ee8 100644
> --- a/target/i386/hvf/x86_mmu.c
> +++ b/target/i386/hvf/x86_mmu.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "x86.h"
> #include "x86_mmu.h"
> diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
> index d24daf6a4110..beaeec068731 100644
> --- a/target/i386/hvf/x86_task.c
> +++ b/target/i386/hvf/x86_task.c
> @@ -8,7 +8,6 @@
> // GNU General Public License for more details.
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
>
> #include "sysemu/hvf.h"
> diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c
> index bec9fc581463..69d4fb8cf555 100644
> --- a/target/i386/hvf/x86hvf.c
> +++ b/target/i386/hvf/x86hvf.c
> @@ -19,7 +19,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "x86hvf.h"
> #include "vmx.h"
> #include "vmcs.h"
> diff --git a/target/i386/kvm/sev-stub.c b/target/i386/kvm/sev-stub.c
> index 6080c007a2e4..1be5341e8a6a 100644
> --- a/target/i386/kvm/sev-stub.c
> +++ b/target/i386/kvm/sev-stub.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sev.h"
>
> int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
> diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
> index 9f940413318c..b75738ee9cdf 100644
> --- a/target/i386/nvmm/nvmm-all.c
> +++ b/target/i386/nvmm/nvmm-all.c
> @@ -11,7 +11,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
> #include "exec/ioport.h"
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/nvmm.h"
> #include "sysemu/cpus.h"
> diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
> index 68a4ebe909ad..5560a22ea5c2 100644
> --- a/target/i386/whpx/whpx-all.c
> +++ b/target/i386/whpx/whpx-all.c
> @@ -12,7 +12,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
> #include "exec/ioport.h"
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/whpx.h"
> #include "sysemu/cpus.h"
> diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c
> index bba36f3ec98f..c15df35ad60a 100644
> --- a/target/i386/whpx/whpx-apic.c
> +++ b/target/i386/whpx/whpx-apic.c
> @@ -11,7 +11,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "hw/i386/apic_internal.h"
> #include "hw/i386/apic-msidef.h"
> diff --git a/target/mips/kvm.c b/target/mips/kvm.c
> index 086debd9f013..caf70decd2a5 100644
> --- a/target/mips/kvm.c
> +++ b/target/mips/kvm.c
> @@ -14,7 +14,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "internal.h"
> #include "qemu/error-report.h"
> diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
> index 5a7ad0c7108d..eda21c04434b 100644
> --- a/target/nios2/nios2-semi.c
> +++ b/target/nios2/nios2-semi.c
> @@ -28,7 +28,6 @@
> #if defined(CONFIG_USER_ONLY)
> #include "qemu.h"
> #else
> -#include "qemu-common.h"
> #include "exec/softmmu-semi.h"
> #endif
> #include "qemu/log.h"
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 8644b85de847..f905a2af17a7 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -21,7 +21,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "cpu.h"
> diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
> index e6b7cb6d4d5f..70b4cff06fbb 100644
> --- a/target/riscv/kvm.c
> +++ b/target/riscv/kvm.c
> @@ -21,7 +21,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/target/rx/cpu.c b/target/rx/cpu.c
> index 25a4aa2976d3..fb30080ac4ea 100644
> --- a/target/rx/cpu.c
> +++ b/target/rx/cpu.c
> @@ -20,7 +20,6 @@
> #include "qemu/qemu-print.h"
> #include "qapi/error.h"
> #include "cpu.h"
> -#include "qemu-common.h"
> #include "migration/vmstate.h"
> #include "exec/exec-all.h"
> #include "hw/loader.h"
> diff --git a/target/rx/gdbstub.c b/target/rx/gdbstub.c
> index c811d4810b45..7eb2059a841b 100644
> --- a/target/rx/gdbstub.c
> +++ b/target/rx/gdbstub.c
> @@ -16,7 +16,6 @@
> * this program. If not, see <http://www.gnu.org/licenses/>.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
>
> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
> index 6acf14d5ecb4..53098bf54104 100644
> --- a/target/s390x/kvm/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -24,7 +24,6 @@
> #include <linux/kvm.h>
> #include <asm/ptrace.h>
>
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "kvm_s390x.h"
> diff --git a/target/s390x/tcg/vec_fpu_helper.c
> b/target/s390x/tcg/vec_fpu_helper.c
> index 1a779934715f..aa2cc8e4a6b5 100644
> --- a/target/s390x/tcg/vec_fpu_helper.c
> +++ b/target/s390x/tcg/vec_fpu_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "vec.h"
> diff --git a/target/s390x/tcg/vec_int_helper.c
> b/target/s390x/tcg/vec_int_helper.c
> index 5561b3ed9096..b44859ee1630 100644
> --- a/target/s390x/tcg/vec_int_helper.c
> +++ b/target/s390x/tcg/vec_int_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "vec.h"
> #include "exec/helper-proto.h"
> diff --git a/target/s390x/tcg/vec_string_helper.c
> b/target/s390x/tcg/vec_string_helper.c
> index ac315eb095c1..f8b54bba4a9d 100644
> --- a/target/s390x/tcg/vec_string_helper.c
> +++ b/target/s390x/tcg/vec_string_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "vec.h"
> diff --git a/target/tricore/gdbstub.c b/target/tricore/gdbstub.c
> index 3ce55abb8e3b..ebf32defde3a 100644
> --- a/target/tricore/gdbstub.c
> +++ b/target/tricore/gdbstub.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/gdbstub.h"
>
>
> diff --git a/target/xtensa/core-de233_fpu.c
> b/target/xtensa/core-de233_fpu.c
> index c7cbeb1b4834..41af8057fbb9 100644
> --- a/target/xtensa/core-de233_fpu.c
> +++ b/target/xtensa/core-de233_fpu.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-de233_fpu/core-isa.h"
> diff --git a/target/xtensa/core-dsp3400.c b/target/xtensa/core-dsp3400.c
> index 4e0bc8a8c46c..81e425c56828 100644
> --- a/target/xtensa/core-dsp3400.c
> +++ b/target/xtensa/core-dsp3400.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-dsp3400/core-isa.h"
> diff --git a/target/xtensa/core-test_mmuhifi_c3.c
> b/target/xtensa/core-test_mmuhifi_c3.c
> index 123c630b0da7..c0e5d32d1e47 100644
> --- a/target/xtensa/core-test_mmuhifi_c3.c
> +++ b/target/xtensa/core-test_mmuhifi_c3.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-test_mmuhifi_c3/core-isa.h"
> diff --git a/tcg/tci.c b/tcg/tci.c
> index fe92b5d0844b..bdfac83492dd 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */
> #include "exec/cpu_ldst.h"
> #include "tcg/tcg-op.h"
> diff --git a/tests/qtest/acpi-utils.c b/tests/qtest/acpi-utils.c
> index 766c48e3a6a4..673fc975862c 100644
> --- a/tests/qtest/acpi-utils.c
> +++ b/tests/qtest/acpi-utils.c
> @@ -14,7 +14,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "qemu/bitmap.h"
> #include "acpi-utils.h"
> #include "boot-sector.h"
> diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
> index 8073ccc20521..aff5f3f79776 100644
> --- a/tests/qtest/ahci-test.c
> +++ b/tests/qtest/ahci-test.c
> @@ -30,7 +30,6 @@
> #include "libqos/ahci.h"
> #include "libqos/pci-pc.h"
>
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/host-utils.h"
>
> diff --git a/tests/qtest/aspeed_hace-test.c
> b/tests/qtest/aspeed_hace-test.c
> index 09ee31545e41..58aa22014d04 100644
> --- a/tests/qtest/aspeed_hace-test.c
> +++ b/tests/qtest/aspeed_hace-test.c
> @@ -8,7 +8,6 @@
> #include "qemu/osdep.h"
>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "qemu/bitops.h"
>
> #define HACE_CMD 0x10
> diff --git a/tests/qtest/bios-tables-test.c
> b/tests/qtest/bios-tables-test.c
> index c4a2d1e1664b..5dddedabcdde 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -57,7 +57,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "hw/firmware/smbios.h"
> #include "qemu/bitmap.h"
> #include "acpi-utils.h"
> diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
> index ea8f264661c3..9d9825bc8145 100644
> --- a/tests/qtest/boot-sector.c
> +++ b/tests/qtest/boot-sector.c
> @@ -12,7 +12,6 @@
> */
> #include "qemu/osdep.h"
> #include "boot-sector.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
>
> #define LOW(x) ((x) & 0xff)
> diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c
> index a1c689414be5..7f5dd5f85a78 100644
> --- a/tests/qtest/cpu-plug-test.c
> +++ b/tests/qtest/cpu-plug-test.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> diff --git a/tests/qtest/dbus-display-test.c
> b/tests/qtest/dbus-display-test.c
> index 43c77aff045c..81043162dfdd 100644
> --- a/tests/qtest/dbus-display-test.c
> +++ b/tests/qtest/dbus-display-test.c
> @@ -3,7 +3,6 @@
> #include <gio/gio.h>
> #include <gio/gunixfdlist.h>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "dbus-display1.h"
>
> static GDBusConnection*
> diff --git a/tests/qtest/dbus-vmstate-test.c
> b/tests/qtest/dbus-vmstate-test.c
> index aca9b98b7a35..a8acab763f5d 100644
> --- a/tests/qtest/dbus-vmstate-test.c
> +++ b/tests/qtest/dbus-vmstate-test.c
> @@ -2,7 +2,6 @@
> #include <glib/gstdio.h>
> #include <gio/gio.h>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "dbus-vmstate1.h"
> #include "migration-helpers.h"
>
> diff --git a/tests/qtest/device-introspect-test.c
> b/tests/qtest/device-introspect-test.c
> index bbec166dbc2f..adf39b2518e8 100644
> --- a/tests/qtest/device-introspect-test.c
> +++ b/tests/qtest/device-introspect-test.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/qmp/qstring.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c
> index e648fdd409cd..ddd6983ede14 100644
> --- a/tests/qtest/e1000e-test.c
> +++ b/tests/qtest/e1000e-test.c
> @@ -25,9 +25,7 @@
>
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> -#include "qemu-common.h"
> #include "libqos/pci-pc.h"
> #include "qemu/sockets.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c
> index f94cd8dd8e05..a0adc35bef7f 100644
> --- a/tests/qtest/erst-test.c
> +++ b/tests/qtest/erst-test.c
> @@ -11,7 +11,6 @@
> #include <glib/gstdio.h>
> #include "libqos/libqos-pc.h"
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
>
> diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c
> index b0d40012e6a9..4aa72f36431f 100644
> --- a/tests/qtest/fdc-test.c
> +++ b/tests/qtest/fdc-test.c
> @@ -27,7 +27,6 @@
>
> #include "libqtest-single.h"
> #include "qapi/qmp/qdict.h"
> -#include "qemu-common.h"
>
> /* TODO actually test the results and get rid of this */
> #define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
> diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
> index 7a244c951e5e..dc891d838b6a 100644
> --- a/tests/qtest/fuzz/qos_fuzz.c
> +++ b/tests/qtest/fuzz/qos_fuzz.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "exec/memory.h"
> #include "qemu/main-loop.h"
>
> diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
> index 64023c057408..da9c4c2792de 100644
> --- a/tests/qtest/hd-geo-test.c
> +++ b/tests/qtest/hd-geo-test.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/bswap.h"
> #include "qapi/qmp/qlist.h"
> #include "libqos/libqtest.h"
> diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
> index 19de3b410405..b7243a17b11d 100644
> --- a/tests/qtest/ide-test.c
> +++ b/tests/qtest/ide-test.c
> @@ -30,7 +30,6 @@
> #include "libqos/pci-pc.h"
> #include "libqos/malloc-pc.h"
> #include "qapi/qmp/qdict.h"
> -#include "qemu-common.h"
> #include "qemu/bswap.h"
> #include "hw/pci/pci_ids.h"
> #include "hw/pci/pci_regs.h"
> diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c
> index 19612e9405ae..ed431e34e68d 100644
> --- a/tests/qtest/ipmi-bt-test.c
> +++ b/tests/qtest/ipmi-bt-test.c
> @@ -31,7 +31,6 @@
>
>
> #include "libqtest-single.h"
> -#include "qemu-common.h"
>
> #define IPMI_IRQ 5
>
> diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
> index 4e8af42a9d04..95628a418579 100644
> --- a/tests/qtest/ivshmem-test.c
> +++ b/tests/qtest/ivshmem-test.c
> @@ -14,7 +14,6 @@
> #include "libqos/libqos-pc.h"
> #include "libqos/libqos-spapr.h"
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
>
> #define TMPSHMSIZE (1 << 20)
> static char *tmpshm;
> diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
> index eaa2096512e5..41c4be5efa93 100644
> --- a/tests/qtest/libqos/ahci.c
> +++ b/tests/qtest/libqos/ahci.c
> @@ -28,7 +28,6 @@
> #include "ahci.h"
> #include "pci-pc.h"
>
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "hw/pci/pci_ids.h"
> diff --git a/tests/qtest/libqos/malloc-pc.c
> b/tests/qtest/libqos/malloc-pc.c
> index f1e3b392a53c..bbd1b4827e54 100644
> --- a/tests/qtest/libqos/malloc-pc.c
> +++ b/tests/qtest/libqos/malloc-pc.c
> @@ -16,8 +16,6 @@
>
> #include "standard-headers/linux/qemu_fw_cfg.h"
>
> -#include "qemu-common.h"
> -
> #define ALLOC_PAGE_SIZE (4096)
>
> void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags)
> diff --git a/tests/qtest/libqos/malloc-spapr.c
> b/tests/qtest/libqos/malloc-spapr.c
> index 05b306c191d3..d90ed3c51d7d 100644
> --- a/tests/qtest/libqos/malloc-spapr.c
> +++ b/tests/qtest/libqos/malloc-spapr.c
> @@ -8,8 +8,6 @@
> #include "qemu/osdep.h"
> #include "malloc-spapr.h"
>
> -#include "qemu-common.h"
> -
> #define SPAPR_PAGE_SIZE 4096
>
> /* Memory must be a multiple of 256 MB,
> diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c
> index f708b0143262..f0c8f950c805 100644
> --- a/tests/qtest/libqos/malloc.c
> +++ b/tests/qtest/libqos/malloc.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
> #include "malloc.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> typedef struct MemBlock {
> diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
> index dc5566ccfd60..7b5890dcc487 100644
> --- a/tests/qtest/libqtest.c
> +++ b/tests/qtest/libqtest.c
> @@ -21,7 +21,6 @@
> #include <sys/un.h>
>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> #include "qapi/error.h"
> diff --git a/tests/qtest/machine-none-test.c
> b/tests/qtest/machine-none-test.c
> index 138101b46ac2..8ca18074b9f9 100644
> --- a/tests/qtest/machine-none-test.c
> +++ b/tests/qtest/machine-none-test.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> diff --git a/tests/qtest/npcm7xx_emc-test.c
> b/tests/qtest/npcm7xx_emc-test.c
> index 7c435ac91576..a353fef0ca13 100644
> --- a/tests/qtest/npcm7xx_emc-test.c
> +++ b/tests/qtest/npcm7xx_emc-test.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqos.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qnum.h"
> diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
> index 32bbae33c597..3cb47d2c5496 100644
> --- a/tests/qtest/pxe-test.c
> +++ b/tests/qtest/pxe-test.c
> @@ -14,7 +14,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "boot-sector.h"
> #include "libqos/libqos-spapr.h"
> diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
> index eb34af843b79..6b162e12b5aa 100644
> --- a/tests/qtest/qom-test.c
> +++ b/tests/qtest/qom-test.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> #include "qemu/cutils.h"
> diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
> index 450604926492..8fa3313cc333 100644
> --- a/tests/qtest/rtl8139-test.c
> +++ b/tests/qtest/rtl8139-test.c
> @@ -11,7 +11,6 @@
> #include "libqtest-single.h"
> #include "libqos/pci-pc.h"
> #include "qemu/timer.h"
> -#include "qemu-common.h"
>
> /* Tests only initialization so far. TODO: Replace with functional tests
> */
> static void nop(void)
> diff --git a/tests/qtest/test-filter-mirror.c
> b/tests/qtest/test-filter-mirror.c
> index da4f94de727a..fdf66cebd62f 100644
> --- a/tests/qtest/test-filter-mirror.c
> +++ b/tests/qtest/test-filter-mirror.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/test-filter-redirector.c
> b/tests/qtest/test-filter-redirector.c
> index fc16cf7e8d5f..339d3c04cedc 100644
> --- a/tests/qtest/test-filter-redirector.c
> +++ b/tests/qtest/test-filter-redirector.c
> @@ -51,7 +51,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/test-x86-cpuid-compat.c
> b/tests/qtest/test-x86-cpuid-compat.c
> index 39138db7744b..b39c9055b309 100644
> --- a/tests/qtest/test-x86-cpuid-compat.c
> +++ b/tests/qtest/test-x86-cpuid-compat.c
> @@ -1,5 +1,4 @@
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> #include "qapi/qmp/qnum.h"
> diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
> index a71395849f33..fc9f2b94982d 100644
> --- a/tests/qtest/virtio-net-test.c
> +++ b/tests/qtest/virtio-net-test.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> #include "qemu/iov.h"
> #include "qemu/module.h"
> diff --git a/tests/unit/check-qjson.c b/tests/unit/check-qjson.c
> index c845f91d4377..c4e0f851bfc6 100644
> --- a/tests/unit/check-qjson.c
> +++ b/tests/unit/check-qjson.c
> @@ -21,7 +21,6 @@
> #include "qapi/qmp/qnum.h"
> #include "qapi/qmp/qstring.h"
> #include "qemu/unicode.h"
> -#include "qemu-common.h"
>
> static QString *from_json_str(const char *jstr, bool single, Error **errp)
> {
> diff --git a/tests/unit/check-qnull.c b/tests/unit/check-qnull.c
> index ebf21db83ccc..5ceacc65d7f3 100644
> --- a/tests/unit/check-qnull.c
> +++ b/tests/unit/check-qnull.c
> @@ -9,7 +9,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qnull.h"
> -#include "qemu-common.h"
> #include "qapi/qobject-input-visitor.h"
> #include "qapi/qobject-output-visitor.h"
> #include "qapi/error.h"
> diff --git a/tests/unit/check-qnum.c b/tests/unit/check-qnum.c
> index b85fca23029e..bf7fe45bacc4 100644
> --- a/tests/unit/check-qnum.c
> +++ b/tests/unit/check-qnum.c
> @@ -15,7 +15,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qnum.h"
> -#include "qemu-common.h"
>
> /*
> * Public Interface test-cases
> diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c
> index 7903ebf4cf80..0ed094e55f3a 100644
> --- a/tests/unit/check-qobject.c
> +++ b/tests/unit/check-qobject.c
> @@ -15,7 +15,6 @@
> #include "qapi/qmp/qnull.h"
> #include "qapi/qmp/qnum.h"
> #include "qapi/qmp/qstring.h"
> -#include "qemu-common.h"
>
> #include <math.h>
>
> diff --git a/tests/unit/check-qstring.c b/tests/unit/check-qstring.c
> index 4bf977209342..bd861f4f8b47 100644
> --- a/tests/unit/check-qstring.c
> +++ b/tests/unit/check-qstring.c
> @@ -12,7 +12,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qstring.h"
> -#include "qemu-common.h"
>
> /*
> * Public Interface test-cases
> diff --git a/tests/unit/socket-helpers.c b/tests/unit/socket-helpers.c
> index ef31664d0224..0a9e090a68dd 100644
> --- a/tests/unit/socket-helpers.c
> +++ b/tests/unit/socket-helpers.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osde
[-- Attachment #2: Type: text/html, Size: 108730 bytes --]
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 32/32] Remove qemu-common.h include from most units
2022-04-05 15:02 ` Ani Sinha
@ 2022-04-06 10:45 ` Markus Armbruster
-1 siblings, 0 replies; 79+ messages in thread
From: Markus Armbruster @ 2022-04-06 10:45 UTC (permalink / raw)
To: Ani Sinha
Cc: John G Johnson, Alexey Kardashevskiy, Li Zhijian,
KONRAD Frederic, open list:raw, Stefan Berger, Alex Bennée,
Huacai Chen, Halil Pasic, Kamil Rytarowski,
Hervé Poussineau, Christian Borntraeger, Michael Roth,
Alexander Bulekov, Stefan Hajnoczi, John Snow, Aarushi Mehta,
Kevin Wolf, Andrew Jeffery, Chris Wulff,
Philippe Mathieu-Daudé,
Subbaraya Sundeep, Zhang Chen, open list:sPAPR (pseries),
Igor Mammedov, Gerd Hoffmann, Fam Zheng, Peter Maydell,
David Hildenbrand, Yanan Wang, Max Filippov, Alistair Francis,
Yoshinori Sato, Helge Deller, Qiuhao Li, Artyom Tarasenko,
Stefano Garzarella, Eric Farman, Corey Minyard, Stefan Weil,
Julia Suvorova, Greg Kurz, Cameron Esfahani, Bandan Das,
Alexander Graf, Michael Rolnik, Cédric Le Goater,
open list:RISC-V TCG CPUs, Cornelia Huck,
open list:S390-ccw boot, Tyrone Ting, Hanna Reitz,
open list:ARM PrimeCell and...,
Wenchao Wang, Aurelien Jarno, Elena Ufimtseva, Jason Wang,
Bin Meng, Taylor Simpson, Colin Xu, Edgar E. Iglesias,
Daniel Henrique Barboza, Joel Stanley, Aleksandar Rikalo,
Mark Cave-Ayland, Fabien Chouteau, Roman Bolshakov,
Sunil Muthuswamy, Eduardo Habkost, Bastian Koppelmann,
Laurent Vivier, open list:Overall KVM CPUs, Michael S. Tsirkin,
Christian Schoenebeck, qemu-devel, open list:X86 HAXM CPUs,
Warner Losh, Marek Vasut, Jagannathan Raman, Havard Skinnemoen,
Reinoud Zandijk, Kyle Evans, marcandre.lureau, Richard Henderson,
David Gibson, Daniel P. Berrangé,
Darren Kenny, Eric Auger, Thomas Huth, Marcelo Tosatti,
Palmer Dabbelt, Paolo Bonzini
First of all: thank you so much for completing the "empty out
qemu-common.h" job!
This is what's left:
#ifndef QEMU_COMMON_H
#define QEMU_COMMON_H
/* Copyright string for -version arguments, About dialogs, etc */
#define QEMU_COPYRIGHT "Copyright (c) 2003-2022 " \
"Fabrice Bellard and the QEMU Project developers"
/* Bug reporting information for --help arguments, About dialogs, etc */
#define QEMU_HELP_BOTTOM \
"See <https://qemu.org/contribute/report-a-bug> for how to report bugs.\n" \
"More information on the QEMU project at <https://qemu.org>."
#endif
Rename the header? Or replace the macros by variables, and move their
declarations elsewhere? Not demands; this series is lovely progress as
is.
Ani Sinha <ani@anisinha.ca> writes:
> On Wed, Mar 23, 2022 at 9:32 PM <marcandre.lureau@redhat.com> wrote:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
>
> Empty patch descriptions are not a good idea. Please explain why this
> removal does not break things and maybe why the header got included
> initiatively.
Something like
The previous commits moved most of qemu-common.h's contents
elsewhere. Most inclusions are now useless. Remove them.
would do for me.
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 32/32] Remove qemu-common.h include from most units
@ 2022-04-06 10:45 ` Markus Armbruster
0 siblings, 0 replies; 79+ messages in thread
From: Markus Armbruster @ 2022-04-06 10:45 UTC (permalink / raw)
To: Ani Sinha
Cc: marcandre.lureau, Aarushi Mehta, Aleksandar Rikalo,
Alex Bennée, Alexander Bulekov, Alexander Graf,
Alexey Kardashevskiy, Alistair Francis, Andrew Jeffery,
Artyom Tarasenko, Aurelien Jarno, BALATON Zoltan, Bandan Das,
Bastian Koppelmann, Bin Meng, Cameron Esfahani, Chris Wulff,
Christian Borntraeger, Christian Schoenebeck, Colin Xu,
Corey Minyard, Cornelia Huck, Cédric Le Goater,
Daniel Henrique Barboza, Daniel P. Berrangé,
Darren Kenny, David Gibson, David Hildenbrand, Edgar E. Iglesias,
Eduardo Habkost, Elena Ufimtseva, Eric Auger, Eric Farman,
Fabien Chouteau, Fam Zheng, Gerd Hoffmann, Greg Kurz,
Halil Pasic, Hanna Reitz, Havard Skinnemoen, Helge Deller,
Hervé Poussineau, Huacai Chen, Igor Mammedov,
Jagannathan Raman, Jason Wang, Jiaxun Yang, Joel Stanley,
John G Johnson, John Snow, Julia Suvorova, KONRAD Frederic,
Kamil Rytarowski, Kevin Wolf, Kyle Evans, Laurent Vivier,
Li Zhijian, Marcel Apfelbaum, Marcelo Tosatti, Marek Vasut,
Mark Cave-Ayland, Max Filippov, Michael Rolnik, Michael Roth,
Michael S. Tsirkin, Palmer Dabbelt, Paolo Bonzini, Peter Maydell,
Philippe Mathieu-Daudé,
Qiuhao Li, Reinoud Zandijk, Richard Henderson, Roman Bolshakov,
Stefan Berger, Stefan Hajnoczi, Stefan Weil, Stefano Garzarella,
Subbaraya Sundeep, Sunil Muthuswamy, Taylor Simpson, Thomas Huth,
Tyrone Ting, Warner Losh, Wenchao Wang, Yanan Wang,
Yoshinori Sato, Zhang Chen, open list:ARM PrimeCell and...,
open list:Overall KVM CPUs, open list:RISC-V TCG CPUs,
open list:S390-ccw boot, open list:X86 HAXM CPUs, open list:raw,
open list:sPAPR (pseries),
qemu-devel
First of all: thank you so much for completing the "empty out
qemu-common.h" job!
This is what's left:
#ifndef QEMU_COMMON_H
#define QEMU_COMMON_H
/* Copyright string for -version arguments, About dialogs, etc */
#define QEMU_COPYRIGHT "Copyright (c) 2003-2022 " \
"Fabrice Bellard and the QEMU Project developers"
/* Bug reporting information for --help arguments, About dialogs, etc */
#define QEMU_HELP_BOTTOM \
"See <https://qemu.org/contribute/report-a-bug> for how to report bugs.\n" \
"More information on the QEMU project at <https://qemu.org>."
#endif
Rename the header? Or replace the macros by variables, and move their
declarations elsewhere? Not demands; this series is lovely progress as
is.
Ani Sinha <ani@anisinha.ca> writes:
> On Wed, Mar 23, 2022 at 9:32 PM <marcandre.lureau@redhat.com> wrote:
>
>> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
>
> Empty patch descriptions are not a good idea. Please explain why this
> removal does not break things and maybe why the header got included
> initiatively.
Something like
The previous commits moved most of qemu-common.h's contents
elsewhere. Most inclusions are now useless. Remove them.
would do for me.
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 32/32] Remove qemu-common.h include from most units
2022-04-06 10:45 ` Markus Armbruster
@ 2022-04-06 11:14 ` Peter Maydell
-1 siblings, 0 replies; 79+ messages in thread
From: Peter Maydell @ 2022-04-06 11:14 UTC (permalink / raw)
To: Markus Armbruster
Cc: John G Johnson, Alexey Kardashevskiy, Li Zhijian,
KONRAD Frederic, open list:raw, Stefan Berger, Alex Bennée,
Huacai Chen, Halil Pasic, Kamil Rytarowski,
Hervé Poussineau, Christian Borntraeger, Michael Roth,
Alexander Bulekov, Stefan Hajnoczi, John Snow, Aarushi Mehta,
Kevin Wolf, Andrew Jeffery, Chris Wulff,
Philippe Mathieu-Daudé,
Subbaraya Sundeep, Zhang Chen, open list:sPAPR (pseries),
Igor Mammedov, Gerd Hoffmann, Fam Zheng, David Hildenbrand,
Yanan Wang, Max Filippov, Alistair Francis, Yoshinori Sato,
Helge Deller, Qiuhao Li, Artyom Tarasenko, Stefano Garzarella,
Eric Farman, Corey Minyard, Stefan Weil, Julia Suvorova,
Greg Kurz, Cameron Esfahani, Bandan Das, Alexander Graf,
Michael Rolnik, Cédric Le Goater, open list:RISC-V TCG CPUs,
Cornelia Huck, open list:S390-ccw boot, Tyrone Ting, Hanna Reitz,
open list:ARM PrimeCell and...,
Wenchao Wang, Aurelien Jarno, Elena Ufimtseva, Jason Wang,
Bin Meng, Taylor Simpson, Colin Xu, Edgar E. Iglesias,
Daniel Henrique Barboza, Joel Stanley, Aleksandar Rikalo,
Mark Cave-Ayland, Fabien Chouteau, Roman Bolshakov,
Sunil Muthuswamy, Eduardo Habkost, Bastian Koppelmann,
Laurent Vivier, open list:Overall KVM CPUs, Michael S. Tsirkin,
Christian Schoenebeck, qemu-devel, open list:X86 HAXM CPUs,
Ani Sinha, Warner Losh, Marek Vasut, Jagannathan Raman,
Havard Skinnemoen, Reinoud Zandijk, Kyle Evans, marcandre.lureau,
Richard Henderson, David Gibson, Daniel P. Berrangé,
Darren Kenny, Eric Auger, Thomas Huth, Marcelo Tosatti,
Palmer Dabbelt, Paolo Bonzini
On Wed, 6 Apr 2022 at 11:45, Markus Armbruster <armbru@redhat.com> wrote:
>
> First of all: thank you so much for completing the "empty out
> qemu-common.h" job!
>
> This is what's left:
>
> #ifndef QEMU_COMMON_H
> #define QEMU_COMMON_H
>
> /* Copyright string for -version arguments, About dialogs, etc */
> #define QEMU_COPYRIGHT "Copyright (c) 2003-2022 " \
> "Fabrice Bellard and the QEMU Project developers"
>
> /* Bug reporting information for --help arguments, About dialogs, etc */
> #define QEMU_HELP_BOTTOM \
> "See <https://qemu.org/contribute/report-a-bug> for how to report bugs.\n" \
> "More information on the QEMU project at <https://qemu.org>."
>
> #endif
> Rename the header? Or replace the macros by variables, and move their
> declarations elsewhere? Not demands; this series is lovely progress as
> is.
We should put those in a qemu/copyright.h, I think.
Leaving a "qemu-common.h" around is an open invitation to people
throwing more random stuff into it again in future.
As you say, we can totally do this as a later followup.
thanks
-- PMM
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PATCH 32/32] Remove qemu-common.h include from most units
@ 2022-04-06 11:14 ` Peter Maydell
0 siblings, 0 replies; 79+ messages in thread
From: Peter Maydell @ 2022-04-06 11:14 UTC (permalink / raw)
To: Markus Armbruster
Cc: Ani Sinha, marcandre.lureau, Aarushi Mehta, Aleksandar Rikalo,
Alex Bennée, Alexander Bulekov, Alexander Graf,
Alexey Kardashevskiy, Alistair Francis, Andrew Jeffery,
Artyom Tarasenko, Aurelien Jarno, BALATON Zoltan, Bandan Das,
Bastian Koppelmann, Bin Meng, Cameron Esfahani, Chris Wulff,
Christian Borntraeger, Christian Schoenebeck, Colin Xu,
Corey Minyard, Cornelia Huck, Cédric Le Goater,
Daniel Henrique Barboza, Daniel P. Berrangé,
Darren Kenny, David Gibson, David Hildenbrand, Edgar E. Iglesias,
Eduardo Habkost, Elena Ufimtseva, Eric Auger, Eric Farman,
Fabien Chouteau, Fam Zheng, Gerd Hoffmann, Greg Kurz,
Halil Pasic, Hanna Reitz, Havard Skinnemoen, Helge Deller,
Hervé Poussineau, Huacai Chen, Igor Mammedov,
Jagannathan Raman, Jason Wang, Jiaxun Yang, Joel Stanley,
John G Johnson, John Snow, Julia Suvorova, KONRAD Frederic,
Kamil Rytarowski, Kevin Wolf, Kyle Evans, Laurent Vivier,
Li Zhijian, Marcel Apfelbaum, Marcelo Tosatti, Marek Vasut,
Mark Cave-Ayland, Max Filippov, Michael Rolnik, Michael Roth,
Michael S. Tsirkin, Palmer Dabbelt, Paolo Bonzini,
Philippe Mathieu-Daudé,
Qiuhao Li, Reinoud Zandijk, Richard Henderson, Roman Bolshakov,
Stefan Berger, Stefan Hajnoczi, Stefan Weil, Stefano Garzarella,
Subbaraya Sundeep, Sunil Muthuswamy, Taylor Simpson, Thomas Huth,
Tyrone Ting, Warner Losh, Wenchao Wang, Yanan Wang,
Yoshinori Sato, Zhang Chen, open list:ARM PrimeCell and...,
open list:Overall KVM CPUs, open list:RISC-V TCG CPUs,
open list:S390-ccw boot, open list:X86 HAXM CPUs, open list:raw,
open list:sPAPR (pseries),
qemu-devel
On Wed, 6 Apr 2022 at 11:45, Markus Armbruster <armbru@redhat.com> wrote:
>
> First of all: thank you so much for completing the "empty out
> qemu-common.h" job!
>
> This is what's left:
>
> #ifndef QEMU_COMMON_H
> #define QEMU_COMMON_H
>
> /* Copyright string for -version arguments, About dialogs, etc */
> #define QEMU_COPYRIGHT "Copyright (c) 2003-2022 " \
> "Fabrice Bellard and the QEMU Project developers"
>
> /* Bug reporting information for --help arguments, About dialogs, etc */
> #define QEMU_HELP_BOTTOM \
> "See <https://qemu.org/contribute/report-a-bug> for how to report bugs.\n" \
> "More information on the QEMU project at <https://qemu.org>."
>
> #endif
> Rename the header? Or replace the macros by variables, and move their
> declarations elsewhere? Not demands; this series is lovely progress as
> is.
We should put those in a qemu/copyright.h, I think.
Leaving a "qemu-common.h" around is an open invitation to people
throwing more random stuff into it again in future.
As you say, we can totally do this as a later followup.
thanks
-- PMM
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PATCH 32/32] Remove qemu-common.h include from most units
2022-03-23 15:57 ` marcandre.lureau
@ 2022-04-05 15:24 ` Warner Losh
-1 siblings, 0 replies; 79+ messages in thread
From: Warner Losh @ 2022-04-05 15:24 UTC (permalink / raw)
To: Marc-André Lureau
Cc: John G Johnson, Alexey Kardashevskiy, Li Zhijian,
Markus Armbruster, KONRAD Frederic, open list:raw, Stefan Berger,
Alex Bennée, Huacai Chen, Halil Pasic, Kamil Rytarowski,
Hervé Poussineau, Christian Borntraeger, Michael Roth,
Eric Auger, Stefan Hajnoczi, John Snow, Aarushi Mehta,
Kevin Wolf, Andrew Jeffery, Chris Wulff, Laurent Vivier,
Subbaraya Sundeep, Zhang Chen, open list:sPAPR (pseries),
Igor Mammedov, Colin Xu, Fam Zheng, Peter Maydell,
David Hildenbrand, Yanan Wang, Max Filippov, Alistair Francis,
Yoshinori Sato, Helge Deller, Qiuhao Li, Artyom Tarasenko,
Stefano Garzarella, Eric Farman, Corey Minyard, Stefan Weil,
Julia Suvorova, Greg Kurz, Cameron Esfahani, Bandan Das,
Alexander Graf, Michael Rolnik, Cédric Le Goater,
open list:RISC-V TCG CPUs, Cornelia Huck,
open list:S390-ccw boot, Tyrone Ting, Hanna Reitz,
open list:ARM PrimeCell and...,
Wenchao Wang, Aurelien Jarno, Elena Ufimtseva, Jason Wang,
Bin Meng, Taylor Simpson, Gerd Hoffmann, Edgar E. Iglesias,
Daniel Henrique Barboza, Joel Stanley, Aleksandar Rikalo,
Mark Cave-Ayland, Fabien Chouteau, Roman Bolshakov,
Sunil Muthuswamy, Eduardo Habkost, Bastian Koppelmann,
open list:Overall KVM CPUs, Michael S. Tsirkin,
Christian Schoenebeck, QEMU Developers, open list:X86 HAXM CPUs,
Ani Sinha, Marek Vasut, Jagannathan Raman, Havard Skinnemoen,
Reinoud Zandijk, Kyle Evans, Alexander Bulekov,
Richard Henderson, David Gibson, Daniel P. Berrangé,
Darren Kenny, Thomas Huth, Marcelo Tosatti, Palmer Dabbelt,
Paolo Bonzini, Philippe Mathieu-Daudé
[-- Attachment #1: Type: text/plain, Size: 100141 bytes --]
On Wed, Mar 23, 2022 at 10:02 AM <marcandre.lureau@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>
Reviewed by: Warner Losh <imp@bsdimp.com>
(at least for the bsd-user changes)
It might be a good idea to have a sentence or two about why this change is
happening, since the 'title' covers the 'what is happening' well..
Warner
> include/qemu-common.h | 9 ---------
> accel/hvf/hvf-all.c | 1 -
> accel/tcg/cpu-exec.c | 1 -
> accel/tcg/tcg-accel-ops-icount.c | 1 -
> accel/tcg/tcg-accel-ops-mttcg.c | 1 -
> accel/tcg/tcg-accel-ops-rr.c | 1 -
> accel/tcg/tcg-accel-ops.c | 1 -
> accel/tcg/tcg-all.c | 1 -
> accel/tcg/translate-all.c | 1 -
> audio/audio_win_int.c | 1 -
> backends/hostmem-epc.c | 1 -
> backends/tpm/tpm_passthrough.c | 1 -
> block/file-posix.c | 1 -
> block/io_uring.c | 1 -
> bsd-user/freebsd/os-syscall.c | 1 -
> bsd-user/mmap.c | 1 -
> chardev/char-fd.c | 1 -
> chardev/char-pipe.c | 1 -
> chardev/char-pty.c | 1 -
> cpu.c | 1 -
> crypto/cipher-afalg.c | 1 -
> crypto/hash-afalg.c | 1 -
> dump/dump.c | 1 -
> dump/win_dump.c | 1 -
> fsdev/virtfs-proxy-helper.c | 1 -
> gdbstub.c | 1 -
> hw/9pfs/9p-proxy.c | 1 -
> hw/alpha/dp264.c | 1 -
> hw/avr/boot.c | 1 -
> hw/core/loader.c | 1 -
> hw/display/artist.c | 1 -
> hw/display/cg3.c | 1 -
> hw/display/tcx.c | 1 -
> hw/display/virtio-gpu-udmabuf.c | 1 -
> hw/dma/pl330.c | 1 -
> hw/hppa/machine.c | 1 -
> hw/i386/pc_sysfw.c | 1 -
> hw/i386/x86.c | 1 -
> hw/input/vhost-user-input.c | 1 -
> hw/intc/xics_kvm.c | 1 -
> hw/m68k/mcf5208.c | 1 -
> hw/m68k/q800.c | 1 -
> hw/m68k/virt.c | 1 -
> hw/microblaze/boot.c | 1 -
> hw/mips/fuloong2e.c | 1 -
> hw/mips/jazz.c | 1 -
> hw/mips/loongson3_virt.c | 1 -
> hw/mips/malta.c | 1 -
> hw/mips/mipssim.c | 1 -
> hw/misc/sbsa_ec.c | 1 -
> hw/net/fsl_etsec/etsec.c | 1 -
> hw/net/fsl_etsec/rings.c | 1 -
> hw/net/msf2-emac.c | 1 -
> hw/net/npcm7xx_emc.c | 1 -
> hw/nios2/boot.c | 1 -
> hw/nios2/generic_nommu.c | 1 -
> hw/nvram/fw_cfg.c | 1 -
> hw/pci-host/mv64361.c | 1 -
> hw/pci-host/pnv_phb3.c | 1 -
> hw/pci-host/pnv_phb3_msi.c | 1 -
> hw/pci-host/pnv_phb3_pbcq.c | 1 -
> hw/pci-host/pnv_phb4.c | 1 -
> hw/pci-host/pnv_phb4_pec.c | 1 -
> hw/pci-host/raven.c | 1 -
> hw/pci-host/remote.c | 1 -
> hw/pci/pci.c | 1 -
> hw/ppc/e500.c | 1 -
> hw/ppc/mac_newworld.c | 1 -
> hw/ppc/mac_oldworld.c | 1 -
> hw/ppc/pegasos2.c | 1 -
> hw/ppc/pnv.c | 1 -
> hw/ppc/pnv_bmc.c | 1 -
> hw/ppc/ppc405_boards.c | 1 -
> hw/ppc/ppc440_bamboo.c | 1 -
> hw/ppc/sam460ex.c | 1 -
> hw/ppc/spapr.c | 1 -
> hw/ppc/spapr_numa.c | 1 -
> hw/ppc/spapr_pci_nvlink2.c | 1 -
> hw/ppc/spapr_tpm_proxy.c | 1 -
> hw/ppc/spapr_vof.c | 1 -
> hw/ppc/virtex_ml507.c | 1 -
> hw/ppc/vof.c | 1 -
> hw/remote/iohub.c | 1 -
> hw/remote/machine.c | 1 -
> hw/remote/memory.c | 1 -
> hw/remote/message.c | 1 -
> hw/remote/mpqemu-link.c | 1 -
> hw/remote/proxy-memory-listener.c | 1 -
> hw/remote/proxy.c | 1 -
> hw/remote/remote-obj.c | 1 -
> hw/riscv/boot.c | 1 -
> hw/rx/rx-gdbsim.c | 1 -
> hw/s390x/ipl.c | 1 -
> hw/sd/sd.c | 1 -
> hw/sparc/leon3.c | 1 -
> hw/sparc/sun4m.c | 1 -
> hw/sparc64/sun4u.c | 1 -
> hw/usb/dev-mtp.c | 1 -
> hw/virtio/virtio-iommu.c | 1 -
> hw/virtio/virtio-mem.c | 1 -
> hw/virtio/virtio-pmem.c | 1 -
> io/channel-socket.c | 1 -
> linux-user/aarch64/cpu_loop.c | 1 -
> linux-user/alpha/cpu_loop.c | 1 -
> linux-user/arm/cpu_loop.c | 1 -
> linux-user/cris/cpu_loop.c | 1 -
> linux-user/hexagon/cpu_loop.c | 1 -
> linux-user/i386/cpu_loop.c | 1 -
> linux-user/m68k/cpu_loop.c | 1 -
> linux-user/microblaze/cpu_loop.c | 1 -
> linux-user/mips/cpu_loop.c | 1 -
> linux-user/openrisc/cpu_loop.c | 1 -
> linux-user/ppc/cpu_loop.c | 1 -
> linux-user/riscv/cpu_loop.c | 1 -
> linux-user/s390x/cpu_loop.c | 1 -
> linux-user/sh4/cpu_loop.c | 1 -
> linux-user/sparc/cpu_loop.c | 1 -
> linux-user/uname.c | 1 -
> monitor/qmp-cmds.c | 1 -
> net/colo-compare.c | 1 -
> net/net.c | 1 -
> net/socket.c | 1 -
> net/tap-bsd.c | 1 -
> net/tap-linux.c | 1 -
> net/tap-solaris.c | 1 -
> net/tap-win32.c | 1 -
> net/tap.c | 1 -
> net/vde.c | 1 -
> os-posix.c | 1 -
> os-win32.c | 1 -
> page-vary-common.c | 1 -
> qga/commands-posix.c | 1 -
> softmmu/cpu-throttle.c | 1 -
> softmmu/cpu-timers.c | 1 -
> softmmu/cpus.c | 1 -
> softmmu/datadir.c | 1 -
> softmmu/icount.c | 1 -
> softmmu/runstate.c | 1 -
> stubs/monitor-core.c | 1 -
> target/arm/hvf/hvf.c | 1 -
> target/arm/kvm.c | 1 -
> target/arm/kvm64.c | 1 -
> target/hexagon/gdbstub.c | 1 -
> target/i386/hax/hax-all.c | 1 -
> target/i386/hvf/hvf.c | 1 -
> target/i386/hvf/x86.c | 1 -
> target/i386/hvf/x86_cpuid.c | 1 -
> target/i386/hvf/x86_decode.c | 1 -
> target/i386/hvf/x86_descr.c | 1 -
> target/i386/hvf/x86_emu.c | 1 -
> target/i386/hvf/x86_flags.c | 1 -
> target/i386/hvf/x86_mmu.c | 1 -
> target/i386/hvf/x86_task.c | 1 -
> target/i386/hvf/x86hvf.c | 1 -
> target/i386/kvm/sev-stub.c | 1 -
> target/i386/nvmm/nvmm-all.c | 1 -
> target/i386/whpx/whpx-all.c | 1 -
> target/i386/whpx/whpx-apic.c | 1 -
> target/mips/kvm.c | 1 -
> target/nios2/nios2-semi.c | 1 -
> target/ppc/kvm.c | 1 -
> target/riscv/kvm.c | 1 -
> target/rx/cpu.c | 1 -
> target/rx/gdbstub.c | 1 -
> target/s390x/kvm/kvm.c | 1 -
> target/s390x/tcg/vec_fpu_helper.c | 1 -
> target/s390x/tcg/vec_int_helper.c | 1 -
> target/s390x/tcg/vec_string_helper.c | 1 -
> target/tricore/gdbstub.c | 1 -
> target/xtensa/core-de233_fpu.c | 1 -
> target/xtensa/core-dsp3400.c | 1 -
> target/xtensa/core-test_mmuhifi_c3.c | 1 -
> tcg/tci.c | 1 -
> tests/qtest/acpi-utils.c | 1 -
> tests/qtest/ahci-test.c | 1 -
> tests/qtest/aspeed_hace-test.c | 1 -
> tests/qtest/bios-tables-test.c | 1 -
> tests/qtest/boot-sector.c | 1 -
> tests/qtest/cpu-plug-test.c | 1 -
> tests/qtest/dbus-display-test.c | 1 -
> tests/qtest/dbus-vmstate-test.c | 1 -
> tests/qtest/device-introspect-test.c | 1 -
> tests/qtest/e1000e-test.c | 2 --
> tests/qtest/erst-test.c | 1 -
> tests/qtest/fdc-test.c | 1 -
> tests/qtest/fuzz/qos_fuzz.c | 1 -
> tests/qtest/hd-geo-test.c | 1 -
> tests/qtest/ide-test.c | 1 -
> tests/qtest/ipmi-bt-test.c | 1 -
> tests/qtest/ivshmem-test.c | 1 -
> tests/qtest/libqos/ahci.c | 1 -
> tests/qtest/libqos/malloc-pc.c | 2 --
> tests/qtest/libqos/malloc-spapr.c | 2 --
> tests/qtest/libqos/malloc.c | 1 -
> tests/qtest/libqtest.c | 1 -
> tests/qtest/machine-none-test.c | 1 -
> tests/qtest/npcm7xx_emc-test.c | 1 -
> tests/qtest/pxe-test.c | 1 -
> tests/qtest/qom-test.c | 1 -
> tests/qtest/rtl8139-test.c | 1 -
> tests/qtest/test-filter-mirror.c | 1 -
> tests/qtest/test-filter-redirector.c | 1 -
> tests/qtest/test-x86-cpuid-compat.c | 1 -
> tests/qtest/virtio-net-test.c | 1 -
> tests/unit/check-qjson.c | 1 -
> tests/unit/check-qnull.c | 1 -
> tests/unit/check-qnum.c | 1 -
> tests/unit/check-qobject.c | 1 -
> tests/unit/check-qstring.c | 1 -
> tests/unit/socket-helpers.c | 1 -
> tests/unit/test-clone-visitor.c | 1 -
> tests/unit/test-forward-visitor.c | 1 -
> tests/unit/test-iov.c | 1 -
> tests/unit/test-logging.c | 1 -
> tests/unit/test-qmp-event.c | 1 -
> tests/unit/test-qobject-input-visitor.c | 1 -
> tests/unit/test-qobject-output-visitor.c | 1 -
> tests/unit/test-string-input-visitor.c | 1 -
> tests/unit/test-string-output-visitor.c | 1 -
> tests/unit/test-thread-pool.c | 1 -
> tests/unit/test-util-sockets.c | 1 -
> tests/unit/test-visitor-serialization.c | 1 -
> tests/unit/test-xbzrle.c | 1 -
> ui/gtk-clipboard.c | 1 -
> ui/keymaps.c | 1 -
> ui/vdagent.c | 1 -
> ui/vnc-clipboard.c | 1 -
> ui/vnc-enc-tight.c | 2 +-
> ui/vnc.c | 1 -
> util/aio-win32.c | 1 -
> util/coroutine-sigaltstack.c | 1 -
> util/coroutine-win32.c | 1 -
> util/cutils.c | 1 -
> util/event_notifier-posix.c | 1 -
> util/event_notifier-win32.c | 1 -
> util/iov.c | 1 -
> util/osdep.c | 1 -
> util/oslib-posix.c | 1 -
> util/oslib-win32.c | 1 -
> util/qemu-coroutine-io.c | 1 -
> util/qemu-sockets.c | 1 -
> util/qemu-thread-win32.c | 1 -
> target/xtensa/import_core.sh | 1 -
> 243 files changed, 1 insertion(+), 254 deletions(-)
>
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index 0498acd16b78..ba32cc8b1f39 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -1,12 +1,3 @@
> -/*
> - * This file is supposed to be included only by .c files. No header file
> should
> - * depend on qemu-common.h, as this would easily lead to circular header
> - * dependencies.
> - *
> - * If a header file uses a definition from qemu-common.h, that definition
> - * must be moved to a separate header file, and the header that uses it
> - * must include that header.
> - */
> #ifndef QEMU_COMMON_H
> #define QEMU_COMMON_H
>
> diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
> index f185b0830a75..0043f4d308ba 100644
> --- a/accel/hvf/hvf-all.c
> +++ b/accel/hvf/hvf-all.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "sysemu/hvf.h"
> #include "sysemu/hvf_int.h"
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index c997c2e8e015..083ada76b124 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/qemu-print.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-machine.h"
> diff --git a/accel/tcg/tcg-accel-ops-icount.c
> b/accel/tcg/tcg-accel-ops-icount.c
> index bdaf2c943b49..6436cd9349a3 100644
> --- a/accel/tcg/tcg-accel-ops-icount.c
> +++ b/accel/tcg/tcg-accel-ops-icount.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops-mttcg.c
> b/accel/tcg/tcg-accel-ops-mttcg.c
> index ea2b741deb51..d50239e0e28f 100644
> --- a/accel/tcg/tcg-accel-ops-mttcg.c
> +++ b/accel/tcg/tcg-accel-ops-mttcg.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
> index b287110766ef..1a72149f0e46 100644
> --- a/accel/tcg/tcg-accel-ops-rr.c
> +++ b/accel/tcg/tcg-accel-ops-rr.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
> index ea7dcad674cf..684dc5a1371f 100644
> --- a/accel/tcg/tcg-accel-ops.c
> +++ b/accel/tcg/tcg-accel-ops.c
> @@ -26,7 +26,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
> index d6336a9c966d..47952eecd779 100644
> --- a/accel/tcg/tcg-all.c
> +++ b/accel/tcg/tcg-all.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/cpu-timers.h"
> #include "tcg/tcg.h"
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index 5971cd53ab9f..a6e03c1e50b2 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #define NO_CPU_IO_DEFS
> #include "trace.h"
> diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
> index 5ea8157dfcc8..316f118f5099 100644
> --- a/audio/audio_win_int.c
> +++ b/audio/audio_win_int.c
> @@ -1,7 +1,6 @@
> /* public domain */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #define AUDIO_CAP "win-int"
> #include <windows.h>
> diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c
> index b47f98b6a3aa..037292d2672f 100644
> --- a/backends/hostmem-epc.c
> +++ b/backends/hostmem-epc.c
> @@ -12,7 +12,6 @@
> #include <sys/ioctl.h>
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qom/object_interfaces.h"
> #include "qapi/error.h"
> #include "sysemu/hostmem.h"
> diff --git a/backends/tpm/tpm_passthrough.c
> b/backends/tpm/tpm_passthrough.c
> index d5558fae6cc5..5a2f74db1b38 100644
> --- a/backends/tpm/tpm_passthrough.c
> +++ b/backends/tpm/tpm_passthrough.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/module.h"
> #include "qemu/sockets.h"
> diff --git a/block/file-posix.c b/block/file-posix.c
> index 61b02d85ebf1..bfd9b2111143 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/block/io_uring.c b/block/io_uring.c
> index 782afdb433e1..0b401512b973 100644
> --- a/block/io_uring.c
> +++ b/block/io_uring.c
> @@ -10,7 +10,6 @@
> */
> #include "qemu/osdep.h"
> #include <liburing.h>
> -#include "qemu-common.h"
> #include "block/aio.h"
> #include "qemu/queue.h"
> #include "block/block.h"
> diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
> index a17ff9f6ecce..d272478e7b0a 100644
> --- a/bsd-user/freebsd/os-syscall.c
> +++ b/bsd-user/freebsd/os-syscall.c
> @@ -37,7 +37,6 @@
> #include <utime.h>
>
> #include "qemu.h"
> -#include "qemu-common.h"
> #include "signal-common.h"
> #include "user/syscall-trace.h"
>
> diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> index 07aa0a634dff..e54e26de17b0 100644
> --- a/bsd-user/mmap.c
> +++ b/bsd-user/mmap.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
>
> #include "qemu.h"
> -#include "qemu-common.h"
>
> static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
> static __thread int mmap_lock_count;
> diff --git a/chardev/char-fd.c b/chardev/char-fd.c
> index 93c56913b49a..6ec9682b22f2 100644
> --- a/chardev/char-fd.c
> +++ b/chardev/char-fd.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/module.h"
> #include "qemu/sockets.h"
> #include "qapi/error.h"
> diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
> index 7eca5d9a56ae..66d3b8509183 100644
> --- a/chardev/char-pipe.c
> +++ b/chardev/char-pipe.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/main-loop.h"
> #include "qemu/module.h"
> diff --git a/chardev/char-pty.c b/chardev/char-pty.c
> index d73d8b23903d..1e2863f532a8 100644
> --- a/chardev/char-pty.c
> +++ b/chardev/char-pty.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "chardev/char.h"
> #include "io/channel-file.h"
> diff --git a/cpu.c b/cpu.c
> index ab2c7c81e460..0fef70e18e74 100644
> --- a/cpu.c
> +++ b/cpu.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
>
> #include "exec/target_page.h"
> diff --git a/crypto/cipher-afalg.c b/crypto/cipher-afalg.c
> index c55cd28bf01c..3df8fc54c051 100644
> --- a/crypto/cipher-afalg.c
> +++ b/crypto/cipher-afalg.c
> @@ -12,7 +12,6 @@
> */
> #include "qemu/osdep.h"
> #include "qemu/sockets.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "crypto/cipher.h"
> #include "cipherpriv.h"
> diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c
> index 4ac18c7c1db7..3ebea392920d 100644
> --- a/crypto/hash-afalg.c
> +++ b/crypto/hash-afalg.c
> @@ -13,7 +13,6 @@
> #include "qemu/osdep.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "crypto/hash.h"
> #include "crypto/hmac.h"
> diff --git a/dump/dump.c b/dump/dump.c
> index 5d71c47d06aa..e766ce1d7d91 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "elf.h"
> #include "exec/hwaddr.h"
> diff --git a/dump/win_dump.c b/dump/win_dump.c
> index c5eb5a9aacd7..fbdbb7bd93a6 100644
> --- a/dump/win_dump.c
> +++ b/dump/win_dump.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "elf.h"
> #include "exec/hwaddr.h"
> diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
> index d06a0f7b8326..2dde27922fe2 100644
> --- a/fsdev/virtfs-proxy-helper.c
> +++ b/fsdev/virtfs-proxy-helper.c
> @@ -21,7 +21,6 @@
> #include <linux/magic.h>
> #endif
> #include <cap-ng.h>
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "qemu/xattr.h"
> #include "9p-iov-marshal.h"
> diff --git a/gdbstub.c b/gdbstub.c
> index c8375e3c3ffe..2c804d506629 100644
> --- a/gdbstub.c
> +++ b/gdbstub.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "qemu/ctype.h"
> diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
> index 4c5e0fc217eb..99d115ff0db4 100644
> --- a/hw/9pfs/9p-proxy.c
> +++ b/hw/9pfs/9p-proxy.c
> @@ -18,7 +18,6 @@
> #include "qemu/osdep.h"
> #include <sys/socket.h>
> #include <sys/un.h>
> -#include "qemu-common.h"
> #include "9p.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
> index c78ed96d0eca..f4349eba83fb 100644
> --- a/hw/alpha/dp264.c
> +++ b/hw/alpha/dp264.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "elf.h"
> #include "hw/loader.h"
> diff --git a/hw/avr/boot.c b/hw/avr/boot.c
> index cbede775cee2..617f3a144c85 100644
> --- a/hw/avr/boot.c
> +++ b/hw/avr/boot.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/loader.h"
> #include "elf.h"
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 8d9b2df6e725..8167301f0402 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -43,7 +43,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-machine.h"
> diff --git a/hw/display/artist.c b/hw/display/artist.c
> index 69a8f9eea8ba..8e121bb0b4dc 100644
> --- a/hw/display/artist.c
> +++ b/hw/display/artist.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> diff --git a/hw/display/cg3.c b/hw/display/cg3.c
> index 4b7e78d91924..2e9656ae1c39 100644
> --- a/hw/display/cg3.c
> +++ b/hw/display/cg3.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> diff --git a/hw/display/tcx.c b/hw/display/tcx.c
> index d4d09d0df8d5..1b27b64f6d14 100644
> --- a/hw/display/tcx.c
> +++ b/hw/display/tcx.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "ui/console.h"
> diff --git a/hw/display/virtio-gpu-udmabuf.c
> b/hw/display/virtio-gpu-udmabuf.c
> index 1597921c51fc..8bdf4bac6e4b 100644
> --- a/hw/display/virtio-gpu-udmabuf.c
> +++ b/hw/display/virtio-gpu-udmabuf.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "ui/console.h"
> #include "hw/virtio/virtio-gpu.h"
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 31ce01b7c57c..08e5938ec7b7 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/irq.h"
> #include "hw/qdev-properties.h"
> #include "hw/sysbus.h"
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index 98b30e0395ee..f7595c08577c 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -4,7 +4,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "elf.h"
> diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
> index c8b17af95353..0540047bad22 100644
> --- a/hw/i386/pc_sysfw.c
> +++ b/hw/i386/pc_sysfw.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "sysemu/block-backend.h"
> #include "qemu/error-report.h"
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 4cf107baea34..bb6727279097 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -25,7 +25,6 @@
> #include "qemu/option.h"
> #include "qemu/cutils.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qapi/qmp/qerror.h"
> diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c
> index 273e96a7b12d..aeb0624fe57e 100644
> --- a/hw/input/vhost-user-input.c
> +++ b/hw/input/vhost-user-input.c
> @@ -7,7 +7,6 @@
> #include "qemu/osdep.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
>
> #include "hw/virtio/virtio-input.h"
>
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index f5bfc501bc15..9719d98a179e 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -27,7 +27,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "trace.h"
> #include "sysemu/kvm.h"
> #include "hw/ppc/spapr.h"
> diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
> index 93812ee206ea..655207e393dc 100644
> --- a/hw/m68k/mcf5208.c
> +++ b/hw/m68k/mcf5208.c
> @@ -11,7 +11,6 @@
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/irq.h"
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index 66ca5c0df6ef..099a758c6f6a 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -22,7 +22,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "sysemu/sysemu.h"
> #include "cpu.h"
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index 8e630282e02c..7de8b5f83393 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "sysemu/sysemu.h"
> #include "cpu.h"
> #include "hw/boards.h"
> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
> index 03c030aa2cf0..8b92a9801a02 100644
> --- a/hw/microblaze/boot.c
> +++ b/hw/microblaze/boot.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "qemu/option.h"
> diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
> index c9f14e70a077..7b13098f9b1b 100644
> --- a/hw/mips/fuloong2e.c
> +++ b/hw/mips/fuloong2e.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
> index 4d6b44de342e..6598d7dddd59 100644
> --- a/hw/mips/jazz.c
> +++ b/hw/mips/jazz.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/mips/mips.h"
> diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
> index ae192db0c8b9..25534288dd81 100644
> --- a/hw/mips/loongson3_virt.c
> +++ b/hw/mips/loongson3_virt.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qemu/cutils.h"
> #include "qemu/datadir.h"
> diff --git a/hw/mips/malta.c b/hw/mips/malta.c
> index c4474b927c46..9ffdc5b8f187 100644
> --- a/hw/mips/malta.c
> +++ b/hw/mips/malta.c
> @@ -25,7 +25,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qemu/bitops.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/southbridge/piix.h"
> diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
> index 30bc1c4f086f..39f64448f244 100644
> --- a/hw/mips/mipssim.c
> +++ b/hw/mips/mipssim.c
> @@ -27,7 +27,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/mips/mips.h"
> diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c
> index 83020fe9ac9b..8d939fe31b1b 100644
> --- a/hw/misc/sbsa_ec.c
> +++ b/hw/misc/sbsa_ec.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "hw/sysbus.h"
> #include "sysemu/runstate.h"
> diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
> index e7fc082518d2..6d50c395439a 100644
> --- a/hw/net/fsl_etsec/etsec.c
> +++ b/hw/net/fsl_etsec/etsec.c
> @@ -27,7 +27,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/sysbus.h"
> #include "hw/irq.h"
> #include "hw/ptimer.h"
> diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
> index 8f084464155d..a32589e33be4 100644
> --- a/hw/net/fsl_etsec/rings.c
> +++ b/hw/net/fsl_etsec/rings.c
> @@ -22,7 +22,6 @@
> * THE SOFTWARE.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "net/checksum.h"
> #include "qemu/log.h"
> #include "etsec.h"
> diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
> index 9278fdce0b3d..7ccd3e514271 100644
> --- a/hw/net/msf2-emac.c
> +++ b/hw/net/msf2-emac.c
> @@ -29,7 +29,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> #include "hw/registerfields.h"
> diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
> index 9a2328935c1c..7c86bb52e571 100644
> --- a/hw/net/npcm7xx_emc.c
> +++ b/hw/net/npcm7xx_emc.c
> @@ -32,7 +32,6 @@
> /* For crc32 */
> #include <zlib.h>
>
> -#include "qemu-common.h"
> #include "hw/irq.h"
> #include "hw/qdev-clock.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
> index e889595d5c2b..07b8d87633b6 100644
> --- a/hw/nios2/boot.c
> +++ b/hw/nios2/boot.c
> @@ -30,7 +30,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/option.h"
> #include "qemu/config-file.h"
> diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
> index fbc18dbd04c2..48edb3ae373d 100644
> --- a/hw/nios2/generic_nommu.c
> +++ b/hw/nios2/generic_nommu.c
> @@ -28,7 +28,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
>
> #include "hw/char/serial.h"
> #include "hw/boards.h"
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index ea2d56f9f2af..4125cbebcd38 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "sysemu/sysemu.h"
> #include "sysemu/dma.h"
> diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
> index 00b3ff7d9098..cc9c4d6d3b33 100644
> --- a/hw/pci-host/mv64361.c
> +++ b/hw/pci-host/mv64361.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
> index 6e9aa9d6ace2..4e68ad4f03fc 100644
> --- a/hw/pci-host/pnv_phb3.c
> +++ b/hw/pci-host/pnv_phb3.c
> @@ -10,7 +10,6 @@
> #include "qemu/log.h"
> #include "qapi/visitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci-host/pnv_phb3_regs.h"
> #include "hw/pci-host/pnv_phb3.h"
> #include "hw/pci/pcie_host.h"
> diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c
> index 8bcbc2cc4f37..2f4112907b84 100644
> --- a/hw/pci-host/pnv_phb3_msi.c
> +++ b/hw/pci-host/pnv_phb3_msi.c
> @@ -9,7 +9,6 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci-host/pnv_phb3_regs.h"
> #include "hw/pci-host/pnv_phb3.h"
> #include "hw/ppc/pnv.h"
> diff --git a/hw/pci-host/pnv_phb3_pbcq.c b/hw/pci-host/pnv_phb3_pbcq.c
> index c7426cd27a20..82f70efa4311 100644
> --- a/hw/pci-host/pnv_phb3_pbcq.c
> +++ b/hw/pci-host/pnv_phb3_pbcq.c
> @@ -8,7 +8,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "target/ppc/cpu.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
> index 11c97e27eb16..3c4c2dace0a3 100644
> --- a/hw/pci-host/pnv_phb4.c
> +++ b/hw/pci-host/pnv_phb4.c
> @@ -10,7 +10,6 @@
> #include "qemu/log.h"
> #include "qapi/visitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "target/ppc/cpu.h"
> #include "hw/pci-host/pnv_phb4_regs.h"
> diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
> index 6f1121a9489a..61bc0b503e3e 100644
> --- a/hw/pci-host/pnv_phb4_pec.c
> +++ b/hw/pci-host/pnv_phb4_pec.c
> @@ -8,7 +8,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "target/ppc/cpu.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
> index 6e514f75eb8f..7a105e4a63d3 100644
> --- a/hw/pci-host/raven.c
> +++ b/hw/pci-host/raven.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/log.h"
> diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
> index eee45444ef73..bfb25ef6af85 100644
> --- a/hw/pci-host/remote.c
> +++ b/hw/pci-host/remote.c
> @@ -22,7 +22,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_host.h"
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index dae9119bfe5f..e99417e50110 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "hw/irq.h"
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index c7e6767f91a8..2bc3dce1fb7d 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 7b5a205309af..e8ef1a9e5d9b 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -47,7 +47,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "hw/ppc/ppc.h"
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 7016979a7cd0..fe2adb057b0c 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> index d45008ac7131..56bf203dfddf 100644
> --- a/hw/ppc/pegasos2.c
> +++ b/hw/ppc/pegasos2.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 00f57c9678e6..c5e48992d988 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/cutils.h"
> diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
> index 75a22ce50b11..99f1e8d7f9f3 100644
> --- a/hw/ppc/pnv_bmc.c
> +++ b/hw/ppc/pnv_bmc.c
> @@ -17,7 +17,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "target/ppc/cpu.h"
> #include "qemu/log.h"
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index 7e1a4ac9553b..32013b89836a 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -25,7 +25,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/ppc/ppc.h"
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index 7fb620b9a056..efa90ef5ba73 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -14,7 +14,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/error-report.h"
> #include "net/net.h"
> diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
> index 0737234d66e5..2f24598f55db 100644
> --- a/hw/ppc/sam460ex.c
> +++ b/hw/ppc/sam460ex.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index a4372ba1891e..cc11fcc8b24d 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/memalign.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
> index d7c0e212baf8..a64098c375e0 100644
> --- a/hw/ppc/spapr_numa.c
> +++ b/hw/ppc/spapr_numa.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/ppc/spapr_numa.h"
> #include "hw/pci-host/spapr.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c
> index 4678c79235f6..63b476c8f727 100644
> --- a/hw/ppc/spapr_pci_nvlink2.c
> +++ b/hw/ppc/spapr_pci_nvlink2.c
> @@ -23,7 +23,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci/pci.h"
> #include "hw/pci-host/spapr.h"
> #include "hw/ppc/spapr_numa.h"
> diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c
> index 2454086744b1..e10af35a1850 100644
> --- a/hw/ppc/spapr_tpm_proxy.c
> +++ b/hw/ppc/spapr_tpm_proxy.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "sysemu/reset.h"
> diff --git a/hw/ppc/spapr_vof.c b/hw/ppc/spapr_vof.c
> index a33f940c32bb..09f29be0b9de 100644
> --- a/hw/ppc/spapr_vof.c
> +++ b/hw/ppc/spapr_vof.c
> @@ -4,7 +4,6 @@
> * SPDX-License-Identifier: GPL-2.0-or-later
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "hw/ppc/spapr.h"
> #include "hw/ppc/spapr_vio.h"
> diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
> index 9c575403b85c..b67a709ddce2 100644
> --- a/hw/ppc/virtex_ml507.c
> +++ b/hw/ppc/virtex_ml507.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "cpu.h"
> diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c
> index 2b63a6287561..8d96593677da 100644
> --- a/hw/ppc/vof.c
> +++ b/hw/ppc/vof.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/range.h"
> #include "qemu/units.h"
> diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c
> index 547d597f0feb..40dfee4bad43 100644
> --- a/hw/remote/iohub.c
> +++ b/hw/remote/iohub.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_ids.h"
> diff --git a/hw/remote/machine.c b/hw/remote/machine.c
> index 952105eab5a2..92d71d47bb9c 100644
> --- a/hw/remote/machine.c
> +++ b/hw/remote/machine.c
> @@ -14,7 +14,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/machine.h"
> #include "exec/memory.h"
> diff --git a/hw/remote/memory.c b/hw/remote/memory.c
> index 6e21ab1a45c9..6d60da91e01c 100644
> --- a/hw/remote/memory.c
> +++ b/hw/remote/memory.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/memory.h"
> #include "exec/ram_addr.h"
> diff --git a/hw/remote/message.c b/hw/remote/message.c
> index 11d729845c5a..50f6bf2d495f 100644
> --- a/hw/remote/message.c
> +++ b/hw/remote/message.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/machine.h"
> #include "io/channel.h"
> diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
> index 7e841820e521..2a4aa651ca26 100644
> --- a/hw/remote/mpqemu-link.c
> +++ b/hw/remote/mpqemu-link.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/module.h"
> #include "hw/remote/mpqemu-link.h"
> diff --git a/hw/remote/proxy-memory-listener.c
> b/hw/remote/proxy-memory-listener.c
> index 0e893f3189e9..eb9918fe72bb 100644
> --- a/hw/remote/proxy-memory-listener.c
> +++ b/hw/remote/proxy-memory-listener.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/compiler.h"
> #include "qemu/int128.h"
> diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
> index bad164299dd4..1c7786b52cf1 100644
> --- a/hw/remote/proxy.c
> +++ b/hw/remote/proxy.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/proxy.h"
> #include "hw/pci/pci.h"
> diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
> index 4f21254219f8..333e5ac44331 100644
> --- a/hw/remote/remote-obj.c
> +++ b/hw/remote/remote-obj.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/error-report.h"
> #include "qemu/notify.h"
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index cae74fcbcd9a..0f179d36014a 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
> index 75d1fec6ca46..64f897e5b10a 100644
> --- a/hw/rx/rx-gdbsim.c
> +++ b/hw/rx/rx-gdbsim.c
> @@ -20,7 +20,6 @@
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/loader.h"
> #include "hw/rx/rx62n.h"
> #include "sysemu/qtest.h"
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index eb7fc4c4ae87..84971e537b3e 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -13,7 +13,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "sysemu/reset.h"
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index cd67a7bac8e2..8e6fa0915137 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -47,7 +47,6 @@
> #include "qemu/timer.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> -#include "qemu-common.h"
> #include "sdmmc-internal.h"
> #include "trace.h"
>
> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
> index a9f24968275d..1e39d2e2d0ac 100644
> --- a/hw/sparc/leon3.c
> +++ b/hw/sparc/leon3.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/irq.h"
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 7f3a7c002780..fccaed1eb444 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "qemu/datadir.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "hw/sysbus.h"
> #include "qemu/error-report.h"
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index cda7df36e312..6fd08e2298a6 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/pci/pci.h"
> diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
> index e6b77a2a941d..5831395cef75 100644
> --- a/hw/usb/dev-mtp.c
> +++ b/hw/usb/dev-mtp.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include <wchar.h>
> diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
> index 664cbd958323..6de58a76a7ff 100644
> --- a/hw/virtio/virtio-iommu.c
> +++ b/hw/virtio/virtio-iommu.c
> @@ -20,7 +20,6 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "qemu/iov.h"
> -#include "qemu-common.h"
> #include "hw/qdev-properties.h"
> #include "hw/virtio/virtio.h"
> #include "sysemu/kvm.h"
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index 35cbf1f21946..5aca40872695 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
> index 5419dca75e2c..5dd21c2c4408 100644
> --- a/hw/virtio/virtio-pmem.c
> +++ b/hw/virtio/virtio-pmem.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> #include "hw/virtio/virtio-pmem.h"
> diff --git a/io/channel-socket.c b/io/channel-socket.c
> index 7a8d9f69c92d..9f5ddf68b687 100644
> --- a/io/channel-socket.c
> +++ b/io/channel-socket.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/qapi-visit-sockets.h"
> #include "qemu/module.h"
> diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
> index 31a66a4fa07c..3b273f62997a 100644
> --- a/linux-user/aarch64/cpu_loop.c
> +++ b/linux-user/aarch64/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c
> index de6e0c901cdf..2ea039aa71f7 100644
> --- a/linux-user/alpha/cpu_loop.c
> +++ b/linux-user/alpha/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
> index 9dcb2e024eb0..683b8e47c2bd 100644
> --- a/linux-user/arm/cpu_loop.c
> +++ b/linux-user/arm/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "elf.h"
> diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c
> index 0f46b3c1a87a..01e6ff16fc92 100644
> --- a/linux-user/cris/cpu_loop.c
> +++ b/linux-user/cris/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c
> index 0d73934d31d5..b84e25bf71eb 100644
> --- a/linux-user/hexagon/cpu_loop.c
> +++ b/linux-user/hexagon/cpu_loop.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
> index 90bffc1956aa..492701dd9af9 100644
> --- a/linux-user/i386/cpu_loop.c
> +++ b/linux-user/i386/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "qemu/timer.h"
> #include "user-internals.h"
> diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
> index 928a18e3cf05..d1bf8548b747 100644
> --- a/linux-user/m68k/cpu_loop.c
> +++ b/linux-user/m68k/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/microblaze/cpu_loop.c
> b/linux-user/microblaze/cpu_loop.c
> index 1a2556be2c5f..5ccf9e942eaa 100644
> --- a/linux-user/microblaze/cpu_loop.c
> +++ b/linux-user/microblaze/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
> index 9bb12a07ba08..d5c1c7941d34 100644
> --- a/linux-user/mips/cpu_loop.c
> +++ b/linux-user/mips/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/openrisc/cpu_loop.c
> b/linux-user/openrisc/cpu_loop.c
> index 7683bea0649e..a7aa586c8f96 100644
> --- a/linux-user/openrisc/cpu_loop.c
> +++ b/linux-user/openrisc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/ppc/cpu_loop.c b/linux-user/ppc/cpu_loop.c
> index b468f199e4d2..02204ad8bebb 100644
> --- a/linux-user/ppc/cpu_loop.c
> +++ b/linux-user/ppc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "qemu/timer.h"
> #include "user-internals.h"
> diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
> index 26d446f32379..29084c142196 100644
> --- a/linux-user/riscv/cpu_loop.c
> +++ b/linux-user/riscv/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu.h"
> #include "user-internals.h"
> diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c
> index 7901dfe6f518..285bc60071a8 100644
> --- a/linux-user/s390x/cpu_loop.c
> +++ b/linux-user/s390x/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c
> index 1bd313cb19a2..c805f9db1104 100644
> --- a/linux-user/sh4/cpu_loop.c
> +++ b/linux-user/sh4/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
> index baf3d9ae011f..434c90a55f8f 100644
> --- a/linux-user/sparc/cpu_loop.c
> +++ b/linux-user/sparc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/uname.c b/linux-user/uname.c
> index 0856783b2190..415fdf31b62d 100644
> --- a/linux-user/uname.c
> +++ b/linux-user/uname.c
> @@ -21,7 +21,6 @@
>
> #include "qemu.h"
> #include "user-internals.h"
> -//#include "qemu-common.h"
> #include "uname.h"
>
> /* return highest utsname machine name for emulated instruction set
> diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
> index 883cf1ca4bbf..5e7302cbb995 100644
> --- a/monitor/qmp-cmds.c
> +++ b/monitor/qmp-cmds.c
> @@ -14,7 +14,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/option.h"
> #include "monitor/monitor.h"
> diff --git a/net/colo-compare.c b/net/colo-compare.c
> index 62554b5b3c8f..d5d096580577 100644
> --- a/net/colo-compare.c
> +++ b/net/colo-compare.c
> @@ -13,7 +13,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "trace.h"
> #include "qapi/error.h"
> diff --git a/net/net.c b/net/net.c
> index 9f17ab204422..a094cf1d2929 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "net/net.h"
> #include "clients.h"
> diff --git a/net/socket.c b/net/socket.c
> index c4b80e9228d7..ea5220a2eb51 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -27,7 +27,6 @@
> #include "clients.h"
> #include "monitor/monitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/option.h"
> #include "qemu/sockets.h"
> diff --git a/net/tap-bsd.c b/net/tap-bsd.c
> index e45a6d124eb6..7e65bd391f0b 100644
> --- a/net/tap-bsd.c
> +++ b/net/tap-bsd.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "tap_int.h"
> #include "qemu/cutils.h"
> diff --git a/net/tap-linux.c b/net/tap-linux.c
> index 5e70b9303710..3e24d232e782 100644
> --- a/net/tap-linux.c
> +++ b/net/tap-linux.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "tap_int.h"
> #include "tap-linux.h"
> #include "net/tap.h"
> diff --git a/net/tap-solaris.c b/net/tap-solaris.c
> index d85224242b30..79919785c9f6 100644
> --- a/net/tap-solaris.c
> +++ b/net/tap-solaris.c
> @@ -27,7 +27,6 @@
> #include "tap_int.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> -#include "qemu-common.h"
>
> #include <sys/ethernet.h>
> #include <sys/sockio.h>
> diff --git a/net/tap-win32.c b/net/tap-win32.c
> index 6096972f5d47..7466f22e77a4 100644
> --- a/net/tap-win32.c
> +++ b/net/tap-win32.c
> @@ -29,7 +29,6 @@
> #include "qemu/osdep.h"
> #include "tap_int.h"
>
> -#include "qemu-common.h"
> #include "clients.h" /* net_init_tap */
> #include "net/eth.h"
> #include "net/net.h"
> diff --git a/net/tap.c b/net/tap.c
> index c5cbeaa7a2be..6190fa699d2f 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -38,7 +38,6 @@
> #include "monitor/monitor.h"
> #include "sysemu/sysemu.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/net/vde.c b/net/vde.c
> index 99189cccb694..1083916bcf52 100644
> --- a/net/vde.c
> +++ b/net/vde.c
> @@ -27,7 +27,6 @@
>
> #include "net/net.h"
> #include "clients.h"
> -#include "qemu-common.h"
> #include "qemu/option.h"
> #include "qemu/main-loop.h"
> #include "qapi/error.h"
> diff --git a/os-posix.c b/os-posix.c
> index 24692c8593f3..ee765f047dea 100644
> --- a/os-posix.c
> +++ b/os-posix.c
> @@ -29,7 +29,6 @@
> #include <grp.h>
> #include <libgen.h>
>
> -#include "qemu-common.h"
> /* Needed early for CONFIG_BSD etc. */
> #include "net/slirp.h"
> #include "qemu/qemu-options.h"
> diff --git a/os-win32.c b/os-win32.c
> index 6f21b578417c..725ad652e8bb 100644
> --- a/os-win32.c
> +++ b/os-win32.c
> @@ -26,7 +26,6 @@
> #include "qemu/osdep.h"
> #include <windows.h>
> #include <mmsystem.h>
> -#include "qemu-common.h"
> #include "sysemu/runstate.h"
>
> static BOOL WINAPI qemu_ctrl_handler(DWORD type)
> diff --git a/page-vary-common.c b/page-vary-common.c
> index 91755564985c..ab77672dd412 100644
> --- a/page-vary-common.c
> +++ b/page-vary-common.c
> @@ -20,7 +20,6 @@
> #define IN_PAGE_VARY 1
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/page-vary.h"
>
> /* WARNING: This file must *not* be complied with -flto. */
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index 4d7a2392c097..9924277c826e 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -16,7 +16,6 @@
> #include <sys/utsname.h>
> #include <sys/wait.h>
> #include <dirent.h>
> -#include "qemu-common.h"
> #include "guest-agent-core.h"
> #include "qga-qapi-commands.h"
> #include "qapi/error.h"
> diff --git a/softmmu/cpu-throttle.c b/softmmu/cpu-throttle.c
> index 8c2144ab95cc..d9bb30a223d8 100644
> --- a/softmmu/cpu-throttle.c
> +++ b/softmmu/cpu-throttle.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/thread.h"
> #include "hw/core/cpu.h"
> #include "qemu/main-loop.h"
> diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c
> index 204d946a1729..117408cb83af 100644
> --- a/softmmu/cpu-timers.c
> +++ b/softmmu/cpu-timers.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> diff --git a/softmmu/cpus.c b/softmmu/cpus.c
> index 7b75bb66d5e6..668bef9b4d62 100644
> --- a/softmmu/cpus.c
> +++ b/softmmu/cpus.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "qemu/coroutine-tls.h"
> #include "qapi/error.h"
> diff --git a/softmmu/datadir.c b/softmmu/datadir.c
> index 504c4665bed7..160cac999a6f 100644
> --- a/softmmu/datadir.c
> +++ b/softmmu/datadir.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/cutils.h"
> #include "trace.h"
> diff --git a/softmmu/icount.c b/softmmu/icount.c
> index 21341a4ce49e..5ca271620db6 100644
> --- a/softmmu/icount.c
> +++ b/softmmu/icount.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> diff --git a/softmmu/runstate.c b/softmmu/runstate.c
> index e0d869b21aa4..fac7b63259e8 100644
> --- a/softmmu/runstate.c
> +++ b/softmmu/runstate.c
> @@ -40,7 +40,6 @@
> #include "qapi/error.h"
> #include "qapi/qapi-commands-run-state.h"
> #include "qapi/qapi-events-run-state.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qemu/job.h"
> diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
> index d058a2a00d85..afa477aae656 100644
> --- a/stubs/monitor-core.c
> +++ b/stubs/monitor-core.c
> @@ -1,6 +1,5 @@
> #include "qemu/osdep.h"
> #include "monitor/monitor.h"
> -#include "qemu-common.h"
> #include "qapi/qapi-emit-events.h"
>
> Monitor *monitor_cur(void)
> diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
> index 8c34f86792ed..567e296b21c9 100644
> --- a/target/arm/hvf/hvf.c
> +++ b/target/arm/hvf/hvf.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
>
> #include "sysemu/runstate.h"
> diff --git a/target/arm/kvm.c b/target/arm/kvm.c
> index bbf1ce7ba3bc..5fc37ac10a5b 100644
> --- a/target/arm/kvm.c
> +++ b/target/arm/kvm.c
> @@ -13,7 +13,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
> index 9ec8875150d6..17dd2f77d9f5 100644
> --- a/target/arm/kvm64.c
> +++ b/target/arm/kvm64.c
> @@ -16,7 +16,6 @@
> #include <linux/elf.h>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "cpu.h"
> #include "qemu/timer.h"
> diff --git a/target/hexagon/gdbstub.c b/target/hexagon/gdbstub.c
> index 9c8c04c961b1..d152d01bfe7e 100644
> --- a/target/hexagon/gdbstub.c
> +++ b/target/hexagon/gdbstub.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/gdbstub.h"
> #include "cpu.h"
> #include "internal.h"
> diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c
> index 81f665e21245..b185ee8de4fd 100644
> --- a/target/i386/hax/hax-all.c
> +++ b/target/i386/hax/hax-all.c
> @@ -27,7 +27,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
>
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/reset.h"
> #include "sysemu/runstate.h"
> diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
> index fc12c02fb217..f8833277ab6a 100644
> --- a/target/i386/hvf/hvf.c
> +++ b/target/i386/hvf/hvf.c
> @@ -47,7 +47,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/memalign.h"
>
> diff --git a/target/i386/hvf/x86.c b/target/i386/hvf/x86.c
> index 91a3fe002c73..d086584f26d9 100644
> --- a/target/i386/hvf/x86.c
> +++ b/target/i386/hvf/x86.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
>
> #include "cpu.h"
> -#include "qemu-common.h"
> #include "x86_decode.h"
> #include "x86_emu.h"
> #include "vmcs.h"
> diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
> index 32b0d131df86..f24dd50e48ff 100644
> --- a/target/i386/hvf/x86_cpuid.c
> +++ b/target/i386/hvf/x86_cpuid.c
> @@ -21,7 +21,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "x86.h"
> #include "vmx.h"
> diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c
> index 062713b1a450..3728d7705e21 100644
> --- a/target/i386/hvf/x86_decode.c
> +++ b/target/i386/hvf/x86_decode.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "panic.h"
> #include "x86_decode.h"
> #include "vmx.h"
> diff --git a/target/i386/hvf/x86_descr.c b/target/i386/hvf/x86_descr.c
> index af15c06ac5db..a484942cfcd4 100644
> --- a/target/i386/hvf/x86_descr.c
> +++ b/target/i386/hvf/x86_descr.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "vmx.h"
> #include "x86_descr.h"
>
> diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
> index 050428795bbc..f5704f63e8da 100644
> --- a/target/i386/hvf/x86_emu.c
> +++ b/target/i386/hvf/x86_emu.c
> @@ -37,7 +37,6 @@
>
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "x86_decode.h"
> #include "x86.h"
> #include "x86_emu.h"
> diff --git a/target/i386/hvf/x86_flags.c b/target/i386/hvf/x86_flags.c
> index fecbca751770..03d6de5efc3e 100644
> --- a/target/i386/hvf/x86_flags.c
> +++ b/target/i386/hvf/x86_flags.c
> @@ -23,7 +23,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "panic.h"
> #include "cpu.h"
> #include "x86_flags.h"
> diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c
> index df0b91cd4208..96d117567ee8 100644
> --- a/target/i386/hvf/x86_mmu.c
> +++ b/target/i386/hvf/x86_mmu.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "x86.h"
> #include "x86_mmu.h"
> diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
> index d24daf6a4110..beaeec068731 100644
> --- a/target/i386/hvf/x86_task.c
> +++ b/target/i386/hvf/x86_task.c
> @@ -8,7 +8,6 @@
> // GNU General Public License for more details.
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
>
> #include "sysemu/hvf.h"
> diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c
> index bec9fc581463..69d4fb8cf555 100644
> --- a/target/i386/hvf/x86hvf.c
> +++ b/target/i386/hvf/x86hvf.c
> @@ -19,7 +19,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "x86hvf.h"
> #include "vmx.h"
> #include "vmcs.h"
> diff --git a/target/i386/kvm/sev-stub.c b/target/i386/kvm/sev-stub.c
> index 6080c007a2e4..1be5341e8a6a 100644
> --- a/target/i386/kvm/sev-stub.c
> +++ b/target/i386/kvm/sev-stub.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sev.h"
>
> int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
> diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
> index 9f940413318c..b75738ee9cdf 100644
> --- a/target/i386/nvmm/nvmm-all.c
> +++ b/target/i386/nvmm/nvmm-all.c
> @@ -11,7 +11,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
> #include "exec/ioport.h"
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/nvmm.h"
> #include "sysemu/cpus.h"
> diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
> index 68a4ebe909ad..5560a22ea5c2 100644
> --- a/target/i386/whpx/whpx-all.c
> +++ b/target/i386/whpx/whpx-all.c
> @@ -12,7 +12,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
> #include "exec/ioport.h"
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/whpx.h"
> #include "sysemu/cpus.h"
> diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c
> index bba36f3ec98f..c15df35ad60a 100644
> --- a/target/i386/whpx/whpx-apic.c
> +++ b/target/i386/whpx/whpx-apic.c
> @@ -11,7 +11,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "hw/i386/apic_internal.h"
> #include "hw/i386/apic-msidef.h"
> diff --git a/target/mips/kvm.c b/target/mips/kvm.c
> index 086debd9f013..caf70decd2a5 100644
> --- a/target/mips/kvm.c
> +++ b/target/mips/kvm.c
> @@ -14,7 +14,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "internal.h"
> #include "qemu/error-report.h"
> diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
> index 5a7ad0c7108d..eda21c04434b 100644
> --- a/target/nios2/nios2-semi.c
> +++ b/target/nios2/nios2-semi.c
> @@ -28,7 +28,6 @@
> #if defined(CONFIG_USER_ONLY)
> #include "qemu.h"
> #else
> -#include "qemu-common.h"
> #include "exec/softmmu-semi.h"
> #endif
> #include "qemu/log.h"
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 8644b85de847..f905a2af17a7 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -21,7 +21,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "cpu.h"
> diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
> index e6b7cb6d4d5f..70b4cff06fbb 100644
> --- a/target/riscv/kvm.c
> +++ b/target/riscv/kvm.c
> @@ -21,7 +21,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/target/rx/cpu.c b/target/rx/cpu.c
> index 25a4aa2976d3..fb30080ac4ea 100644
> --- a/target/rx/cpu.c
> +++ b/target/rx/cpu.c
> @@ -20,7 +20,6 @@
> #include "qemu/qemu-print.h"
> #include "qapi/error.h"
> #include "cpu.h"
> -#include "qemu-common.h"
> #include "migration/vmstate.h"
> #include "exec/exec-all.h"
> #include "hw/loader.h"
> diff --git a/target/rx/gdbstub.c b/target/rx/gdbstub.c
> index c811d4810b45..7eb2059a841b 100644
> --- a/target/rx/gdbstub.c
> +++ b/target/rx/gdbstub.c
> @@ -16,7 +16,6 @@
> * this program. If not, see <http://www.gnu.org/licenses/>.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
>
> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
> index 6acf14d5ecb4..53098bf54104 100644
> --- a/target/s390x/kvm/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -24,7 +24,6 @@
> #include <linux/kvm.h>
> #include <asm/ptrace.h>
>
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "kvm_s390x.h"
> diff --git a/target/s390x/tcg/vec_fpu_helper.c
> b/target/s390x/tcg/vec_fpu_helper.c
> index 1a779934715f..aa2cc8e4a6b5 100644
> --- a/target/s390x/tcg/vec_fpu_helper.c
> +++ b/target/s390x/tcg/vec_fpu_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "vec.h"
> diff --git a/target/s390x/tcg/vec_int_helper.c
> b/target/s390x/tcg/vec_int_helper.c
> index 5561b3ed9096..b44859ee1630 100644
> --- a/target/s390x/tcg/vec_int_helper.c
> +++ b/target/s390x/tcg/vec_int_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "vec.h"
> #include "exec/helper-proto.h"
> diff --git a/target/s390x/tcg/vec_string_helper.c
> b/target/s390x/tcg/vec_string_helper.c
> index ac315eb095c1..f8b54bba4a9d 100644
> --- a/target/s390x/tcg/vec_string_helper.c
> +++ b/target/s390x/tcg/vec_string_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "vec.h"
> diff --git a/target/tricore/gdbstub.c b/target/tricore/gdbstub.c
> index 3ce55abb8e3b..ebf32defde3a 100644
> --- a/target/tricore/gdbstub.c
> +++ b/target/tricore/gdbstub.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/gdbstub.h"
>
>
> diff --git a/target/xtensa/core-de233_fpu.c
> b/target/xtensa/core-de233_fpu.c
> index c7cbeb1b4834..41af8057fbb9 100644
> --- a/target/xtensa/core-de233_fpu.c
> +++ b/target/xtensa/core-de233_fpu.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-de233_fpu/core-isa.h"
> diff --git a/target/xtensa/core-dsp3400.c b/target/xtensa/core-dsp3400.c
> index 4e0bc8a8c46c..81e425c56828 100644
> --- a/target/xtensa/core-dsp3400.c
> +++ b/target/xtensa/core-dsp3400.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-dsp3400/core-isa.h"
> diff --git a/target/xtensa/core-test_mmuhifi_c3.c
> b/target/xtensa/core-test_mmuhifi_c3.c
> index 123c630b0da7..c0e5d32d1e47 100644
> --- a/target/xtensa/core-test_mmuhifi_c3.c
> +++ b/target/xtensa/core-test_mmuhifi_c3.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-test_mmuhifi_c3/core-isa.h"
> diff --git a/tcg/tci.c b/tcg/tci.c
> index fe92b5d0844b..bdfac83492dd 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */
> #include "exec/cpu_ldst.h"
> #include "tcg/tcg-op.h"
> diff --git a/tests/qtest/acpi-utils.c b/tests/qtest/acpi-utils.c
> index 766c48e3a6a4..673fc975862c 100644
> --- a/tests/qtest/acpi-utils.c
> +++ b/tests/qtest/acpi-utils.c
> @@ -14,7 +14,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "qemu/bitmap.h"
> #include "acpi-utils.h"
> #include "boot-sector.h"
> diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
> index 8073ccc20521..aff5f3f79776 100644
> --- a/tests/qtest/ahci-test.c
> +++ b/tests/qtest/ahci-test.c
> @@ -30,7 +30,6 @@
> #include "libqos/ahci.h"
> #include "libqos/pci-pc.h"
>
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/host-utils.h"
>
> diff --git a/tests/qtest/aspeed_hace-test.c
> b/tests/qtest/aspeed_hace-test.c
> index 09ee31545e41..58aa22014d04 100644
> --- a/tests/qtest/aspeed_hace-test.c
> +++ b/tests/qtest/aspeed_hace-test.c
> @@ -8,7 +8,6 @@
> #include "qemu/osdep.h"
>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "qemu/bitops.h"
>
> #define HACE_CMD 0x10
> diff --git a/tests/qtest/bios-tables-test.c
> b/tests/qtest/bios-tables-test.c
> index c4a2d1e1664b..5dddedabcdde 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -57,7 +57,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "hw/firmware/smbios.h"
> #include "qemu/bitmap.h"
> #include "acpi-utils.h"
> diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
> index ea8f264661c3..9d9825bc8145 100644
> --- a/tests/qtest/boot-sector.c
> +++ b/tests/qtest/boot-sector.c
> @@ -12,7 +12,6 @@
> */
> #include "qemu/osdep.h"
> #include "boot-sector.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
>
> #define LOW(x) ((x) & 0xff)
> diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c
> index a1c689414be5..7f5dd5f85a78 100644
> --- a/tests/qtest/cpu-plug-test.c
> +++ b/tests/qtest/cpu-plug-test.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> diff --git a/tests/qtest/dbus-display-test.c
> b/tests/qtest/dbus-display-test.c
> index 43c77aff045c..81043162dfdd 100644
> --- a/tests/qtest/dbus-display-test.c
> +++ b/tests/qtest/dbus-display-test.c
> @@ -3,7 +3,6 @@
> #include <gio/gio.h>
> #include <gio/gunixfdlist.h>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "dbus-display1.h"
>
> static GDBusConnection*
> diff --git a/tests/qtest/dbus-vmstate-test.c
> b/tests/qtest/dbus-vmstate-test.c
> index aca9b98b7a35..a8acab763f5d 100644
> --- a/tests/qtest/dbus-vmstate-test.c
> +++ b/tests/qtest/dbus-vmstate-test.c
> @@ -2,7 +2,6 @@
> #include <glib/gstdio.h>
> #include <gio/gio.h>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "dbus-vmstate1.h"
> #include "migration-helpers.h"
>
> diff --git a/tests/qtest/device-introspect-test.c
> b/tests/qtest/device-introspect-test.c
> index bbec166dbc2f..adf39b2518e8 100644
> --- a/tests/qtest/device-introspect-test.c
> +++ b/tests/qtest/device-introspect-test.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/qmp/qstring.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c
> index e648fdd409cd..ddd6983ede14 100644
> --- a/tests/qtest/e1000e-test.c
> +++ b/tests/qtest/e1000e-test.c
> @@ -25,9 +25,7 @@
>
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> -#include "qemu-common.h"
> #include "libqos/pci-pc.h"
> #include "qemu/sockets.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c
> index f94cd8dd8e05..a0adc35bef7f 100644
> --- a/tests/qtest/erst-test.c
> +++ b/tests/qtest/erst-test.c
> @@ -11,7 +11,6 @@
> #include <glib/gstdio.h>
> #include "libqos/libqos-pc.h"
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
>
> diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c
> index b0d40012e6a9..4aa72f36431f 100644
> --- a/tests/qtest/fdc-test.c
> +++ b/tests/qtest/fdc-test.c
> @@ -27,7 +27,6 @@
>
> #include "libqtest-single.h"
> #include "qapi/qmp/qdict.h"
> -#include "qemu-common.h"
>
> /* TODO actually test the results and get rid of this */
> #define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
> diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
> index 7a244c951e5e..dc891d838b6a 100644
> --- a/tests/qtest/fuzz/qos_fuzz.c
> +++ b/tests/qtest/fuzz/qos_fuzz.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "exec/memory.h"
> #include "qemu/main-loop.h"
>
> diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
> index 64023c057408..da9c4c2792de 100644
> --- a/tests/qtest/hd-geo-test.c
> +++ b/tests/qtest/hd-geo-test.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/bswap.h"
> #include "qapi/qmp/qlist.h"
> #include "libqos/libqtest.h"
> diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
> index 19de3b410405..b7243a17b11d 100644
> --- a/tests/qtest/ide-test.c
> +++ b/tests/qtest/ide-test.c
> @@ -30,7 +30,6 @@
> #include "libqos/pci-pc.h"
> #include "libqos/malloc-pc.h"
> #include "qapi/qmp/qdict.h"
> -#include "qemu-common.h"
> #include "qemu/bswap.h"
> #include "hw/pci/pci_ids.h"
> #include "hw/pci/pci_regs.h"
> diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c
> index 19612e9405ae..ed431e34e68d 100644
> --- a/tests/qtest/ipmi-bt-test.c
> +++ b/tests/qtest/ipmi-bt-test.c
> @@ -31,7 +31,6 @@
>
>
> #include "libqtest-single.h"
> -#include "qemu-common.h"
>
> #define IPMI_IRQ 5
>
> diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
> index 4e8af42a9d04..95628a418579 100644
> --- a/tests/qtest/ivshmem-test.c
> +++ b/tests/qtest/ivshmem-test.c
> @@ -14,7 +14,6 @@
> #include "libqos/libqos-pc.h"
> #include "libqos/libqos-spapr.h"
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
>
> #define TMPSHMSIZE (1 << 20)
> static char *tmpshm;
> diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
> index eaa2096512e5..41c4be5efa93 100644
> --- a/tests/qtest/libqos/ahci.c
> +++ b/tests/qtest/libqos/ahci.c
> @@ -28,7 +28,6 @@
> #include "ahci.h"
> #include "pci-pc.h"
>
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "hw/pci/pci_ids.h"
> diff --git a/tests/qtest/libqos/malloc-pc.c
> b/tests/qtest/libqos/malloc-pc.c
> index f1e3b392a53c..bbd1b4827e54 100644
> --- a/tests/qtest/libqos/malloc-pc.c
> +++ b/tests/qtest/libqos/malloc-pc.c
> @@ -16,8 +16,6 @@
>
> #include "standard-headers/linux/qemu_fw_cfg.h"
>
> -#include "qemu-common.h"
> -
> #define ALLOC_PAGE_SIZE (4096)
>
> void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags)
> diff --git a/tests/qtest/libqos/malloc-spapr.c
> b/tests/qtest/libqos/malloc-spapr.c
> index 05b306c191d3..d90ed3c51d7d 100644
> --- a/tests/qtest/libqos/malloc-spapr.c
> +++ b/tests/qtest/libqos/malloc-spapr.c
> @@ -8,8 +8,6 @@
> #include "qemu/osdep.h"
> #include "malloc-spapr.h"
>
> -#include "qemu-common.h"
> -
> #define SPAPR_PAGE_SIZE 4096
>
> /* Memory must be a multiple of 256 MB,
> diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c
> index f708b0143262..f0c8f950c805 100644
> --- a/tests/qtest/libqos/malloc.c
> +++ b/tests/qtest/libqos/malloc.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
> #include "malloc.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> typedef struct MemBlock {
> diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
> index dc5566ccfd60..7b5890dcc487 100644
> --- a/tests/qtest/libqtest.c
> +++ b/tests/qtest/libqtest.c
> @@ -21,7 +21,6 @@
> #include <sys/un.h>
>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> #include "qapi/error.h"
> diff --git a/tests/qtest/machine-none-test.c
> b/tests/qtest/machine-none-test.c
> index 138101b46ac2..8ca18074b9f9 100644
> --- a/tests/qtest/machine-none-test.c
> +++ b/tests/qtest/machine-none-test.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> diff --git a/tests/qtest/npcm7xx_emc-test.c
> b/tests/qtest/npcm7xx_emc-test.c
> index 7c435ac91576..a353fef0ca13 100644
> --- a/tests/qtest/npcm7xx_emc-test.c
> +++ b/tests/qtest/npcm7xx_emc-test.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqos.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qnum.h"
> diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
> index 32bbae33c597..3cb47d2c5496 100644
> --- a/tests/qtest/pxe-test.c
> +++ b/tests/qtest/pxe-test.c
> @@ -14,7 +14,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "boot-sector.h"
> #include "libqos/libqos-spapr.h"
> diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
> index eb34af843b79..6b162e12b5aa 100644
> --- a/tests/qtest/qom-test.c
> +++ b/tests/qtest/qom-test.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> #include "qemu/cutils.h"
> diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
> index 450604926492..8fa3313cc333 100644
> --- a/tests/qtest/rtl8139-test.c
> +++ b/tests/qtest/rtl8139-test.c
> @@ -11,7 +11,6 @@
> #include "libqtest-single.h"
> #include "libqos/pci-pc.h"
> #include "qemu/timer.h"
> -#include "qemu-common.h"
>
> /* Tests only initialization so far. TODO: Replace with functional tests
> */
> static void nop(void)
> diff --git a/tests/qtest/test-filter-mirror.c
> b/tests/qtest/test-filter-mirror.c
> index da4f94de727a..fdf66cebd62f 100644
> --- a/tests/qtest/test-filter-mirror.c
> +++ b/tests/qtest/test-filter-mirror.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/test-filter-redirector.c
> b/tests/qtest/test-filter-redirector.c
> index fc16cf7e8d5f..339d3c04cedc 100644
> --- a/tests/qtest/test-filter-redirector.c
> +++ b/tests/qtest/test-filter-redirector.c
> @@ -51,7 +51,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/test-x86-cpuid-compat.c
> b/tests/qtest/test-x86-cpuid-compat.c
> index 39138db7744b..b39c9055b309 100644
> --- a/tests/qtest/test-x86-cpuid-compat.c
> +++ b/tests/qtest/test-x86-cpuid-compat.c
> @@ -1,5 +1,4 @@
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> #include "qapi/qmp/qnum.h"
> diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
> index a71395849f33..fc9f2b94982d 100644
> --- a/tests/qtest/virtio-net-test.c
> +++ b/tests/qtest/virtio-net-test.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> #include "qemu/iov.h"
> #include "qemu/module.h"
> diff --git a/tests/unit/check-qjson.c b/tests/unit/check-qjson.c
> index c845f91d4377..c4e0f851bfc6 100644
> --- a/tests/unit/check-qjson.c
> +++ b/tests/unit/check-qjson.c
> @@ -21,7 +21,6 @@
> #include "qapi/qmp/qnum.h"
> #include "qapi/qmp/qstring.h"
> #include "qemu/unicode.h"
> -#include "qemu-common.h"
>
> static QString *from_json_str(const char *jstr, bool single, Error **errp)
> {
> diff --git a/tests/unit/check-qnull.c b/tests/unit/check-qnull.c
> index ebf21db83ccc..5ceacc65d7f3 100644
> --- a/tests/unit/check-qnull.c
> +++ b/tests/unit/check-qnull.c
> @@ -9,7 +9,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qnull.h"
> -#include "qemu-common.h"
> #include "qapi/qobject-input-visitor.h"
> #include "qapi/qobject-output-visitor.h"
> #include "qapi/error.h"
> diff --git a/tests/unit/check-qnum.c b/tests/unit/check-qnum.c
> index b85fca23029e..bf7fe45bacc4 100644
> --- a/tests/unit/check-qnum.c
> +++ b/tests/unit/check-qnum.c
> @@ -15,7 +15,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qnum.h"
> -#include "qemu-common.h"
>
> /*
> * Public Interface test-cases
> diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c
> index 7903ebf4cf80..0ed094e55f3a 100644
> --- a/tests/unit/check-qobject.c
> +++ b/tests/unit/check-qobject.c
> @@ -15,7 +15,6 @@
> #include "qapi/qmp/qnull.h"
> #include "qapi/qmp/qnum.h"
> #include "qapi/qmp/qstring.h"
> -#include "qemu-common.h"
>
> #include <math.h>
>
> diff --git a/tests/unit/check-qstring.c b/tests/unit/check-qstring.c
> index 4bf977209342..bd861f4f8b47 100644
> --- a/tests/unit/check-qstring.c
> +++ b/tests/unit/check-qstring.c
> @@ -12,7 +12,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qstring.h"
> -#include "qemu-common.h"
>
> /*
> * Public Interface test-cases
> diff --git a/tests/unit/socket-helpers.c b/tests/unit/socket-helpers.c
> index ef31664d0224..0a9e090a68dd 100644
> --- a/tests/unit/socket-helpers.c
> +++ b/tests/unit/socket-helpers.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "socket-helpers.h"
>
> diff --git a/tests/unit/test-clone-visitor.c
> b/tests/unit/test-clone-visitor.c
> index 5d48e125b8e4..ce67585305f6 100644
> --- a/tests/unit/test-clone-visitor.c
> +++ b/tests/unit/test-clone-visitor.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/clone-visitor.h"
> #include "test-qapi-visit.h"
>
> diff --git a/tests/unit/test-forward-visitor.c
> b/tests/unit/test-forward-visitor.c
> index 348f7e4e81c8..01de15522711 100644
> --- a/tests/unit/test-forward-visitor.c
> +++ b/tests/unit/test-forward-visitor.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/forward-visitor.h"
> #include "qapi/qobject-input-visitor.h"
> #include "qapi/error.h"
> diff --git a/tests/unit/test-iov.c b/tests/unit/test-iov.c
> index 5371066fb6a4..0d2ba9ba87d9 100644
> --- a/tests/unit/test-iov.c
> +++ b/tests/unit/test-iov.c
> @@ -1,5 +1,4 @@
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
>
> diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c
> index ccb819f193d9..05703a4e515f 100644
> --- a/tests/unit/test-logging.c
> +++ b/tests/unit/test-logging.c
> @@ -27,7 +27,6 @@
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/log.h"
>
> diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c
> index d58c3b78f208..7d961d716afb 100644
> --- a/tests/unit/test-qmp-event.c
> +++ b/tests/unit/test-qmp-event.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/compat-policy.h"
> #include "qapi/error.h"
> #include "qapi/qmp/qbool.h"
> diff --git a/tests/unit/test-qobject-input-visitor.c
> b/tests/unit/test-qobject-input-visitor.c
> index 22538f814099..aed08eaebcee 100644
> --- a/tests/unit/test-qobject-input-visitor.c
> +++ b/tests/unit/test-qobject-input-visitor.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/qapi-visit-introspect.h"
> #include "qapi/qobject-input-visitor.h"
> diff --git a/tests/unit/test-qobject-output-visitor.c
> b/tests/unit/test-qobject-output-visitor.c
> index 6af4c33eec15..66b27fad66bb 100644
> --- a/tests/unit/test-qobject-output-visitor.c
> +++ b/tests/unit/test-qobject-output-visitor.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/qobject-output-visitor.h"
> #include "test-qapi-visit.h"
> diff --git a/tests/unit/test-string-input-visitor.c
> b/tests/unit/test-string-input-visitor.c
> index 249faafc9d79..25094d3ffcef 100644
> --- a/tests/unit/test-string-input-visitor.c
> +++ b/tests/unit/test-string-input-visitor.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/string-input-visitor.h"
> #include "test-qapi-visit.h"
> diff --git a/tests/unit/test-string-output-visitor.c
> b/tests/unit/test-string-output-visitor.c
> index e2bedc5c7c92..7ef305361eb7 100644
> --- a/tests/unit/test-string-output-visitor.c
> +++ b/tests/unit/test-string-output-visitor.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/string-output-visitor.h"
> #include "test-qapi-visit.h"
> diff --git a/tests/unit/test-thread-pool.c b/tests/unit/test-thread-pool.c
> index 70dc6314a1ef..6020e65d6986 100644
> --- a/tests/unit/test-thread-pool.c
> +++ b/tests/unit/test-thread-pool.c
> @@ -1,5 +1,4 @@
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "block/aio.h"
> #include "block/thread-pool.h"
> #include "block/block.h"
> diff --git a/tests/unit/test-util-sockets.c
> b/tests/unit/test-util-sockets.c
> index 896247e3ed36..63909ccb2b54 100644
> --- a/tests/unit/test-util-sockets.c
> +++ b/tests/unit/test-util-sockets.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "qapi/error.h"
> #include "socket-helpers.h"
> diff --git a/tests/unit/test-visitor-serialization.c
> b/tests/unit/test-visitor-serialization.c
> index 462995864775..907263d0307c 100644
> --- a/tests/unit/test-visitor-serialization.c
> +++ b/tests/unit/test-visitor-serialization.c
> @@ -14,7 +14,6 @@
> #include "qemu/osdep.h"
> #include <float.h>
>
> -#include "qemu-common.h"
> #include "test-qapi-visit.h"
> #include "qapi/error.h"
> #include "qapi/qmp/qjson.h"
> diff --git a/tests/unit/test-xbzrle.c b/tests/unit/test-xbzrle.c
> index 795d6f1cbabb..ef951b6e5405 100644
> --- a/tests/unit/test-xbzrle.c
> +++ b/tests/unit/test-xbzrle.c
> @@ -11,7 +11,6 @@
> *
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "../migration/xbzrle.h"
>
> diff --git a/ui/gtk-clipboard.c b/ui/gtk-clipboard.c
> index d58fd761abdf..8d8a636fd1fa 100644
> --- a/ui/gtk-clipboard.c
> +++ b/ui/gtk-clipboard.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/main-loop.h"
>
> #include "ui/gtk.h"
> diff --git a/ui/keymaps.c b/ui/keymaps.c
> index d4a647464bbf..6ceaa97085ab 100644
> --- a/ui/keymaps.c
> +++ b/ui/keymaps.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "keymaps.h"
> #include "trace.h"
> diff --git a/ui/vdagent.c b/ui/vdagent.c
> index 02861edfb13c..aa6167f0b492 100644
> --- a/ui/vdagent.c
> +++ b/ui/vdagent.c
> @@ -1,6 +1,5 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "include/qemu-common.h"
> #include "chardev/char.h"
> #include "qemu/buffer.h"
> #include "qemu/option.h"
> diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c
> index d48f75eb1ab4..8aeadfaa218a 100644
> --- a/ui/vnc-clipboard.c
> +++ b/ui/vnc-clipboard.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "vnc.h"
> #include "vnc-jobs.h"
>
> diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
> index 7b86a4713dfd..5a4b8a4fc0f6 100644
> --- a/ui/vnc-enc-tight.c
> +++ b/ui/vnc-enc-tight.c
> @@ -34,7 +34,7 @@
>
> #ifdef CONFIG_VNC_PNG
> /* The following define is needed by pngconf.h. Otherwise it won't
> compile,
> - because setjmp.h was already included by qemu-common.h. */
> + because setjmp.h was already included by osdep.h. */
> #define PNG_SKIP_SETJMP_CHECK
> #include <png.h>
> #endif
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 5cbeebb8d1fd..6261d922953b 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "vnc.h"
> #include "vnc-jobs.h"
> #include "trace.h"
> diff --git a/util/aio-win32.c b/util/aio-win32.c
> index 7aac89df3a30..44003d645ecd 100644
> --- a/util/aio-win32.c
> +++ b/util/aio-win32.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "block/block.h"
> #include "qemu/main-loop.h"
> #include "qemu/queue.h"
> diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
> index e99b8a4f9c8c..e2690c5f4142 100644
> --- a/util/coroutine-sigaltstack.c
> +++ b/util/coroutine-sigaltstack.c
> @@ -27,7 +27,6 @@
> #endif
> #include "qemu/osdep.h"
> #include <pthread.h>
> -#include "qemu-common.h"
> #include "qemu/coroutine_int.h"
>
> #ifdef CONFIG_SAFESTACK
> diff --git a/util/coroutine-win32.c b/util/coroutine-win32.c
> index de6bd4fd3e4e..c196f956d27e 100644
> --- a/util/coroutine-win32.c
> +++ b/util/coroutine-win32.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/coroutine_int.h"
>
> typedef struct
> diff --git a/util/cutils.c b/util/cutils.c
> index aaf2ced29142..a01a3a754049 100644
> --- a/util/cutils.c
> +++ b/util/cutils.c
> @@ -26,7 +26,6 @@
> #include "qemu/host-utils.h"
> #include <math.h>
>
> -#include "qemu-common.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
> index 16294e98d434..8dc30c51414d 100644
> --- a/util/event_notifier-posix.c
> +++ b/util/event_notifier-posix.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/event_notifier.h"
> #include "qemu/main-loop.h"
> diff --git a/util/event_notifier-win32.c b/util/event_notifier-win32.c
> index 62c53b0a9909..9352da4699c7 100644
> --- a/util/event_notifier-win32.c
> +++ b/util/event_notifier-win32.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/event_notifier.h"
> #include "qemu/main-loop.h"
>
> diff --git a/util/iov.c b/util/iov.c
> index 58c7b3eeee5f..22d6996ccec0 100644
> --- a/util/iov.c
> +++ b/util/iov.c
> @@ -17,7 +17,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
> #include "qemu/cutils.h"
> diff --git a/util/osdep.c b/util/osdep.c
> index 97dc9bc65b45..1ea2398686ee 100644
> --- a/util/osdep.c
> +++ b/util/osdep.c
> @@ -23,7 +23,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/sockets.h"
> #include "qemu/error-report.h"
> diff --git a/util/oslib-posix.c b/util/oslib-posix.c
> index fae25be3e779..c0125cd572ed 100644
> --- a/util/oslib-posix.c
> +++ b/util/oslib-posix.c
> @@ -31,7 +31,6 @@
>
> #include <glib/gprintf.h>
>
> -#include "qemu-common.h"
> #include "sysemu/sysemu.h"
> #include "trace.h"
> #include "qapi/error.h"
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index 91d2f45cfe1f..b69e50b3f182 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -32,7 +32,6 @@
>
> #include "qemu/osdep.h"
> #include <windows.h>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/main-loop.h"
> #include "trace.h"
> diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
> index 7f5839cb769e..d791932d63b9 100644
> --- a/util/qemu-coroutine-io.c
> +++ b/util/qemu-coroutine-io.c
> @@ -23,7 +23,6 @@
> * THE SOFTWARE.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "qemu/coroutine.h"
> #include "qemu/iov.h"
> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
> index e8f45a7d30a5..13b5b197f9ea 100644
> --- a/util/qemu-sockets.c
> +++ b/util/qemu-sockets.c
> @@ -21,7 +21,6 @@
> #include <linux/vm_sockets.h>
> #endif /* CONFIG_AF_VSOCK */
>
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "qapi/clone-visitor.h"
> #include "qapi/error.h"
> diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c
> index 52eb19f3511a..a2d5a6e8259f 100644
> --- a/util/qemu-thread-win32.c
> +++ b/util/qemu-thread-win32.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/thread.h"
> #include "qemu/notify.h"
> #include "qemu-thread-common.h"
> diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
> index df66d09393af..b4c15556c2c4 100755
> --- a/target/xtensa/import_core.sh
> +++ b/target/xtensa/import_core.sh
> @@ -42,7 +42,6 @@ cat <<EOF > "${TARGET}.c"
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-$NAME/core-isa.h"
> --
> 2.35.1.273.ge6ebfd0e8cbb
>
>
[-- Attachment #2: Type: text/html, Size: 123529 bytes --]
^ permalink raw reply [flat|nested] 79+ messages in thread* Re: [PATCH 32/32] Remove qemu-common.h include from most units
@ 2022-04-05 15:24 ` Warner Losh
0 siblings, 0 replies; 79+ messages in thread
From: Warner Losh @ 2022-04-05 15:24 UTC (permalink / raw)
To: Marc-André Lureau
Cc: QEMU Developers, Cameron Esfahani, Roman Bolshakov,
Richard Henderson, Paolo Bonzini, Gerd Hoffmann,
David Hildenbrand, Igor Mammedov, Stefan Berger, Kevin Wolf,
Hanna Reitz, Aarushi Mehta, Julia Suvorova, Stefan Hajnoczi,
Stefano Garzarella, Kyle Evans, Eduardo Habkost,
Marcel Apfelbaum, Philippe Mathieu-Daudé,
Yanan Wang, Daniel P. Berrangé,
Greg Kurz, Christian Schoenebeck, Alex Bennée,
Michael Rolnik, Mark Cave-Ayland, Michael S. Tsirkin,
Peter Maydell, Helge Deller, Cédric Le Goater,
Daniel Henrique Barboza, David Gibson, Thomas Huth,
Laurent Vivier, Edgar E. Iglesias, Huacai Chen, Jiaxun Yang,
Hervé Poussineau, Aleksandar Rikalo, Aurelien Jarno,
Jason Wang, Subbaraya Sundeep, Havard Skinnemoen, Tyrone Ting,
Chris Wulff, Marek Vasut, BALATON Zoltan, Elena Ufimtseva,
Jagannathan Raman, John G Johnson, Alexey Kardashevskiy,
Palmer Dabbelt, Alistair Francis, Bin Meng, Yoshinori Sato,
Christian Borntraeger, Cornelia Huck, Halil Pasic, Eric Farman,
Fabien Chouteau, KONRAD Frederic, Artyom Tarasenko, Eric Auger,
Taylor Simpson, Markus Armbruster, Zhang Chen, Li Zhijian,
Stefan Weil, Michael Roth, Alexander Graf, Wenchao Wang,
Colin Xu, Marcelo Tosatti, Kamil Rytarowski, Reinoud Zandijk,
Sunil Muthuswamy, Bastian Koppelmann, Max Filippov, Ani Sinha,
John Snow, Andrew Jeffery, Joel Stanley, Alexander Bulekov,
Bandan Das, Darren Kenny, Qiuhao Li, Corey Minyard, Fam Zheng,
open list:raw, open list:ARM PrimeCell and...,
open list:sPAPR (pseries),
open list:RISC-V TCG CPUs, open list:S390-ccw boot,
open list:Overall KVM CPUs, open list:X86 HAXM CPUs
[-- Attachment #1: Type: text/plain, Size: 100141 bytes --]
On Wed, Mar 23, 2022 at 10:02 AM <marcandre.lureau@redhat.com> wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>
Reviewed by: Warner Losh <imp@bsdimp.com>
(at least for the bsd-user changes)
It might be a good idea to have a sentence or two about why this change is
happening, since the 'title' covers the 'what is happening' well..
Warner
> include/qemu-common.h | 9 ---------
> accel/hvf/hvf-all.c | 1 -
> accel/tcg/cpu-exec.c | 1 -
> accel/tcg/tcg-accel-ops-icount.c | 1 -
> accel/tcg/tcg-accel-ops-mttcg.c | 1 -
> accel/tcg/tcg-accel-ops-rr.c | 1 -
> accel/tcg/tcg-accel-ops.c | 1 -
> accel/tcg/tcg-all.c | 1 -
> accel/tcg/translate-all.c | 1 -
> audio/audio_win_int.c | 1 -
> backends/hostmem-epc.c | 1 -
> backends/tpm/tpm_passthrough.c | 1 -
> block/file-posix.c | 1 -
> block/io_uring.c | 1 -
> bsd-user/freebsd/os-syscall.c | 1 -
> bsd-user/mmap.c | 1 -
> chardev/char-fd.c | 1 -
> chardev/char-pipe.c | 1 -
> chardev/char-pty.c | 1 -
> cpu.c | 1 -
> crypto/cipher-afalg.c | 1 -
> crypto/hash-afalg.c | 1 -
> dump/dump.c | 1 -
> dump/win_dump.c | 1 -
> fsdev/virtfs-proxy-helper.c | 1 -
> gdbstub.c | 1 -
> hw/9pfs/9p-proxy.c | 1 -
> hw/alpha/dp264.c | 1 -
> hw/avr/boot.c | 1 -
> hw/core/loader.c | 1 -
> hw/display/artist.c | 1 -
> hw/display/cg3.c | 1 -
> hw/display/tcx.c | 1 -
> hw/display/virtio-gpu-udmabuf.c | 1 -
> hw/dma/pl330.c | 1 -
> hw/hppa/machine.c | 1 -
> hw/i386/pc_sysfw.c | 1 -
> hw/i386/x86.c | 1 -
> hw/input/vhost-user-input.c | 1 -
> hw/intc/xics_kvm.c | 1 -
> hw/m68k/mcf5208.c | 1 -
> hw/m68k/q800.c | 1 -
> hw/m68k/virt.c | 1 -
> hw/microblaze/boot.c | 1 -
> hw/mips/fuloong2e.c | 1 -
> hw/mips/jazz.c | 1 -
> hw/mips/loongson3_virt.c | 1 -
> hw/mips/malta.c | 1 -
> hw/mips/mipssim.c | 1 -
> hw/misc/sbsa_ec.c | 1 -
> hw/net/fsl_etsec/etsec.c | 1 -
> hw/net/fsl_etsec/rings.c | 1 -
> hw/net/msf2-emac.c | 1 -
> hw/net/npcm7xx_emc.c | 1 -
> hw/nios2/boot.c | 1 -
> hw/nios2/generic_nommu.c | 1 -
> hw/nvram/fw_cfg.c | 1 -
> hw/pci-host/mv64361.c | 1 -
> hw/pci-host/pnv_phb3.c | 1 -
> hw/pci-host/pnv_phb3_msi.c | 1 -
> hw/pci-host/pnv_phb3_pbcq.c | 1 -
> hw/pci-host/pnv_phb4.c | 1 -
> hw/pci-host/pnv_phb4_pec.c | 1 -
> hw/pci-host/raven.c | 1 -
> hw/pci-host/remote.c | 1 -
> hw/pci/pci.c | 1 -
> hw/ppc/e500.c | 1 -
> hw/ppc/mac_newworld.c | 1 -
> hw/ppc/mac_oldworld.c | 1 -
> hw/ppc/pegasos2.c | 1 -
> hw/ppc/pnv.c | 1 -
> hw/ppc/pnv_bmc.c | 1 -
> hw/ppc/ppc405_boards.c | 1 -
> hw/ppc/ppc440_bamboo.c | 1 -
> hw/ppc/sam460ex.c | 1 -
> hw/ppc/spapr.c | 1 -
> hw/ppc/spapr_numa.c | 1 -
> hw/ppc/spapr_pci_nvlink2.c | 1 -
> hw/ppc/spapr_tpm_proxy.c | 1 -
> hw/ppc/spapr_vof.c | 1 -
> hw/ppc/virtex_ml507.c | 1 -
> hw/ppc/vof.c | 1 -
> hw/remote/iohub.c | 1 -
> hw/remote/machine.c | 1 -
> hw/remote/memory.c | 1 -
> hw/remote/message.c | 1 -
> hw/remote/mpqemu-link.c | 1 -
> hw/remote/proxy-memory-listener.c | 1 -
> hw/remote/proxy.c | 1 -
> hw/remote/remote-obj.c | 1 -
> hw/riscv/boot.c | 1 -
> hw/rx/rx-gdbsim.c | 1 -
> hw/s390x/ipl.c | 1 -
> hw/sd/sd.c | 1 -
> hw/sparc/leon3.c | 1 -
> hw/sparc/sun4m.c | 1 -
> hw/sparc64/sun4u.c | 1 -
> hw/usb/dev-mtp.c | 1 -
> hw/virtio/virtio-iommu.c | 1 -
> hw/virtio/virtio-mem.c | 1 -
> hw/virtio/virtio-pmem.c | 1 -
> io/channel-socket.c | 1 -
> linux-user/aarch64/cpu_loop.c | 1 -
> linux-user/alpha/cpu_loop.c | 1 -
> linux-user/arm/cpu_loop.c | 1 -
> linux-user/cris/cpu_loop.c | 1 -
> linux-user/hexagon/cpu_loop.c | 1 -
> linux-user/i386/cpu_loop.c | 1 -
> linux-user/m68k/cpu_loop.c | 1 -
> linux-user/microblaze/cpu_loop.c | 1 -
> linux-user/mips/cpu_loop.c | 1 -
> linux-user/openrisc/cpu_loop.c | 1 -
> linux-user/ppc/cpu_loop.c | 1 -
> linux-user/riscv/cpu_loop.c | 1 -
> linux-user/s390x/cpu_loop.c | 1 -
> linux-user/sh4/cpu_loop.c | 1 -
> linux-user/sparc/cpu_loop.c | 1 -
> linux-user/uname.c | 1 -
> monitor/qmp-cmds.c | 1 -
> net/colo-compare.c | 1 -
> net/net.c | 1 -
> net/socket.c | 1 -
> net/tap-bsd.c | 1 -
> net/tap-linux.c | 1 -
> net/tap-solaris.c | 1 -
> net/tap-win32.c | 1 -
> net/tap.c | 1 -
> net/vde.c | 1 -
> os-posix.c | 1 -
> os-win32.c | 1 -
> page-vary-common.c | 1 -
> qga/commands-posix.c | 1 -
> softmmu/cpu-throttle.c | 1 -
> softmmu/cpu-timers.c | 1 -
> softmmu/cpus.c | 1 -
> softmmu/datadir.c | 1 -
> softmmu/icount.c | 1 -
> softmmu/runstate.c | 1 -
> stubs/monitor-core.c | 1 -
> target/arm/hvf/hvf.c | 1 -
> target/arm/kvm.c | 1 -
> target/arm/kvm64.c | 1 -
> target/hexagon/gdbstub.c | 1 -
> target/i386/hax/hax-all.c | 1 -
> target/i386/hvf/hvf.c | 1 -
> target/i386/hvf/x86.c | 1 -
> target/i386/hvf/x86_cpuid.c | 1 -
> target/i386/hvf/x86_decode.c | 1 -
> target/i386/hvf/x86_descr.c | 1 -
> target/i386/hvf/x86_emu.c | 1 -
> target/i386/hvf/x86_flags.c | 1 -
> target/i386/hvf/x86_mmu.c | 1 -
> target/i386/hvf/x86_task.c | 1 -
> target/i386/hvf/x86hvf.c | 1 -
> target/i386/kvm/sev-stub.c | 1 -
> target/i386/nvmm/nvmm-all.c | 1 -
> target/i386/whpx/whpx-all.c | 1 -
> target/i386/whpx/whpx-apic.c | 1 -
> target/mips/kvm.c | 1 -
> target/nios2/nios2-semi.c | 1 -
> target/ppc/kvm.c | 1 -
> target/riscv/kvm.c | 1 -
> target/rx/cpu.c | 1 -
> target/rx/gdbstub.c | 1 -
> target/s390x/kvm/kvm.c | 1 -
> target/s390x/tcg/vec_fpu_helper.c | 1 -
> target/s390x/tcg/vec_int_helper.c | 1 -
> target/s390x/tcg/vec_string_helper.c | 1 -
> target/tricore/gdbstub.c | 1 -
> target/xtensa/core-de233_fpu.c | 1 -
> target/xtensa/core-dsp3400.c | 1 -
> target/xtensa/core-test_mmuhifi_c3.c | 1 -
> tcg/tci.c | 1 -
> tests/qtest/acpi-utils.c | 1 -
> tests/qtest/ahci-test.c | 1 -
> tests/qtest/aspeed_hace-test.c | 1 -
> tests/qtest/bios-tables-test.c | 1 -
> tests/qtest/boot-sector.c | 1 -
> tests/qtest/cpu-plug-test.c | 1 -
> tests/qtest/dbus-display-test.c | 1 -
> tests/qtest/dbus-vmstate-test.c | 1 -
> tests/qtest/device-introspect-test.c | 1 -
> tests/qtest/e1000e-test.c | 2 --
> tests/qtest/erst-test.c | 1 -
> tests/qtest/fdc-test.c | 1 -
> tests/qtest/fuzz/qos_fuzz.c | 1 -
> tests/qtest/hd-geo-test.c | 1 -
> tests/qtest/ide-test.c | 1 -
> tests/qtest/ipmi-bt-test.c | 1 -
> tests/qtest/ivshmem-test.c | 1 -
> tests/qtest/libqos/ahci.c | 1 -
> tests/qtest/libqos/malloc-pc.c | 2 --
> tests/qtest/libqos/malloc-spapr.c | 2 --
> tests/qtest/libqos/malloc.c | 1 -
> tests/qtest/libqtest.c | 1 -
> tests/qtest/machine-none-test.c | 1 -
> tests/qtest/npcm7xx_emc-test.c | 1 -
> tests/qtest/pxe-test.c | 1 -
> tests/qtest/qom-test.c | 1 -
> tests/qtest/rtl8139-test.c | 1 -
> tests/qtest/test-filter-mirror.c | 1 -
> tests/qtest/test-filter-redirector.c | 1 -
> tests/qtest/test-x86-cpuid-compat.c | 1 -
> tests/qtest/virtio-net-test.c | 1 -
> tests/unit/check-qjson.c | 1 -
> tests/unit/check-qnull.c | 1 -
> tests/unit/check-qnum.c | 1 -
> tests/unit/check-qobject.c | 1 -
> tests/unit/check-qstring.c | 1 -
> tests/unit/socket-helpers.c | 1 -
> tests/unit/test-clone-visitor.c | 1 -
> tests/unit/test-forward-visitor.c | 1 -
> tests/unit/test-iov.c | 1 -
> tests/unit/test-logging.c | 1 -
> tests/unit/test-qmp-event.c | 1 -
> tests/unit/test-qobject-input-visitor.c | 1 -
> tests/unit/test-qobject-output-visitor.c | 1 -
> tests/unit/test-string-input-visitor.c | 1 -
> tests/unit/test-string-output-visitor.c | 1 -
> tests/unit/test-thread-pool.c | 1 -
> tests/unit/test-util-sockets.c | 1 -
> tests/unit/test-visitor-serialization.c | 1 -
> tests/unit/test-xbzrle.c | 1 -
> ui/gtk-clipboard.c | 1 -
> ui/keymaps.c | 1 -
> ui/vdagent.c | 1 -
> ui/vnc-clipboard.c | 1 -
> ui/vnc-enc-tight.c | 2 +-
> ui/vnc.c | 1 -
> util/aio-win32.c | 1 -
> util/coroutine-sigaltstack.c | 1 -
> util/coroutine-win32.c | 1 -
> util/cutils.c | 1 -
> util/event_notifier-posix.c | 1 -
> util/event_notifier-win32.c | 1 -
> util/iov.c | 1 -
> util/osdep.c | 1 -
> util/oslib-posix.c | 1 -
> util/oslib-win32.c | 1 -
> util/qemu-coroutine-io.c | 1 -
> util/qemu-sockets.c | 1 -
> util/qemu-thread-win32.c | 1 -
> target/xtensa/import_core.sh | 1 -
> 243 files changed, 1 insertion(+), 254 deletions(-)
>
> diff --git a/include/qemu-common.h b/include/qemu-common.h
> index 0498acd16b78..ba32cc8b1f39 100644
> --- a/include/qemu-common.h
> +++ b/include/qemu-common.h
> @@ -1,12 +1,3 @@
> -/*
> - * This file is supposed to be included only by .c files. No header file
> should
> - * depend on qemu-common.h, as this would easily lead to circular header
> - * dependencies.
> - *
> - * If a header file uses a definition from qemu-common.h, that definition
> - * must be moved to a separate header file, and the header that uses it
> - * must include that header.
> - */
> #ifndef QEMU_COMMON_H
> #define QEMU_COMMON_H
>
> diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c
> index f185b0830a75..0043f4d308ba 100644
> --- a/accel/hvf/hvf-all.c
> +++ b/accel/hvf/hvf-all.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "sysemu/hvf.h"
> #include "sysemu/hvf_int.h"
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index c997c2e8e015..083ada76b124 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/qemu-print.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-machine.h"
> diff --git a/accel/tcg/tcg-accel-ops-icount.c
> b/accel/tcg/tcg-accel-ops-icount.c
> index bdaf2c943b49..6436cd9349a3 100644
> --- a/accel/tcg/tcg-accel-ops-icount.c
> +++ b/accel/tcg/tcg-accel-ops-icount.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops-mttcg.c
> b/accel/tcg/tcg-accel-ops-mttcg.c
> index ea2b741deb51..d50239e0e28f 100644
> --- a/accel/tcg/tcg-accel-ops-mttcg.c
> +++ b/accel/tcg/tcg-accel-ops-mttcg.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
> index b287110766ef..1a72149f0e46 100644
> --- a/accel/tcg/tcg-accel-ops-rr.c
> +++ b/accel/tcg/tcg-accel-ops-rr.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c
> index ea7dcad674cf..684dc5a1371f 100644
> --- a/accel/tcg/tcg-accel-ops.c
> +++ b/accel/tcg/tcg-accel-ops.c
> @@ -26,7 +26,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/replay.h"
> #include "sysemu/cpu-timers.h"
> diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
> index d6336a9c966d..47952eecd779 100644
> --- a/accel/tcg/tcg-all.c
> +++ b/accel/tcg/tcg-all.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sysemu/tcg.h"
> #include "sysemu/cpu-timers.h"
> #include "tcg/tcg.h"
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index 5971cd53ab9f..a6e03c1e50b2 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #define NO_CPU_IO_DEFS
> #include "trace.h"
> diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
> index 5ea8157dfcc8..316f118f5099 100644
> --- a/audio/audio_win_int.c
> +++ b/audio/audio_win_int.c
> @@ -1,7 +1,6 @@
> /* public domain */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #define AUDIO_CAP "win-int"
> #include <windows.h>
> diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c
> index b47f98b6a3aa..037292d2672f 100644
> --- a/backends/hostmem-epc.c
> +++ b/backends/hostmem-epc.c
> @@ -12,7 +12,6 @@
> #include <sys/ioctl.h>
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qom/object_interfaces.h"
> #include "qapi/error.h"
> #include "sysemu/hostmem.h"
> diff --git a/backends/tpm/tpm_passthrough.c
> b/backends/tpm/tpm_passthrough.c
> index d5558fae6cc5..5a2f74db1b38 100644
> --- a/backends/tpm/tpm_passthrough.c
> +++ b/backends/tpm/tpm_passthrough.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/module.h"
> #include "qemu/sockets.h"
> diff --git a/block/file-posix.c b/block/file-posix.c
> index 61b02d85ebf1..bfd9b2111143 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/block/io_uring.c b/block/io_uring.c
> index 782afdb433e1..0b401512b973 100644
> --- a/block/io_uring.c
> +++ b/block/io_uring.c
> @@ -10,7 +10,6 @@
> */
> #include "qemu/osdep.h"
> #include <liburing.h>
> -#include "qemu-common.h"
> #include "block/aio.h"
> #include "qemu/queue.h"
> #include "block/block.h"
> diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
> index a17ff9f6ecce..d272478e7b0a 100644
> --- a/bsd-user/freebsd/os-syscall.c
> +++ b/bsd-user/freebsd/os-syscall.c
> @@ -37,7 +37,6 @@
> #include <utime.h>
>
> #include "qemu.h"
> -#include "qemu-common.h"
> #include "signal-common.h"
> #include "user/syscall-trace.h"
>
> diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> index 07aa0a634dff..e54e26de17b0 100644
> --- a/bsd-user/mmap.c
> +++ b/bsd-user/mmap.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
>
> #include "qemu.h"
> -#include "qemu-common.h"
>
> static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
> static __thread int mmap_lock_count;
> diff --git a/chardev/char-fd.c b/chardev/char-fd.c
> index 93c56913b49a..6ec9682b22f2 100644
> --- a/chardev/char-fd.c
> +++ b/chardev/char-fd.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/module.h"
> #include "qemu/sockets.h"
> #include "qapi/error.h"
> diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
> index 7eca5d9a56ae..66d3b8509183 100644
> --- a/chardev/char-pipe.c
> +++ b/chardev/char-pipe.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/main-loop.h"
> #include "qemu/module.h"
> diff --git a/chardev/char-pty.c b/chardev/char-pty.c
> index d73d8b23903d..1e2863f532a8 100644
> --- a/chardev/char-pty.c
> +++ b/chardev/char-pty.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "chardev/char.h"
> #include "io/channel-file.h"
> diff --git a/cpu.c b/cpu.c
> index ab2c7c81e460..0fef70e18e74 100644
> --- a/cpu.c
> +++ b/cpu.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
>
> #include "exec/target_page.h"
> diff --git a/crypto/cipher-afalg.c b/crypto/cipher-afalg.c
> index c55cd28bf01c..3df8fc54c051 100644
> --- a/crypto/cipher-afalg.c
> +++ b/crypto/cipher-afalg.c
> @@ -12,7 +12,6 @@
> */
> #include "qemu/osdep.h"
> #include "qemu/sockets.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "crypto/cipher.h"
> #include "cipherpriv.h"
> diff --git a/crypto/hash-afalg.c b/crypto/hash-afalg.c
> index 4ac18c7c1db7..3ebea392920d 100644
> --- a/crypto/hash-afalg.c
> +++ b/crypto/hash-afalg.c
> @@ -13,7 +13,6 @@
> #include "qemu/osdep.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "crypto/hash.h"
> #include "crypto/hmac.h"
> diff --git a/dump/dump.c b/dump/dump.c
> index 5d71c47d06aa..e766ce1d7d91 100644
> --- a/dump/dump.c
> +++ b/dump/dump.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "elf.h"
> #include "exec/hwaddr.h"
> diff --git a/dump/win_dump.c b/dump/win_dump.c
> index c5eb5a9aacd7..fbdbb7bd93a6 100644
> --- a/dump/win_dump.c
> +++ b/dump/win_dump.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "elf.h"
> #include "exec/hwaddr.h"
> diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
> index d06a0f7b8326..2dde27922fe2 100644
> --- a/fsdev/virtfs-proxy-helper.c
> +++ b/fsdev/virtfs-proxy-helper.c
> @@ -21,7 +21,6 @@
> #include <linux/magic.h>
> #endif
> #include <cap-ng.h>
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "qemu/xattr.h"
> #include "9p-iov-marshal.h"
> diff --git a/gdbstub.c b/gdbstub.c
> index c8375e3c3ffe..2c804d506629 100644
> --- a/gdbstub.c
> +++ b/gdbstub.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "qemu/ctype.h"
> diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
> index 4c5e0fc217eb..99d115ff0db4 100644
> --- a/hw/9pfs/9p-proxy.c
> +++ b/hw/9pfs/9p-proxy.c
> @@ -18,7 +18,6 @@
> #include "qemu/osdep.h"
> #include <sys/socket.h>
> #include <sys/un.h>
> -#include "qemu-common.h"
> #include "9p.h"
> #include "qapi/error.h"
> #include "qemu/cutils.h"
> diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
> index c78ed96d0eca..f4349eba83fb 100644
> --- a/hw/alpha/dp264.c
> +++ b/hw/alpha/dp264.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "elf.h"
> #include "hw/loader.h"
> diff --git a/hw/avr/boot.c b/hw/avr/boot.c
> index cbede775cee2..617f3a144c85 100644
> --- a/hw/avr/boot.c
> +++ b/hw/avr/boot.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/loader.h"
> #include "elf.h"
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 8d9b2df6e725..8167301f0402 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -43,7 +43,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qapi/qapi-commands-machine.h"
> diff --git a/hw/display/artist.c b/hw/display/artist.c
> index 69a8f9eea8ba..8e121bb0b4dc 100644
> --- a/hw/display/artist.c
> +++ b/hw/display/artist.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> diff --git a/hw/display/cg3.c b/hw/display/cg3.c
> index 4b7e78d91924..2e9656ae1c39 100644
> --- a/hw/display/cg3.c
> +++ b/hw/display/cg3.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> diff --git a/hw/display/tcx.c b/hw/display/tcx.c
> index d4d09d0df8d5..1b27b64f6d14 100644
> --- a/hw/display/tcx.c
> +++ b/hw/display/tcx.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "ui/console.h"
> diff --git a/hw/display/virtio-gpu-udmabuf.c
> b/hw/display/virtio-gpu-udmabuf.c
> index 1597921c51fc..8bdf4bac6e4b 100644
> --- a/hw/display/virtio-gpu-udmabuf.c
> +++ b/hw/display/virtio-gpu-udmabuf.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "ui/console.h"
> #include "hw/virtio/virtio-gpu.h"
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 31ce01b7c57c..08e5938ec7b7 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/irq.h"
> #include "hw/qdev-properties.h"
> #include "hw/sysbus.h"
> diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
> index 98b30e0395ee..f7595c08577c 100644
> --- a/hw/hppa/machine.c
> +++ b/hw/hppa/machine.c
> @@ -4,7 +4,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "elf.h"
> diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
> index c8b17af95353..0540047bad22 100644
> --- a/hw/i386/pc_sysfw.c
> +++ b/hw/i386/pc_sysfw.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "sysemu/block-backend.h"
> #include "qemu/error-report.h"
> diff --git a/hw/i386/x86.c b/hw/i386/x86.c
> index 4cf107baea34..bb6727279097 100644
> --- a/hw/i386/x86.c
> +++ b/hw/i386/x86.c
> @@ -25,7 +25,6 @@
> #include "qemu/option.h"
> #include "qemu/cutils.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "qapi/qmp/qerror.h"
> diff --git a/hw/input/vhost-user-input.c b/hw/input/vhost-user-input.c
> index 273e96a7b12d..aeb0624fe57e 100644
> --- a/hw/input/vhost-user-input.c
> +++ b/hw/input/vhost-user-input.c
> @@ -7,7 +7,6 @@
> #include "qemu/osdep.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
>
> #include "hw/virtio/virtio-input.h"
>
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index f5bfc501bc15..9719d98a179e 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -27,7 +27,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "trace.h"
> #include "sysemu/kvm.h"
> #include "hw/ppc/spapr.h"
> diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
> index 93812ee206ea..655207e393dc 100644
> --- a/hw/m68k/mcf5208.c
> +++ b/hw/m68k/mcf5208.c
> @@ -11,7 +11,6 @@
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/irq.h"
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index 66ca5c0df6ef..099a758c6f6a 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -22,7 +22,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "sysemu/sysemu.h"
> #include "cpu.h"
> diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
> index 8e630282e02c..7de8b5f83393 100644
> --- a/hw/m68k/virt.c
> +++ b/hw/m68k/virt.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "sysemu/sysemu.h"
> #include "cpu.h"
> #include "hw/boards.h"
> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
> index 03c030aa2cf0..8b92a9801a02 100644
> --- a/hw/microblaze/boot.c
> +++ b/hw/microblaze/boot.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "qemu/option.h"
> diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
> index c9f14e70a077..7b13098f9b1b 100644
> --- a/hw/mips/fuloong2e.c
> +++ b/hw/mips/fuloong2e.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
> index 4d6b44de342e..6598d7dddd59 100644
> --- a/hw/mips/jazz.c
> +++ b/hw/mips/jazz.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/mips/mips.h"
> diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c
> index ae192db0c8b9..25534288dd81 100644
> --- a/hw/mips/loongson3_virt.c
> +++ b/hw/mips/loongson3_virt.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qemu/cutils.h"
> #include "qemu/datadir.h"
> diff --git a/hw/mips/malta.c b/hw/mips/malta.c
> index c4474b927c46..9ffdc5b8f187 100644
> --- a/hw/mips/malta.c
> +++ b/hw/mips/malta.c
> @@ -25,7 +25,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qemu/bitops.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/southbridge/piix.h"
> diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
> index 30bc1c4f086f..39f64448f244 100644
> --- a/hw/mips/mipssim.c
> +++ b/hw/mips/mipssim.c
> @@ -27,7 +27,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "hw/clock.h"
> #include "hw/mips/mips.h"
> diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c
> index 83020fe9ac9b..8d939fe31b1b 100644
> --- a/hw/misc/sbsa_ec.c
> +++ b/hw/misc/sbsa_ec.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "hw/sysbus.h"
> #include "sysemu/runstate.h"
> diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
> index e7fc082518d2..6d50c395439a 100644
> --- a/hw/net/fsl_etsec/etsec.c
> +++ b/hw/net/fsl_etsec/etsec.c
> @@ -27,7 +27,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/sysbus.h"
> #include "hw/irq.h"
> #include "hw/ptimer.h"
> diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
> index 8f084464155d..a32589e33be4 100644
> --- a/hw/net/fsl_etsec/rings.c
> +++ b/hw/net/fsl_etsec/rings.c
> @@ -22,7 +22,6 @@
> * THE SOFTWARE.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "net/checksum.h"
> #include "qemu/log.h"
> #include "etsec.h"
> diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
> index 9278fdce0b3d..7ccd3e514271 100644
> --- a/hw/net/msf2-emac.c
> +++ b/hw/net/msf2-emac.c
> @@ -29,7 +29,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> #include "hw/registerfields.h"
> diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
> index 9a2328935c1c..7c86bb52e571 100644
> --- a/hw/net/npcm7xx_emc.c
> +++ b/hw/net/npcm7xx_emc.c
> @@ -32,7 +32,6 @@
> /* For crc32 */
> #include <zlib.h>
>
> -#include "qemu-common.h"
> #include "hw/irq.h"
> #include "hw/qdev-clock.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c
> index e889595d5c2b..07b8d87633b6 100644
> --- a/hw/nios2/boot.c
> +++ b/hw/nios2/boot.c
> @@ -30,7 +30,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/option.h"
> #include "qemu/config-file.h"
> diff --git a/hw/nios2/generic_nommu.c b/hw/nios2/generic_nommu.c
> index fbc18dbd04c2..48edb3ae373d 100644
> --- a/hw/nios2/generic_nommu.c
> +++ b/hw/nios2/generic_nommu.c
> @@ -28,7 +28,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
>
> #include "hw/char/serial.h"
> #include "hw/boards.h"
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index ea2d56f9f2af..4125cbebcd38 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "sysemu/sysemu.h"
> #include "sysemu/dma.h"
> diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
> index 00b3ff7d9098..cc9c4d6d3b33 100644
> --- a/hw/pci-host/mv64361.c
> +++ b/hw/pci-host/mv64361.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> diff --git a/hw/pci-host/pnv_phb3.c b/hw/pci-host/pnv_phb3.c
> index 6e9aa9d6ace2..4e68ad4f03fc 100644
> --- a/hw/pci-host/pnv_phb3.c
> +++ b/hw/pci-host/pnv_phb3.c
> @@ -10,7 +10,6 @@
> #include "qemu/log.h"
> #include "qapi/visitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci-host/pnv_phb3_regs.h"
> #include "hw/pci-host/pnv_phb3.h"
> #include "hw/pci/pcie_host.h"
> diff --git a/hw/pci-host/pnv_phb3_msi.c b/hw/pci-host/pnv_phb3_msi.c
> index 8bcbc2cc4f37..2f4112907b84 100644
> --- a/hw/pci-host/pnv_phb3_msi.c
> +++ b/hw/pci-host/pnv_phb3_msi.c
> @@ -9,7 +9,6 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci-host/pnv_phb3_regs.h"
> #include "hw/pci-host/pnv_phb3.h"
> #include "hw/ppc/pnv.h"
> diff --git a/hw/pci-host/pnv_phb3_pbcq.c b/hw/pci-host/pnv_phb3_pbcq.c
> index c7426cd27a20..82f70efa4311 100644
> --- a/hw/pci-host/pnv_phb3_pbcq.c
> +++ b/hw/pci-host/pnv_phb3_pbcq.c
> @@ -8,7 +8,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "target/ppc/cpu.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
> index 11c97e27eb16..3c4c2dace0a3 100644
> --- a/hw/pci-host/pnv_phb4.c
> +++ b/hw/pci-host/pnv_phb4.c
> @@ -10,7 +10,6 @@
> #include "qemu/log.h"
> #include "qapi/visitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "target/ppc/cpu.h"
> #include "hw/pci-host/pnv_phb4_regs.h"
> diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
> index 6f1121a9489a..61bc0b503e3e 100644
> --- a/hw/pci-host/pnv_phb4_pec.c
> +++ b/hw/pci-host/pnv_phb4_pec.c
> @@ -8,7 +8,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/log.h"
> #include "target/ppc/cpu.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
> index 6e514f75eb8f..7a105e4a63d3 100644
> --- a/hw/pci-host/raven.c
> +++ b/hw/pci-host/raven.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/log.h"
> diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
> index eee45444ef73..bfb25ef6af85 100644
> --- a/hw/pci-host/remote.c
> +++ b/hw/pci-host/remote.c
> @@ -22,7 +22,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_host.h"
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index dae9119bfe5f..e99417e50110 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "hw/irq.h"
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index c7e6767f91a8..2bc3dce1fb7d 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 7b5a205309af..e8ef1a9e5d9b 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -47,7 +47,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "hw/ppc/ppc.h"
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 7016979a7cd0..fe2adb057b0c 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> index d45008ac7131..56bf203dfddf 100644
> --- a/hw/ppc/pegasos2.c
> +++ b/hw/ppc/pegasos2.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "hw/hw.h"
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 00f57c9678e6..c5e48992d988 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/cutils.h"
> diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
> index 75a22ce50b11..99f1e8d7f9f3 100644
> --- a/hw/ppc/pnv_bmc.c
> +++ b/hw/ppc/pnv_bmc.c
> @@ -17,7 +17,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "target/ppc/cpu.h"
> #include "qemu/log.h"
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index 7e1a4ac9553b..32013b89836a 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -25,7 +25,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/ppc/ppc.h"
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index 7fb620b9a056..efa90ef5ba73 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -14,7 +14,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/error-report.h"
> #include "net/net.h"
> diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
> index 0737234d66e5..2f24598f55db 100644
> --- a/hw/ppc/sam460ex.c
> +++ b/hw/ppc/sam460ex.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index a4372ba1891e..cc11fcc8b24d 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/memalign.h"
> #include "qapi/error.h"
> diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
> index d7c0e212baf8..a64098c375e0 100644
> --- a/hw/ppc/spapr_numa.c
> +++ b/hw/ppc/spapr_numa.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "hw/ppc/spapr_numa.h"
> #include "hw/pci-host/spapr.h"
> #include "hw/ppc/fdt.h"
> diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c
> index 4678c79235f6..63b476c8f727 100644
> --- a/hw/ppc/spapr_pci_nvlink2.c
> +++ b/hw/ppc/spapr_pci_nvlink2.c
> @@ -23,7 +23,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/pci/pci.h"
> #include "hw/pci-host/spapr.h"
> #include "hw/ppc/spapr_numa.h"
> diff --git a/hw/ppc/spapr_tpm_proxy.c b/hw/ppc/spapr_tpm_proxy.c
> index 2454086744b1..e10af35a1850 100644
> --- a/hw/ppc/spapr_tpm_proxy.c
> +++ b/hw/ppc/spapr_tpm_proxy.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "sysemu/reset.h"
> diff --git a/hw/ppc/spapr_vof.c b/hw/ppc/spapr_vof.c
> index a33f940c32bb..09f29be0b9de 100644
> --- a/hw/ppc/spapr_vof.c
> +++ b/hw/ppc/spapr_vof.c
> @@ -4,7 +4,6 @@
> * SPDX-License-Identifier: GPL-2.0-or-later
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "hw/ppc/spapr.h"
> #include "hw/ppc/spapr_vio.h"
> diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
> index 9c575403b85c..b67a709ddce2 100644
> --- a/hw/ppc/virtex_ml507.c
> +++ b/hw/ppc/virtex_ml507.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "cpu.h"
> diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c
> index 2b63a6287561..8d96593677da 100644
> --- a/hw/ppc/vof.c
> +++ b/hw/ppc/vof.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/range.h"
> #include "qemu/units.h"
> diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c
> index 547d597f0feb..40dfee4bad43 100644
> --- a/hw/remote/iohub.c
> +++ b/hw/remote/iohub.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_ids.h"
> diff --git a/hw/remote/machine.c b/hw/remote/machine.c
> index 952105eab5a2..92d71d47bb9c 100644
> --- a/hw/remote/machine.c
> +++ b/hw/remote/machine.c
> @@ -14,7 +14,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/machine.h"
> #include "exec/memory.h"
> diff --git a/hw/remote/memory.c b/hw/remote/memory.c
> index 6e21ab1a45c9..6d60da91e01c 100644
> --- a/hw/remote/memory.c
> +++ b/hw/remote/memory.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/memory.h"
> #include "exec/ram_addr.h"
> diff --git a/hw/remote/message.c b/hw/remote/message.c
> index 11d729845c5a..50f6bf2d495f 100644
> --- a/hw/remote/message.c
> +++ b/hw/remote/message.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/machine.h"
> #include "io/channel.h"
> diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
> index 7e841820e521..2a4aa651ca26 100644
> --- a/hw/remote/mpqemu-link.c
> +++ b/hw/remote/mpqemu-link.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/module.h"
> #include "hw/remote/mpqemu-link.h"
> diff --git a/hw/remote/proxy-memory-listener.c
> b/hw/remote/proxy-memory-listener.c
> index 0e893f3189e9..eb9918fe72bb 100644
> --- a/hw/remote/proxy-memory-listener.c
> +++ b/hw/remote/proxy-memory-listener.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/compiler.h"
> #include "qemu/int128.h"
> diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
> index bad164299dd4..1c7786b52cf1 100644
> --- a/hw/remote/proxy.c
> +++ b/hw/remote/proxy.c
> @@ -7,7 +7,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "hw/remote/proxy.h"
> #include "hw/pci/pci.h"
> diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
> index 4f21254219f8..333e5ac44331 100644
> --- a/hw/remote/remote-obj.c
> +++ b/hw/remote/remote-obj.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "qemu/error-report.h"
> #include "qemu/notify.h"
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index cae74fcbcd9a..0f179d36014a 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
> index 75d1fec6ca46..64f897e5b10a 100644
> --- a/hw/rx/rx-gdbsim.c
> +++ b/hw/rx/rx-gdbsim.c
> @@ -20,7 +20,6 @@
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "hw/loader.h"
> #include "hw/rx/rx62n.h"
> #include "sysemu/qtest.h"
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index eb7fc4c4ae87..84971e537b3e 100644
> --- a/hw/s390x/ipl.c
> +++ b/hw/s390x/ipl.c
> @@ -13,7 +13,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qapi/error.h"
> #include "sysemu/reset.h"
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index cd67a7bac8e2..8e6fa0915137 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -47,7 +47,6 @@
> #include "qemu/timer.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> -#include "qemu-common.h"
> #include "sdmmc-internal.h"
> #include "trace.h"
>
> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
> index a9f24968275d..1e39d2e2d0ac 100644
> --- a/hw/sparc/leon3.c
> +++ b/hw/sparc/leon3.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/irq.h"
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 7f3a7c002780..fccaed1eb444 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "qemu/datadir.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "hw/sysbus.h"
> #include "qemu/error-report.h"
> diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
> index cda7df36e312..6fd08e2298a6 100644
> --- a/hw/sparc64/sun4u.c
> +++ b/hw/sparc64/sun4u.c
> @@ -26,7 +26,6 @@
> #include "qemu/units.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "cpu.h"
> #include "hw/pci/pci.h"
> diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
> index e6b77a2a941d..5831395cef75 100644
> --- a/hw/usb/dev-mtp.c
> +++ b/hw/usb/dev-mtp.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include <wchar.h>
> diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
> index 664cbd958323..6de58a76a7ff 100644
> --- a/hw/virtio/virtio-iommu.c
> +++ b/hw/virtio/virtio-iommu.c
> @@ -20,7 +20,6 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "qemu/iov.h"
> -#include "qemu-common.h"
> #include "hw/qdev-properties.h"
> #include "hw/virtio/virtio.h"
> #include "sysemu/kvm.h"
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index 35cbf1f21946..5aca40872695 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
> index 5419dca75e2c..5dd21c2c4408 100644
> --- a/hw/virtio/virtio-pmem.c
> +++ b/hw/virtio/virtio-pmem.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> #include "hw/virtio/virtio-pmem.h"
> diff --git a/io/channel-socket.c b/io/channel-socket.c
> index 7a8d9f69c92d..9f5ddf68b687 100644
> --- a/io/channel-socket.c
> +++ b/io/channel-socket.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/qapi-visit-sockets.h"
> #include "qemu/module.h"
> diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
> index 31a66a4fa07c..3b273f62997a 100644
> --- a/linux-user/aarch64/cpu_loop.c
> +++ b/linux-user/aarch64/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/alpha/cpu_loop.c b/linux-user/alpha/cpu_loop.c
> index de6e0c901cdf..2ea039aa71f7 100644
> --- a/linux-user/alpha/cpu_loop.c
> +++ b/linux-user/alpha/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
> index 9dcb2e024eb0..683b8e47c2bd 100644
> --- a/linux-user/arm/cpu_loop.c
> +++ b/linux-user/arm/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "elf.h"
> diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c
> index 0f46b3c1a87a..01e6ff16fc92 100644
> --- a/linux-user/cris/cpu_loop.c
> +++ b/linux-user/cris/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/hexagon/cpu_loop.c b/linux-user/hexagon/cpu_loop.c
> index 0d73934d31d5..b84e25bf71eb 100644
> --- a/linux-user/hexagon/cpu_loop.c
> +++ b/linux-user/hexagon/cpu_loop.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/i386/cpu_loop.c b/linux-user/i386/cpu_loop.c
> index 90bffc1956aa..492701dd9af9 100644
> --- a/linux-user/i386/cpu_loop.c
> +++ b/linux-user/i386/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "qemu/timer.h"
> #include "user-internals.h"
> diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c
> index 928a18e3cf05..d1bf8548b747 100644
> --- a/linux-user/m68k/cpu_loop.c
> +++ b/linux-user/m68k/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/microblaze/cpu_loop.c
> b/linux-user/microblaze/cpu_loop.c
> index 1a2556be2c5f..5ccf9e942eaa 100644
> --- a/linux-user/microblaze/cpu_loop.c
> +++ b/linux-user/microblaze/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/mips/cpu_loop.c b/linux-user/mips/cpu_loop.c
> index 9bb12a07ba08..d5c1c7941d34 100644
> --- a/linux-user/mips/cpu_loop.c
> +++ b/linux-user/mips/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/openrisc/cpu_loop.c
> b/linux-user/openrisc/cpu_loop.c
> index 7683bea0649e..a7aa586c8f96 100644
> --- a/linux-user/openrisc/cpu_loop.c
> +++ b/linux-user/openrisc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/ppc/cpu_loop.c b/linux-user/ppc/cpu_loop.c
> index b468f199e4d2..02204ad8bebb 100644
> --- a/linux-user/ppc/cpu_loop.c
> +++ b/linux-user/ppc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "qemu/timer.h"
> #include "user-internals.h"
> diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
> index 26d446f32379..29084c142196 100644
> --- a/linux-user/riscv/cpu_loop.c
> +++ b/linux-user/riscv/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu.h"
> #include "user-internals.h"
> diff --git a/linux-user/s390x/cpu_loop.c b/linux-user/s390x/cpu_loop.c
> index 7901dfe6f518..285bc60071a8 100644
> --- a/linux-user/s390x/cpu_loop.c
> +++ b/linux-user/s390x/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/sh4/cpu_loop.c b/linux-user/sh4/cpu_loop.c
> index 1bd313cb19a2..c805f9db1104 100644
> --- a/linux-user/sh4/cpu_loop.c
> +++ b/linux-user/sh4/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/sparc/cpu_loop.c b/linux-user/sparc/cpu_loop.c
> index baf3d9ae011f..434c90a55f8f 100644
> --- a/linux-user/sparc/cpu_loop.c
> +++ b/linux-user/sparc/cpu_loop.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu.h"
> #include "user-internals.h"
> #include "cpu_loop-common.h"
> diff --git a/linux-user/uname.c b/linux-user/uname.c
> index 0856783b2190..415fdf31b62d 100644
> --- a/linux-user/uname.c
> +++ b/linux-user/uname.c
> @@ -21,7 +21,6 @@
>
> #include "qemu.h"
> #include "user-internals.h"
> -//#include "qemu-common.h"
> #include "uname.h"
>
> /* return highest utsname machine name for emulated instruction set
> diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
> index 883cf1ca4bbf..5e7302cbb995 100644
> --- a/monitor/qmp-cmds.c
> +++ b/monitor/qmp-cmds.c
> @@ -14,7 +14,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/option.h"
> #include "monitor/monitor.h"
> diff --git a/net/colo-compare.c b/net/colo-compare.c
> index 62554b5b3c8f..d5d096580577 100644
> --- a/net/colo-compare.c
> +++ b/net/colo-compare.c
> @@ -13,7 +13,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "trace.h"
> #include "qapi/error.h"
> diff --git a/net/net.c b/net/net.c
> index 9f17ab204422..a094cf1d2929 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
>
> #include "net/net.h"
> #include "clients.h"
> diff --git a/net/socket.c b/net/socket.c
> index c4b80e9228d7..ea5220a2eb51 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -27,7 +27,6 @@
> #include "clients.h"
> #include "monitor/monitor.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/option.h"
> #include "qemu/sockets.h"
> diff --git a/net/tap-bsd.c b/net/tap-bsd.c
> index e45a6d124eb6..7e65bd391f0b 100644
> --- a/net/tap-bsd.c
> +++ b/net/tap-bsd.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "tap_int.h"
> #include "qemu/cutils.h"
> diff --git a/net/tap-linux.c b/net/tap-linux.c
> index 5e70b9303710..3e24d232e782 100644
> --- a/net/tap-linux.c
> +++ b/net/tap-linux.c
> @@ -24,7 +24,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "tap_int.h"
> #include "tap-linux.h"
> #include "net/tap.h"
> diff --git a/net/tap-solaris.c b/net/tap-solaris.c
> index d85224242b30..79919785c9f6 100644
> --- a/net/tap-solaris.c
> +++ b/net/tap-solaris.c
> @@ -27,7 +27,6 @@
> #include "tap_int.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> -#include "qemu-common.h"
>
> #include <sys/ethernet.h>
> #include <sys/sockio.h>
> diff --git a/net/tap-win32.c b/net/tap-win32.c
> index 6096972f5d47..7466f22e77a4 100644
> --- a/net/tap-win32.c
> +++ b/net/tap-win32.c
> @@ -29,7 +29,6 @@
> #include "qemu/osdep.h"
> #include "tap_int.h"
>
> -#include "qemu-common.h"
> #include "clients.h" /* net_init_tap */
> #include "net/eth.h"
> #include "net/net.h"
> diff --git a/net/tap.c b/net/tap.c
> index c5cbeaa7a2be..6190fa699d2f 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -38,7 +38,6 @@
> #include "monitor/monitor.h"
> #include "sysemu/sysemu.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/net/vde.c b/net/vde.c
> index 99189cccb694..1083916bcf52 100644
> --- a/net/vde.c
> +++ b/net/vde.c
> @@ -27,7 +27,6 @@
>
> #include "net/net.h"
> #include "clients.h"
> -#include "qemu-common.h"
> #include "qemu/option.h"
> #include "qemu/main-loop.h"
> #include "qapi/error.h"
> diff --git a/os-posix.c b/os-posix.c
> index 24692c8593f3..ee765f047dea 100644
> --- a/os-posix.c
> +++ b/os-posix.c
> @@ -29,7 +29,6 @@
> #include <grp.h>
> #include <libgen.h>
>
> -#include "qemu-common.h"
> /* Needed early for CONFIG_BSD etc. */
> #include "net/slirp.h"
> #include "qemu/qemu-options.h"
> diff --git a/os-win32.c b/os-win32.c
> index 6f21b578417c..725ad652e8bb 100644
> --- a/os-win32.c
> +++ b/os-win32.c
> @@ -26,7 +26,6 @@
> #include "qemu/osdep.h"
> #include <windows.h>
> #include <mmsystem.h>
> -#include "qemu-common.h"
> #include "sysemu/runstate.h"
>
> static BOOL WINAPI qemu_ctrl_handler(DWORD type)
> diff --git a/page-vary-common.c b/page-vary-common.c
> index 91755564985c..ab77672dd412 100644
> --- a/page-vary-common.c
> +++ b/page-vary-common.c
> @@ -20,7 +20,6 @@
> #define IN_PAGE_VARY 1
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/page-vary.h"
>
> /* WARNING: This file must *not* be complied with -flto. */
> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index 4d7a2392c097..9924277c826e 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -16,7 +16,6 @@
> #include <sys/utsname.h>
> #include <sys/wait.h>
> #include <dirent.h>
> -#include "qemu-common.h"
> #include "guest-agent-core.h"
> #include "qga-qapi-commands.h"
> #include "qapi/error.h"
> diff --git a/softmmu/cpu-throttle.c b/softmmu/cpu-throttle.c
> index 8c2144ab95cc..d9bb30a223d8 100644
> --- a/softmmu/cpu-throttle.c
> +++ b/softmmu/cpu-throttle.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/thread.h"
> #include "hw/core/cpu.h"
> #include "qemu/main-loop.h"
> diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c
> index 204d946a1729..117408cb83af 100644
> --- a/softmmu/cpu-timers.c
> +++ b/softmmu/cpu-timers.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> diff --git a/softmmu/cpus.c b/softmmu/cpus.c
> index 7b75bb66d5e6..668bef9b4d62 100644
> --- a/softmmu/cpus.c
> +++ b/softmmu/cpus.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "qemu/coroutine-tls.h"
> #include "qapi/error.h"
> diff --git a/softmmu/datadir.c b/softmmu/datadir.c
> index 504c4665bed7..160cac999a6f 100644
> --- a/softmmu/datadir.c
> +++ b/softmmu/datadir.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "qemu/cutils.h"
> #include "trace.h"
> diff --git a/softmmu/icount.c b/softmmu/icount.c
> index 21341a4ce49e..5ca271620db6 100644
> --- a/softmmu/icount.c
> +++ b/softmmu/icount.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "migration/vmstate.h"
> #include "qapi/error.h"
> diff --git a/softmmu/runstate.c b/softmmu/runstate.c
> index e0d869b21aa4..fac7b63259e8 100644
> --- a/softmmu/runstate.c
> +++ b/softmmu/runstate.c
> @@ -40,7 +40,6 @@
> #include "qapi/error.h"
> #include "qapi/qapi-commands-run-state.h"
> #include "qapi/qapi-events-run-state.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "qemu/job.h"
> diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
> index d058a2a00d85..afa477aae656 100644
> --- a/stubs/monitor-core.c
> +++ b/stubs/monitor-core.c
> @@ -1,6 +1,5 @@
> #include "qemu/osdep.h"
> #include "monitor/monitor.h"
> -#include "qemu-common.h"
> #include "qapi/qapi-emit-events.h"
>
> Monitor *monitor_cur(void)
> diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
> index 8c34f86792ed..567e296b21c9 100644
> --- a/target/arm/hvf/hvf.c
> +++ b/target/arm/hvf/hvf.c
> @@ -10,7 +10,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
>
> #include "sysemu/runstate.h"
> diff --git a/target/arm/kvm.c b/target/arm/kvm.c
> index bbf1ce7ba3bc..5fc37ac10a5b 100644
> --- a/target/arm/kvm.c
> +++ b/target/arm/kvm.c
> @@ -13,7 +13,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
> index 9ec8875150d6..17dd2f77d9f5 100644
> --- a/target/arm/kvm64.c
> +++ b/target/arm/kvm64.c
> @@ -16,7 +16,6 @@
> #include <linux/elf.h>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "cpu.h"
> #include "qemu/timer.h"
> diff --git a/target/hexagon/gdbstub.c b/target/hexagon/gdbstub.c
> index 9c8c04c961b1..d152d01bfe7e 100644
> --- a/target/hexagon/gdbstub.c
> +++ b/target/hexagon/gdbstub.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/gdbstub.h"
> #include "cpu.h"
> #include "internal.h"
> diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c
> index 81f665e21245..b185ee8de4fd 100644
> --- a/target/i386/hax/hax-all.c
> +++ b/target/i386/hax/hax-all.c
> @@ -27,7 +27,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
>
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/reset.h"
> #include "sysemu/runstate.h"
> diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
> index fc12c02fb217..f8833277ab6a 100644
> --- a/target/i386/hvf/hvf.c
> +++ b/target/i386/hvf/hvf.c
> @@ -47,7 +47,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
> #include "qemu/memalign.h"
>
> diff --git a/target/i386/hvf/x86.c b/target/i386/hvf/x86.c
> index 91a3fe002c73..d086584f26d9 100644
> --- a/target/i386/hvf/x86.c
> +++ b/target/i386/hvf/x86.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
>
> #include "cpu.h"
> -#include "qemu-common.h"
> #include "x86_decode.h"
> #include "x86_emu.h"
> #include "vmcs.h"
> diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
> index 32b0d131df86..f24dd50e48ff 100644
> --- a/target/i386/hvf/x86_cpuid.c
> +++ b/target/i386/hvf/x86_cpuid.c
> @@ -21,7 +21,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "x86.h"
> #include "vmx.h"
> diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c
> index 062713b1a450..3728d7705e21 100644
> --- a/target/i386/hvf/x86_decode.c
> +++ b/target/i386/hvf/x86_decode.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "panic.h"
> #include "x86_decode.h"
> #include "vmx.h"
> diff --git a/target/i386/hvf/x86_descr.c b/target/i386/hvf/x86_descr.c
> index af15c06ac5db..a484942cfcd4 100644
> --- a/target/i386/hvf/x86_descr.c
> +++ b/target/i386/hvf/x86_descr.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "vmx.h"
> #include "x86_descr.h"
>
> diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
> index 050428795bbc..f5704f63e8da 100644
> --- a/target/i386/hvf/x86_emu.c
> +++ b/target/i386/hvf/x86_emu.c
> @@ -37,7 +37,6 @@
>
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "x86_decode.h"
> #include "x86.h"
> #include "x86_emu.h"
> diff --git a/target/i386/hvf/x86_flags.c b/target/i386/hvf/x86_flags.c
> index fecbca751770..03d6de5efc3e 100644
> --- a/target/i386/hvf/x86_flags.c
> +++ b/target/i386/hvf/x86_flags.c
> @@ -23,7 +23,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "panic.h"
> #include "cpu.h"
> #include "x86_flags.h"
> diff --git a/target/i386/hvf/x86_mmu.c b/target/i386/hvf/x86_mmu.c
> index df0b91cd4208..96d117567ee8 100644
> --- a/target/i386/hvf/x86_mmu.c
> +++ b/target/i386/hvf/x86_mmu.c
> @@ -18,7 +18,6 @@
>
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "x86.h"
> #include "x86_mmu.h"
> diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
> index d24daf6a4110..beaeec068731 100644
> --- a/target/i386/hvf/x86_task.c
> +++ b/target/i386/hvf/x86_task.c
> @@ -8,7 +8,6 @@
> // GNU General Public License for more details.
> #include "qemu/osdep.h"
> #include "panic.h"
> -#include "qemu-common.h"
> #include "qemu/error-report.h"
>
> #include "sysemu/hvf.h"
> diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c
> index bec9fc581463..69d4fb8cf555 100644
> --- a/target/i386/hvf/x86hvf.c
> +++ b/target/i386/hvf/x86hvf.c
> @@ -19,7 +19,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "x86hvf.h"
> #include "vmx.h"
> #include "vmcs.h"
> diff --git a/target/i386/kvm/sev-stub.c b/target/i386/kvm/sev-stub.c
> index 6080c007a2e4..1be5341e8a6a 100644
> --- a/target/i386/kvm/sev-stub.c
> +++ b/target/i386/kvm/sev-stub.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "sev.h"
>
> int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
> diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
> index 9f940413318c..b75738ee9cdf 100644
> --- a/target/i386/nvmm/nvmm-all.c
> +++ b/target/i386/nvmm/nvmm-all.c
> @@ -11,7 +11,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
> #include "exec/ioport.h"
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/nvmm.h"
> #include "sysemu/cpus.h"
> diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
> index 68a4ebe909ad..5560a22ea5c2 100644
> --- a/target/i386/whpx/whpx-all.c
> +++ b/target/i386/whpx/whpx-all.c
> @@ -12,7 +12,6 @@
> #include "cpu.h"
> #include "exec/address-spaces.h"
> #include "exec/ioport.h"
> -#include "qemu-common.h"
> #include "qemu/accel.h"
> #include "sysemu/whpx.h"
> #include "sysemu/cpus.h"
> diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c
> index bba36f3ec98f..c15df35ad60a 100644
> --- a/target/i386/whpx/whpx-apic.c
> +++ b/target/i386/whpx/whpx-apic.c
> @@ -11,7 +11,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "hw/i386/apic_internal.h"
> #include "hw/i386/apic-msidef.h"
> diff --git a/target/mips/kvm.c b/target/mips/kvm.c
> index 086debd9f013..caf70decd2a5 100644
> --- a/target/mips/kvm.c
> +++ b/target/mips/kvm.c
> @@ -14,7 +14,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "internal.h"
> #include "qemu/error-report.h"
> diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
> index 5a7ad0c7108d..eda21c04434b 100644
> --- a/target/nios2/nios2-semi.c
> +++ b/target/nios2/nios2-semi.c
> @@ -28,7 +28,6 @@
> #if defined(CONFIG_USER_ONLY)
> #include "qemu.h"
> #else
> -#include "qemu-common.h"
> #include "exec/softmmu-semi.h"
> #endif
> #include "qemu/log.h"
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 8644b85de847..f905a2af17a7 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -21,7 +21,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "cpu.h"
> diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
> index e6b7cb6d4d5f..70b4cff06fbb 100644
> --- a/target/riscv/kvm.c
> +++ b/target/riscv/kvm.c
> @@ -21,7 +21,6 @@
>
> #include <linux/kvm.h>
>
> -#include "qemu-common.h"
> #include "qemu/timer.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/target/rx/cpu.c b/target/rx/cpu.c
> index 25a4aa2976d3..fb30080ac4ea 100644
> --- a/target/rx/cpu.c
> +++ b/target/rx/cpu.c
> @@ -20,7 +20,6 @@
> #include "qemu/qemu-print.h"
> #include "qapi/error.h"
> #include "cpu.h"
> -#include "qemu-common.h"
> #include "migration/vmstate.h"
> #include "exec/exec-all.h"
> #include "hw/loader.h"
> diff --git a/target/rx/gdbstub.c b/target/rx/gdbstub.c
> index c811d4810b45..7eb2059a841b 100644
> --- a/target/rx/gdbstub.c
> +++ b/target/rx/gdbstub.c
> @@ -16,7 +16,6 @@
> * this program. If not, see <http://www.gnu.org/licenses/>.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
>
> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
> index 6acf14d5ecb4..53098bf54104 100644
> --- a/target/s390x/kvm/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -24,7 +24,6 @@
> #include <linux/kvm.h>
> #include <asm/ptrace.h>
>
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "kvm_s390x.h"
> diff --git a/target/s390x/tcg/vec_fpu_helper.c
> b/target/s390x/tcg/vec_fpu_helper.c
> index 1a779934715f..aa2cc8e4a6b5 100644
> --- a/target/s390x/tcg/vec_fpu_helper.c
> +++ b/target/s390x/tcg/vec_fpu_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "vec.h"
> diff --git a/target/s390x/tcg/vec_int_helper.c
> b/target/s390x/tcg/vec_int_helper.c
> index 5561b3ed9096..b44859ee1630 100644
> --- a/target/s390x/tcg/vec_int_helper.c
> +++ b/target/s390x/tcg/vec_int_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "vec.h"
> #include "exec/helper-proto.h"
> diff --git a/target/s390x/tcg/vec_string_helper.c
> b/target/s390x/tcg/vec_string_helper.c
> index ac315eb095c1..f8b54bba4a9d 100644
> --- a/target/s390x/tcg/vec_string_helper.c
> +++ b/target/s390x/tcg/vec_string_helper.c
> @@ -10,7 +10,6 @@
> * See the COPYING file in the top-level directory.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "vec.h"
> diff --git a/target/tricore/gdbstub.c b/target/tricore/gdbstub.c
> index 3ce55abb8e3b..ebf32defde3a 100644
> --- a/target/tricore/gdbstub.c
> +++ b/target/tricore/gdbstub.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "exec/gdbstub.h"
>
>
> diff --git a/target/xtensa/core-de233_fpu.c
> b/target/xtensa/core-de233_fpu.c
> index c7cbeb1b4834..41af8057fbb9 100644
> --- a/target/xtensa/core-de233_fpu.c
> +++ b/target/xtensa/core-de233_fpu.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-de233_fpu/core-isa.h"
> diff --git a/target/xtensa/core-dsp3400.c b/target/xtensa/core-dsp3400.c
> index 4e0bc8a8c46c..81e425c56828 100644
> --- a/target/xtensa/core-dsp3400.c
> +++ b/target/xtensa/core-dsp3400.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-dsp3400/core-isa.h"
> diff --git a/target/xtensa/core-test_mmuhifi_c3.c
> b/target/xtensa/core-test_mmuhifi_c3.c
> index 123c630b0da7..c0e5d32d1e47 100644
> --- a/target/xtensa/core-test_mmuhifi_c3.c
> +++ b/target/xtensa/core-test_mmuhifi_c3.c
> @@ -28,7 +28,6 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-test_mmuhifi_c3/core-isa.h"
> diff --git a/tcg/tci.c b/tcg/tci.c
> index fe92b5d0844b..bdfac83492dd 100644
> --- a/tcg/tci.c
> +++ b/tcg/tci.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "tcg/tcg.h" /* MAX_OPC_PARAM_IARGS */
> #include "exec/cpu_ldst.h"
> #include "tcg/tcg-op.h"
> diff --git a/tests/qtest/acpi-utils.c b/tests/qtest/acpi-utils.c
> index 766c48e3a6a4..673fc975862c 100644
> --- a/tests/qtest/acpi-utils.c
> +++ b/tests/qtest/acpi-utils.c
> @@ -14,7 +14,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "qemu/bitmap.h"
> #include "acpi-utils.h"
> #include "boot-sector.h"
> diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
> index 8073ccc20521..aff5f3f79776 100644
> --- a/tests/qtest/ahci-test.c
> +++ b/tests/qtest/ahci-test.c
> @@ -30,7 +30,6 @@
> #include "libqos/ahci.h"
> #include "libqos/pci-pc.h"
>
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/host-utils.h"
>
> diff --git a/tests/qtest/aspeed_hace-test.c
> b/tests/qtest/aspeed_hace-test.c
> index 09ee31545e41..58aa22014d04 100644
> --- a/tests/qtest/aspeed_hace-test.c
> +++ b/tests/qtest/aspeed_hace-test.c
> @@ -8,7 +8,6 @@
> #include "qemu/osdep.h"
>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "qemu/bitops.h"
>
> #define HACE_CMD 0x10
> diff --git a/tests/qtest/bios-tables-test.c
> b/tests/qtest/bios-tables-test.c
> index c4a2d1e1664b..5dddedabcdde 100644
> --- a/tests/qtest/bios-tables-test.c
> +++ b/tests/qtest/bios-tables-test.c
> @@ -57,7 +57,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "hw/firmware/smbios.h"
> #include "qemu/bitmap.h"
> #include "acpi-utils.h"
> diff --git a/tests/qtest/boot-sector.c b/tests/qtest/boot-sector.c
> index ea8f264661c3..9d9825bc8145 100644
> --- a/tests/qtest/boot-sector.c
> +++ b/tests/qtest/boot-sector.c
> @@ -12,7 +12,6 @@
> */
> #include "qemu/osdep.h"
> #include "boot-sector.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
>
> #define LOW(x) ((x) & 0xff)
> diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c
> index a1c689414be5..7f5dd5f85a78 100644
> --- a/tests/qtest/cpu-plug-test.c
> +++ b/tests/qtest/cpu-plug-test.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> diff --git a/tests/qtest/dbus-display-test.c
> b/tests/qtest/dbus-display-test.c
> index 43c77aff045c..81043162dfdd 100644
> --- a/tests/qtest/dbus-display-test.c
> +++ b/tests/qtest/dbus-display-test.c
> @@ -3,7 +3,6 @@
> #include <gio/gio.h>
> #include <gio/gunixfdlist.h>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "dbus-display1.h"
>
> static GDBusConnection*
> diff --git a/tests/qtest/dbus-vmstate-test.c
> b/tests/qtest/dbus-vmstate-test.c
> index aca9b98b7a35..a8acab763f5d 100644
> --- a/tests/qtest/dbus-vmstate-test.c
> +++ b/tests/qtest/dbus-vmstate-test.c
> @@ -2,7 +2,6 @@
> #include <glib/gstdio.h>
> #include <gio/gio.h>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "dbus-vmstate1.h"
> #include "migration-helpers.h"
>
> diff --git a/tests/qtest/device-introspect-test.c
> b/tests/qtest/device-introspect-test.c
> index bbec166dbc2f..adf39b2518e8 100644
> --- a/tests/qtest/device-introspect-test.c
> +++ b/tests/qtest/device-introspect-test.c
> @@ -18,7 +18,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/qmp/qstring.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c
> index e648fdd409cd..ddd6983ede14 100644
> --- a/tests/qtest/e1000e-test.c
> +++ b/tests/qtest/e1000e-test.c
> @@ -25,9 +25,7 @@
>
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> -#include "qemu-common.h"
> #include "libqos/pci-pc.h"
> #include "qemu/sockets.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/erst-test.c b/tests/qtest/erst-test.c
> index f94cd8dd8e05..a0adc35bef7f 100644
> --- a/tests/qtest/erst-test.c
> +++ b/tests/qtest/erst-test.c
> @@ -11,7 +11,6 @@
> #include <glib/gstdio.h>
> #include "libqos/libqos-pc.h"
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
>
> #include "hw/pci/pci.h"
>
> diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c
> index b0d40012e6a9..4aa72f36431f 100644
> --- a/tests/qtest/fdc-test.c
> +++ b/tests/qtest/fdc-test.c
> @@ -27,7 +27,6 @@
>
> #include "libqtest-single.h"
> #include "qapi/qmp/qdict.h"
> -#include "qemu-common.h"
>
> /* TODO actually test the results and get rid of this */
> #define qmp_discard_response(...) qobject_unref(qmp(__VA_ARGS__))
> diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
> index 7a244c951e5e..dc891d838b6a 100644
> --- a/tests/qtest/fuzz/qos_fuzz.c
> +++ b/tests/qtest/fuzz/qos_fuzz.c
> @@ -19,7 +19,6 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "exec/memory.h"
> #include "qemu/main-loop.h"
>
> diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
> index 64023c057408..da9c4c2792de 100644
> --- a/tests/qtest/hd-geo-test.c
> +++ b/tests/qtest/hd-geo-test.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/bswap.h"
> #include "qapi/qmp/qlist.h"
> #include "libqos/libqtest.h"
> diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
> index 19de3b410405..b7243a17b11d 100644
> --- a/tests/qtest/ide-test.c
> +++ b/tests/qtest/ide-test.c
> @@ -30,7 +30,6 @@
> #include "libqos/pci-pc.h"
> #include "libqos/malloc-pc.h"
> #include "qapi/qmp/qdict.h"
> -#include "qemu-common.h"
> #include "qemu/bswap.h"
> #include "hw/pci/pci_ids.h"
> #include "hw/pci/pci_regs.h"
> diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c
> index 19612e9405ae..ed431e34e68d 100644
> --- a/tests/qtest/ipmi-bt-test.c
> +++ b/tests/qtest/ipmi-bt-test.c
> @@ -31,7 +31,6 @@
>
>
> #include "libqtest-single.h"
> -#include "qemu-common.h"
>
> #define IPMI_IRQ 5
>
> diff --git a/tests/qtest/ivshmem-test.c b/tests/qtest/ivshmem-test.c
> index 4e8af42a9d04..95628a418579 100644
> --- a/tests/qtest/ivshmem-test.c
> +++ b/tests/qtest/ivshmem-test.c
> @@ -14,7 +14,6 @@
> #include "libqos/libqos-pc.h"
> #include "libqos/libqos-spapr.h"
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
>
> #define TMPSHMSIZE (1 << 20)
> static char *tmpshm;
> diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
> index eaa2096512e5..41c4be5efa93 100644
> --- a/tests/qtest/libqos/ahci.c
> +++ b/tests/qtest/libqos/ahci.c
> @@ -28,7 +28,6 @@
> #include "ahci.h"
> #include "pci-pc.h"
>
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "hw/pci/pci_ids.h"
> diff --git a/tests/qtest/libqos/malloc-pc.c
> b/tests/qtest/libqos/malloc-pc.c
> index f1e3b392a53c..bbd1b4827e54 100644
> --- a/tests/qtest/libqos/malloc-pc.c
> +++ b/tests/qtest/libqos/malloc-pc.c
> @@ -16,8 +16,6 @@
>
> #include "standard-headers/linux/qemu_fw_cfg.h"
>
> -#include "qemu-common.h"
> -
> #define ALLOC_PAGE_SIZE (4096)
>
> void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags)
> diff --git a/tests/qtest/libqos/malloc-spapr.c
> b/tests/qtest/libqos/malloc-spapr.c
> index 05b306c191d3..d90ed3c51d7d 100644
> --- a/tests/qtest/libqos/malloc-spapr.c
> +++ b/tests/qtest/libqos/malloc-spapr.c
> @@ -8,8 +8,6 @@
> #include "qemu/osdep.h"
> #include "malloc-spapr.h"
>
> -#include "qemu-common.h"
> -
> #define SPAPR_PAGE_SIZE 4096
>
> /* Memory must be a multiple of 256 MB,
> diff --git a/tests/qtest/libqos/malloc.c b/tests/qtest/libqos/malloc.c
> index f708b0143262..f0c8f950c805 100644
> --- a/tests/qtest/libqos/malloc.c
> +++ b/tests/qtest/libqos/malloc.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
> #include "malloc.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> typedef struct MemBlock {
> diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
> index dc5566ccfd60..7b5890dcc487 100644
> --- a/tests/qtest/libqtest.c
> +++ b/tests/qtest/libqtest.c
> @@ -21,7 +21,6 @@
> #include <sys/un.h>
>
> #include "libqos/libqtest.h"
> -#include "qemu-common.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> #include "qapi/error.h"
> diff --git a/tests/qtest/machine-none-test.c
> b/tests/qtest/machine-none-test.c
> index 138101b46ac2..8ca18074b9f9 100644
> --- a/tests/qtest/machine-none-test.c
> +++ b/tests/qtest/machine-none-test.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> diff --git a/tests/qtest/npcm7xx_emc-test.c
> b/tests/qtest/npcm7xx_emc-test.c
> index 7c435ac91576..a353fef0ca13 100644
> --- a/tests/qtest/npcm7xx_emc-test.c
> +++ b/tests/qtest/npcm7xx_emc-test.c
> @@ -15,7 +15,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqos.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qnum.h"
> diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
> index 32bbae33c597..3cb47d2c5496 100644
> --- a/tests/qtest/pxe-test.c
> +++ b/tests/qtest/pxe-test.c
> @@ -14,7 +14,6 @@
>
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "boot-sector.h"
> #include "libqos/libqos-spapr.h"
> diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
> index eb34af843b79..6b162e12b5aa 100644
> --- a/tests/qtest/qom-test.c
> +++ b/tests/qtest/qom-test.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> #include "qemu/cutils.h"
> diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
> index 450604926492..8fa3313cc333 100644
> --- a/tests/qtest/rtl8139-test.c
> +++ b/tests/qtest/rtl8139-test.c
> @@ -11,7 +11,6 @@
> #include "libqtest-single.h"
> #include "libqos/pci-pc.h"
> #include "qemu/timer.h"
> -#include "qemu-common.h"
>
> /* Tests only initialization so far. TODO: Replace with functional tests
> */
> static void nop(void)
> diff --git a/tests/qtest/test-filter-mirror.c
> b/tests/qtest/test-filter-mirror.c
> index da4f94de727a..fdf66cebd62f 100644
> --- a/tests/qtest/test-filter-mirror.c
> +++ b/tests/qtest/test-filter-mirror.c
> @@ -9,7 +9,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/test-filter-redirector.c
> b/tests/qtest/test-filter-redirector.c
> index fc16cf7e8d5f..339d3c04cedc 100644
> --- a/tests/qtest/test-filter-redirector.c
> +++ b/tests/qtest/test-filter-redirector.c
> @@ -51,7 +51,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqos/libqtest.h"
> #include "qapi/qmp/qdict.h"
> #include "qemu/iov.h"
> diff --git a/tests/qtest/test-x86-cpuid-compat.c
> b/tests/qtest/test-x86-cpuid-compat.c
> index 39138db7744b..b39c9055b309 100644
> --- a/tests/qtest/test-x86-cpuid-compat.c
> +++ b/tests/qtest/test-x86-cpuid-compat.c
> @@ -1,5 +1,4 @@
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qapi/qmp/qdict.h"
> #include "qapi/qmp/qlist.h"
> #include "qapi/qmp/qnum.h"
> diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
> index a71395849f33..fc9f2b94982d 100644
> --- a/tests/qtest/virtio-net-test.c
> +++ b/tests/qtest/virtio-net-test.c
> @@ -8,7 +8,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "libqtest-single.h"
> #include "qemu/iov.h"
> #include "qemu/module.h"
> diff --git a/tests/unit/check-qjson.c b/tests/unit/check-qjson.c
> index c845f91d4377..c4e0f851bfc6 100644
> --- a/tests/unit/check-qjson.c
> +++ b/tests/unit/check-qjson.c
> @@ -21,7 +21,6 @@
> #include "qapi/qmp/qnum.h"
> #include "qapi/qmp/qstring.h"
> #include "qemu/unicode.h"
> -#include "qemu-common.h"
>
> static QString *from_json_str(const char *jstr, bool single, Error **errp)
> {
> diff --git a/tests/unit/check-qnull.c b/tests/unit/check-qnull.c
> index ebf21db83ccc..5ceacc65d7f3 100644
> --- a/tests/unit/check-qnull.c
> +++ b/tests/unit/check-qnull.c
> @@ -9,7 +9,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qnull.h"
> -#include "qemu-common.h"
> #include "qapi/qobject-input-visitor.h"
> #include "qapi/qobject-output-visitor.h"
> #include "qapi/error.h"
> diff --git a/tests/unit/check-qnum.c b/tests/unit/check-qnum.c
> index b85fca23029e..bf7fe45bacc4 100644
> --- a/tests/unit/check-qnum.c
> +++ b/tests/unit/check-qnum.c
> @@ -15,7 +15,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qnum.h"
> -#include "qemu-common.h"
>
> /*
> * Public Interface test-cases
> diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c
> index 7903ebf4cf80..0ed094e55f3a 100644
> --- a/tests/unit/check-qobject.c
> +++ b/tests/unit/check-qobject.c
> @@ -15,7 +15,6 @@
> #include "qapi/qmp/qnull.h"
> #include "qapi/qmp/qnum.h"
> #include "qapi/qmp/qstring.h"
> -#include "qemu-common.h"
>
> #include <math.h>
>
> diff --git a/tests/unit/check-qstring.c b/tests/unit/check-qstring.c
> index 4bf977209342..bd861f4f8b47 100644
> --- a/tests/unit/check-qstring.c
> +++ b/tests/unit/check-qstring.c
> @@ -12,7 +12,6 @@
> #include "qemu/osdep.h"
>
> #include "qapi/qmp/qstring.h"
> -#include "qemu-common.h"
>
> /*
> * Public Interface test-cases
> diff --git a/tests/unit/socket-helpers.c b/tests/unit/socket-helpers.c
> index ef31664d0224..0a9e090a68dd 100644
> --- a/tests/unit/socket-helpers.c
> +++ b/tests/unit/socket-helpers.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "socket-helpers.h"
>
> diff --git a/tests/unit/test-clone-visitor.c
> b/tests/unit/test-clone-visitor.c
> index 5d48e125b8e4..ce67585305f6 100644
> --- a/tests/unit/test-clone-visitor.c
> +++ b/tests/unit/test-clone-visitor.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/clone-visitor.h"
> #include "test-qapi-visit.h"
>
> diff --git a/tests/unit/test-forward-visitor.c
> b/tests/unit/test-forward-visitor.c
> index 348f7e4e81c8..01de15522711 100644
> --- a/tests/unit/test-forward-visitor.c
> +++ b/tests/unit/test-forward-visitor.c
> @@ -9,7 +9,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/forward-visitor.h"
> #include "qapi/qobject-input-visitor.h"
> #include "qapi/error.h"
> diff --git a/tests/unit/test-iov.c b/tests/unit/test-iov.c
> index 5371066fb6a4..0d2ba9ba87d9 100644
> --- a/tests/unit/test-iov.c
> +++ b/tests/unit/test-iov.c
> @@ -1,5 +1,4 @@
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
>
> diff --git a/tests/unit/test-logging.c b/tests/unit/test-logging.c
> index ccb819f193d9..05703a4e515f 100644
> --- a/tests/unit/test-logging.c
> +++ b/tests/unit/test-logging.c
> @@ -27,7 +27,6 @@
> #include "qemu/osdep.h"
> #include <glib/gstdio.h>
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/log.h"
>
> diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c
> index d58c3b78f208..7d961d716afb 100644
> --- a/tests/unit/test-qmp-event.c
> +++ b/tests/unit/test-qmp-event.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/compat-policy.h"
> #include "qapi/error.h"
> #include "qapi/qmp/qbool.h"
> diff --git a/tests/unit/test-qobject-input-visitor.c
> b/tests/unit/test-qobject-input-visitor.c
> index 22538f814099..aed08eaebcee 100644
> --- a/tests/unit/test-qobject-input-visitor.c
> +++ b/tests/unit/test-qobject-input-visitor.c
> @@ -13,7 +13,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/qapi-visit-introspect.h"
> #include "qapi/qobject-input-visitor.h"
> diff --git a/tests/unit/test-qobject-output-visitor.c
> b/tests/unit/test-qobject-output-visitor.c
> index 6af4c33eec15..66b27fad66bb 100644
> --- a/tests/unit/test-qobject-output-visitor.c
> +++ b/tests/unit/test-qobject-output-visitor.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/qobject-output-visitor.h"
> #include "test-qapi-visit.h"
> diff --git a/tests/unit/test-string-input-visitor.c
> b/tests/unit/test-string-input-visitor.c
> index 249faafc9d79..25094d3ffcef 100644
> --- a/tests/unit/test-string-input-visitor.c
> +++ b/tests/unit/test-string-input-visitor.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/string-input-visitor.h"
> #include "test-qapi-visit.h"
> diff --git a/tests/unit/test-string-output-visitor.c
> b/tests/unit/test-string-output-visitor.c
> index e2bedc5c7c92..7ef305361eb7 100644
> --- a/tests/unit/test-string-output-visitor.c
> +++ b/tests/unit/test-string-output-visitor.c
> @@ -12,7 +12,6 @@
>
> #include "qemu/osdep.h"
>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qapi/string-output-visitor.h"
> #include "test-qapi-visit.h"
> diff --git a/tests/unit/test-thread-pool.c b/tests/unit/test-thread-pool.c
> index 70dc6314a1ef..6020e65d6986 100644
> --- a/tests/unit/test-thread-pool.c
> +++ b/tests/unit/test-thread-pool.c
> @@ -1,5 +1,4 @@
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "block/aio.h"
> #include "block/thread-pool.h"
> #include "block/block.h"
> diff --git a/tests/unit/test-util-sockets.c
> b/tests/unit/test-util-sockets.c
> index 896247e3ed36..63909ccb2b54 100644
> --- a/tests/unit/test-util-sockets.c
> +++ b/tests/unit/test-util-sockets.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "qapi/error.h"
> #include "socket-helpers.h"
> diff --git a/tests/unit/test-visitor-serialization.c
> b/tests/unit/test-visitor-serialization.c
> index 462995864775..907263d0307c 100644
> --- a/tests/unit/test-visitor-serialization.c
> +++ b/tests/unit/test-visitor-serialization.c
> @@ -14,7 +14,6 @@
> #include "qemu/osdep.h"
> #include <float.h>
>
> -#include "qemu-common.h"
> #include "test-qapi-visit.h"
> #include "qapi/error.h"
> #include "qapi/qmp/qjson.h"
> diff --git a/tests/unit/test-xbzrle.c b/tests/unit/test-xbzrle.c
> index 795d6f1cbabb..ef951b6e5405 100644
> --- a/tests/unit/test-xbzrle.c
> +++ b/tests/unit/test-xbzrle.c
> @@ -11,7 +11,6 @@
> *
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "../migration/xbzrle.h"
>
> diff --git a/ui/gtk-clipboard.c b/ui/gtk-clipboard.c
> index d58fd761abdf..8d8a636fd1fa 100644
> --- a/ui/gtk-clipboard.c
> +++ b/ui/gtk-clipboard.c
> @@ -19,7 +19,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/main-loop.h"
>
> #include "ui/gtk.h"
> diff --git a/ui/keymaps.c b/ui/keymaps.c
> index d4a647464bbf..6ceaa97085ab 100644
> --- a/ui/keymaps.c
> +++ b/ui/keymaps.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/datadir.h"
> #include "keymaps.h"
> #include "trace.h"
> diff --git a/ui/vdagent.c b/ui/vdagent.c
> index 02861edfb13c..aa6167f0b492 100644
> --- a/ui/vdagent.c
> +++ b/ui/vdagent.c
> @@ -1,6 +1,5 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "include/qemu-common.h"
> #include "chardev/char.h"
> #include "qemu/buffer.h"
> #include "qemu/option.h"
> diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c
> index d48f75eb1ab4..8aeadfaa218a 100644
> --- a/ui/vnc-clipboard.c
> +++ b/ui/vnc-clipboard.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "vnc.h"
> #include "vnc-jobs.h"
>
> diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
> index 7b86a4713dfd..5a4b8a4fc0f6 100644
> --- a/ui/vnc-enc-tight.c
> +++ b/ui/vnc-enc-tight.c
> @@ -34,7 +34,7 @@
>
> #ifdef CONFIG_VNC_PNG
> /* The following define is needed by pngconf.h. Otherwise it won't
> compile,
> - because setjmp.h was already included by qemu-common.h. */
> + because setjmp.h was already included by osdep.h. */
> #define PNG_SKIP_SETJMP_CHECK
> #include <png.h>
> #endif
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 5cbeebb8d1fd..6261d922953b 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -25,7 +25,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "vnc.h"
> #include "vnc-jobs.h"
> #include "trace.h"
> diff --git a/util/aio-win32.c b/util/aio-win32.c
> index 7aac89df3a30..44003d645ecd 100644
> --- a/util/aio-win32.c
> +++ b/util/aio-win32.c
> @@ -16,7 +16,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "block/block.h"
> #include "qemu/main-loop.h"
> #include "qemu/queue.h"
> diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
> index e99b8a4f9c8c..e2690c5f4142 100644
> --- a/util/coroutine-sigaltstack.c
> +++ b/util/coroutine-sigaltstack.c
> @@ -27,7 +27,6 @@
> #endif
> #include "qemu/osdep.h"
> #include <pthread.h>
> -#include "qemu-common.h"
> #include "qemu/coroutine_int.h"
>
> #ifdef CONFIG_SAFESTACK
> diff --git a/util/coroutine-win32.c b/util/coroutine-win32.c
> index de6bd4fd3e4e..c196f956d27e 100644
> --- a/util/coroutine-win32.c
> +++ b/util/coroutine-win32.c
> @@ -23,7 +23,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/coroutine_int.h"
>
> typedef struct
> diff --git a/util/cutils.c b/util/cutils.c
> index aaf2ced29142..a01a3a754049 100644
> --- a/util/cutils.c
> +++ b/util/cutils.c
> @@ -26,7 +26,6 @@
> #include "qemu/host-utils.h"
> #include <math.h>
>
> -#include "qemu-common.h"
> #include "qemu/ctype.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
> index 16294e98d434..8dc30c51414d 100644
> --- a/util/event_notifier-posix.c
> +++ b/util/event_notifier-posix.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/event_notifier.h"
> #include "qemu/main-loop.h"
> diff --git a/util/event_notifier-win32.c b/util/event_notifier-win32.c
> index 62c53b0a9909..9352da4699c7 100644
> --- a/util/event_notifier-win32.c
> +++ b/util/event_notifier-win32.c
> @@ -11,7 +11,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/event_notifier.h"
> #include "qemu/main-loop.h"
>
> diff --git a/util/iov.c b/util/iov.c
> index 58c7b3eeee5f..22d6996ccec0 100644
> --- a/util/iov.c
> +++ b/util/iov.c
> @@ -17,7 +17,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/iov.h"
> #include "qemu/sockets.h"
> #include "qemu/cutils.h"
> diff --git a/util/osdep.c b/util/osdep.c
> index 97dc9bc65b45..1ea2398686ee 100644
> --- a/util/osdep.c
> +++ b/util/osdep.c
> @@ -23,7 +23,6 @@
> */
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "qemu-common.h"
> #include "qemu/cutils.h"
> #include "qemu/sockets.h"
> #include "qemu/error-report.h"
> diff --git a/util/oslib-posix.c b/util/oslib-posix.c
> index fae25be3e779..c0125cd572ed 100644
> --- a/util/oslib-posix.c
> +++ b/util/oslib-posix.c
> @@ -31,7 +31,6 @@
>
> #include <glib/gprintf.h>
>
> -#include "qemu-common.h"
> #include "sysemu/sysemu.h"
> #include "trace.h"
> #include "qapi/error.h"
> diff --git a/util/oslib-win32.c b/util/oslib-win32.c
> index 91d2f45cfe1f..b69e50b3f182 100644
> --- a/util/oslib-win32.c
> +++ b/util/oslib-win32.c
> @@ -32,7 +32,6 @@
>
> #include "qemu/osdep.h"
> #include <windows.h>
> -#include "qemu-common.h"
> #include "qapi/error.h"
> #include "qemu/main-loop.h"
> #include "trace.h"
> diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
> index 7f5839cb769e..d791932d63b9 100644
> --- a/util/qemu-coroutine-io.c
> +++ b/util/qemu-coroutine-io.c
> @@ -23,7 +23,6 @@
> * THE SOFTWARE.
> */
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/sockets.h"
> #include "qemu/coroutine.h"
> #include "qemu/iov.h"
> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
> index e8f45a7d30a5..13b5b197f9ea 100644
> --- a/util/qemu-sockets.c
> +++ b/util/qemu-sockets.c
> @@ -21,7 +21,6 @@
> #include <linux/vm_sockets.h>
> #endif /* CONFIG_AF_VSOCK */
>
> -#include "qemu-common.h"
> #include "monitor/monitor.h"
> #include "qapi/clone-visitor.h"
> #include "qapi/error.h"
> diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c
> index 52eb19f3511a..a2d5a6e8259f 100644
> --- a/util/qemu-thread-win32.c
> +++ b/util/qemu-thread-win32.c
> @@ -12,7 +12,6 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu-common.h"
> #include "qemu/thread.h"
> #include "qemu/notify.h"
> #include "qemu-thread-common.h"
> diff --git a/target/xtensa/import_core.sh b/target/xtensa/import_core.sh
> index df66d09393af..b4c15556c2c4 100755
> --- a/target/xtensa/import_core.sh
> +++ b/target/xtensa/import_core.sh
> @@ -42,7 +42,6 @@ cat <<EOF > "${TARGET}.c"
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/gdbstub.h"
> -#include "qemu-common.h"
> #include "qemu/host-utils.h"
>
> #include "core-$NAME/core-isa.h"
> --
> 2.35.1.273.ge6ebfd0e8cbb
>
>
[-- Attachment #2: Type: text/html, Size: 123529 bytes --]
^ permalink raw reply [flat|nested] 79+ messages in thread
* Re: [PATCH 00/32] Misc cleanups
2022-03-23 15:57 [PATCH 00/32] Misc cleanups marcandre.lureau
` (31 preceding siblings ...)
2022-03-23 15:57 ` marcandre.lureau
@ 2022-03-24 9:26 ` Stefan Hajnoczi
32 siblings, 0 replies; 79+ messages in thread
From: Stefan Hajnoczi @ 2022-03-24 9:26 UTC (permalink / raw)
To: marcandre.lureau; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 349 bytes --]
On Wed, Mar 23, 2022 at 07:57:11PM +0400, marcandre.lureau@redhat.com wrote:
> Various cleanup patches gleaned while working on different things. A good half
> of them are realted to cleaning up qemu-common.h.
I didn't review the patches in detail but have no concerns in the areas
that I maintain:
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 79+ messages in thread