This commit was created with scripts/clean-includes: ./scripts/clean-includes --git tests tests
with one hand-edit to remove a now-empty #ifndef WIN32...#endif from tests/qtest/dbus-display-test.c . All .c should include qemu/osdep.h first. The script performs three related cleanups: * Ensure .c files include qemu/osdep.h first. * Including it in a .h is redundant, since the .c already includes it. Drop such inclusions. * Likewise, including headers qemu/osdep.h includes is redundant. Drop these, too. Signed-off-by: Peter Maydell <[email protected]> Reviewed-by: Cédric Le Goater <[email protected]> Message-id: [email protected] --- tests/qtest/aspeed-hace-utils.h | 1 - tests/qtest/aspeed-smc-utils.h | 1 - tests/qtest/aspeed_gpio-test.c | 1 - tests/qtest/dbus-display-test.c | 3 --- tests/qtest/pnv-spi-seeprom-test.c | 1 - tests/unit/test-cutils.c | 2 +- tests/unit/test-error-report.c | 1 - tests/unit/test-io-channel-command.c | 2 -- 8 files changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/qtest/aspeed-hace-utils.h b/tests/qtest/aspeed-hace-utils.h index c8b2ec45af2..27ab2bb9758 100644 --- a/tests/qtest/aspeed-hace-utils.h +++ b/tests/qtest/aspeed-hace-utils.h @@ -8,7 +8,6 @@ #ifndef TESTS_ASPEED_HACE_UTILS_H #define TESTS_ASPEED_HACE_UTILS_H -#include "qemu/osdep.h" #include "libqtest.h" #include "qemu/bitops.h" diff --git a/tests/qtest/aspeed-smc-utils.h b/tests/qtest/aspeed-smc-utils.h index b07870f3b8f..e2fd8ff1bd1 100644 --- a/tests/qtest/aspeed-smc-utils.h +++ b/tests/qtest/aspeed-smc-utils.h @@ -26,7 +26,6 @@ #ifndef TESTS_ASPEED_SMC_UTILS_H #define TESTS_ASPEED_SMC_UTILS_H -#include "qemu/osdep.h" #include "qemu/bswap.h" #include "libqtest-single.h" #include "qemu/bitops.h" diff --git a/tests/qtest/aspeed_gpio-test.c b/tests/qtest/aspeed_gpio-test.c index c2f9ca2298a..decbba23c8f 100644 --- a/tests/qtest/aspeed_gpio-test.c +++ b/tests/qtest/aspeed_gpio-test.c @@ -27,7 +27,6 @@ #include "qemu/timer.h" #include "qobject/qdict.h" #include "libqtest-single.h" -#include "qemu/typedefs.h" #define AST2600_GPIO_BASE 0x1E780000 diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c index f7fc873bfb3..1d5951b7117 100644 --- a/tests/qtest/dbus-display-test.c +++ b/tests/qtest/dbus-display-test.c @@ -7,9 +7,6 @@ #include <gio/gio.h> #include <gio/gunixfdlist.h> #include "libqtest.h" -#ifndef WIN32 -#include <sys/mman.h> -#endif #include "ui/dbus-display1.h" static GDBusConnection* diff --git a/tests/qtest/pnv-spi-seeprom-test.c b/tests/qtest/pnv-spi-seeprom-test.c index 600493c425d..8033261758b 100644 --- a/tests/qtest/pnv-spi-seeprom-test.c +++ b/tests/qtest/pnv-spi-seeprom-test.c @@ -5,7 +5,6 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include <unistd.h> #include "qemu/osdep.h" #include "libqtest.h" #include "qemu/bswap.h" diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index 227acc59955..75fae29003a 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -25,9 +25,9 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include <math.h> -#include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/units.h" diff --git a/tests/unit/test-error-report.c b/tests/unit/test-error-report.c index 0cbde3c4cf5..a8532fc58fc 100644 --- a/tests/unit/test-error-report.c +++ b/tests/unit/test-error-report.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "glib-compat.h" #include <locale.h> #include "qemu/error-report.h" diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 4f022617df0..964418b5cd9 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -20,8 +20,6 @@ #include "qemu/osdep.h" #include <glib/gstdio.h> -#include <sys/types.h> -#include <sys/stat.h> #include "io/channel-command.h" #include "io-channel-helpers.h" #include "qapi/error.h" -- 2.43.0
