Include qemu/queue.h slightly less

Signed-off-by: Markus Armbruster <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <20190812052359[email protected]>

diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 343ca8be7a43d4ead0df1c9f490f3306120fa406..83c9d83459251b55b8e791733405dc26b040bf71 100644 (file)
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -20,7 +20,6 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
-#include "qemu/queue.h"
 #include "monitor/monitor.h"
 #include "migration/blocker.h"
 #include "hw/virtio/vhost-scsi.h"

diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index d1c86abb76340aaddd488829872ffe23bdd7e204..2bfc4020377be59389bdb7ac1b1e505fde682056 100644 (file)
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -20,7 +20,6 @@
 #include "hw/s390x/ap-device.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
-#include "qemu/queue.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "cpu.h"

diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index 9bc713a70b2968d1eacb5cd526913e309edc8419..57a9a4ffd9bd46780032a33c17ce4ef9f0c922d9 100644 (file)
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -25,7 +25,6 @@
 
 #include "qemu/host-utils.h"
 #include "qemu/thread.h"
-#include "qemu/queue.h"
 #ifdef CONFIG_TCG
 #include "tcg-target.h"
 #endif

diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 1e3ec4e16eed49dd40757757a90942f4e434c6c4..82e56339dd7ef3448b7c0d24b46ab9189c9f1a5c 100644 (file)
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -16,7 +16,6 @@
 
 #include "hw/xen/xen.h"
 #include "hw/pci/pci.h"
-#include "qemu/queue.h"
 #include "hw/xen/trace.h"
 
 extern xc_interface *xen_xc;

diff --git a/include/net/can_emu.h b/include/net/can_emu.h
index 1da4d01b956a16871a29ca08d636d5ae7a90dbd4..d4fc51b57d51d62e7020d4b1b7f5e90094c29bad 100644 (file)
--- a/include/net/can_emu.h
+++ b/include/net/can_emu.h
@@ -28,6 +28,7 @@
 #ifndef NET_CAN_EMU_H
 #define NET_CAN_EMU_H
 
+#include "qemu/queue.h"
 #include "qom/object.h"
 
 /* NOTE: the following two structures is copied from <linux/can.h>. */

diff --git a/include/net/filter.h b/include/net/filter.h
index 9bc6fa3cc656c08fce92d555cc613f364ef88a60..e8fb6259db0f7a5e17893aeb1d243e984ad472bb 100644 (file)
--- a/include/net/filter.h
+++ b/include/net/filter.h
@@ -10,6 +10,7 @@
 #define QEMU_NET_FILTER_H
 
 #include "qapi/qapi-types-net.h"
+#include "qemu/queue.h"
 #include "qom/object.h"
 #include "net/queue.h"
 

diff --git a/include/qemu/range.h b/include/qemu/range.h
index 71b8b215c6fe504df1622f47ab58d1b4e97a157b..f62b363e0d1240b476a66383b46caf6497cacaeb 100644 (file)
--- a/include/qemu/range.h
+++ b/include/qemu/range.h
@@ -20,8 +20,6 @@
 #ifndef QEMU_RANGE_H
 #define QEMU_RANGE_H
 
-#include "qemu/queue.h"
-
 /*
  * Operations on 64 bit address ranges.
  * Notes:

diff --git a/include/qom/object.h b/include/qom/object.h
index 7bb82a7f5650e324d32f789246d8df221e2291c5..128d00c77fd6597c4b70bd5f124f57ba3b4b37e2 100644 (file)
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -15,7 +15,6 @@
 #define QEMU_OBJECT_H
 
 #include "qapi/qapi-builtin-types.h"
-#include "qemu/queue.h"
 #include "qemu/module.h"
 
 struct TypeImpl;

diff --git a/include/sysemu/cryptodev.h b/include/sysemu/cryptodev.h
index 92bbb79131484b1ec1335d6d4fc6c474f80a0aca..a9afb7e5b56f45658b985fd8e84438b35eae220e 100644 (file)
--- a/include/sysemu/cryptodev.h
+++ b/include/sysemu/cryptodev.h
@@ -23,6 +23,7 @@
 #ifndef CRYPTODEV_H
 #define CRYPTODEV_H
 
+#include "qemu/queue.h"
 #include "qom/object.h"
 
 /**

diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h
index 2a02f47771832ba398c178bf656b967461cead83..9b22c156f8e6cfe2698d1dde45c58c9a02091508 100644 (file)
--- a/include/sysemu/rng.h
+++ b/include/sysemu/rng.h
@@ -13,6 +13,7 @@
 #ifndef QEMU_RNG_H
 #define QEMU_RNG_H
 
+#include "qemu/queue.h"
 #include "qom/object.h"
 
 #define TYPE_RNG_BACKEND "rng-backend"

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 984c439ac96198cf532585ed5fb1f9bbc3dafdac..77f5df59b0d897d5acead2baf8806f62b7d3cdd7 100644 (file)
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -3,7 +3,6 @@
 /* Misc. things related to the system emulator.  */
 
 #include "qapi/qapi-types-run-state.h"
-#include "qemu/queue.h"
 #include "qemu/timer.h"
 #include "qemu/notify.h"
 #include "qemu/main-loop.h"

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index bd43c4817df8d39966b536ba58ff3c63823fe76a..3365e192eb3f17c1cbc07d093a1efe30c73e47c6 100644 (file)
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -8,6 +8,7 @@
 #include "qemu.h"
 #include "disas/disas.h"
 #include "qemu/path.h"
+#include "qemu/queue.h"
 #include "qemu/guest-random.h"
 
 #ifdef _ARCH_PPC64

diff --git a/linux-user/main.c b/linux-user/main.c
index 8ffc52519552b368583db37063703158ec18473b..47917bbb20fc44ca7e0f0748938ea5415e5f525d 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -28,6 +28,7 @@
 #include "qapi/error.h"
 #include "qemu.h"
 #include "qemu/path.h"
+#include "qemu/queue.h"
 #include "qemu/config-file.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index aac0334627003fbf375dfd4c88d0ee2b57e719ef..f6f5fe5fbb553c151cb57146350c6ce4b6cc5549 100644 (file)
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -16,7 +16,6 @@
 #include "syscall_defs.h"
 #include "target_syscall.h"
 #include "exec/gdbstub.h"
-#include "qemu/queue.h"
 
 /* This is the size of the host kernel's sigset_t, needed where we make
  * direct system calls that take a sigset_t pointer and a size.

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 8367cb138dfe075e06ca455009cc9b8aee41f78c..8b41a03901d497aea17d2093ab51a1d727a1b8cd 100644 (file)
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
 #include "qemu/path.h"
+#include "qemu/queue.h"
 #include <elf.h>
 #include <endian.h>
 #include <grp.h>

diff --git a/nbd/client.c b/nbd/client.c
index 4de30630c73802b699ea795635c79bbf6d50cd1e..d554ae353d8bde8a3cee152fc8e59d5cadfece5d 100644 (file)
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/queue.h"
 #include "trace.h"
 #include "nbd-internal.h"
 #include "qemu/cutils.h"

diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h
index 049f83df7769db8fe95b20e5333aaaee7c9cc330..ec3d2e2ebc702559dc183abc9ebe48e5f5b0e947 100644 (file)
--- a/nbd/nbd-internal.h
+++ b/nbd/nbd-internal.h
@@ -28,7 +28,6 @@
 #endif
 
 #include "qemu/bswap.h"
-#include "qemu/queue.h"
 #include "qemu/main-loop.h"
 
 /* This is all part of the "official" NBD API.

diff --git a/nbd/server.c b/nbd/server.c
index 10faedcfc55de9eba89fa0c123fe689b6f600b98..dbd2ff8555fa85c58a60f5047486358389f4a757 100644 (file)
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/queue.h"
 #include "trace.h"
 #include "nbd-internal.h"
 #include "qemu/units.h"

diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index 89ccd905ec03fe6d41c7826fcd289f9d98fb027b..d192724b13829b3a6d6037091764c480abcabe00 100644 (file)
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -15,7 +15,6 @@
 #include "qemu/osdep.h"
 #include "qapi/dealloc-visitor.h"
 #include "qapi/qmp/qnull.h"
-#include "qemu/queue.h"
 #include "qapi/visitor-impl.h"
 
 struct QapiDeallocVisitor

diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c
index ed95105eaec98dc90480b7f30480c47368d4265c..2cf66f7804321a039326e503d77020486a8cbcd8 100644 (file)
--- a/target/i386/whpx-all.c
+++ b/target/i386/whpx-all.c
@@ -20,7 +20,6 @@
 #include "qemu/main-loop.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"
-#include "qemu/queue.h"
 #include "qapi/error.h"
 #include "migration/blocker.h"
 #include "whp-dispatch.h"

diff --git a/ui/kbd-state.c b/ui/kbd-state.c
index 1668d17ddabca766629499eb54700b30e194c675..62d42a7a22e1e45694d152d3ee5102503b025ce5 100644 (file)
--- a/ui/kbd-state.c
+++ b/ui/kbd-state.c
@@ -5,7 +5,6 @@
  */
 #include "qemu/osdep.h"
 #include "qemu/bitmap.h"
-#include "qemu/queue.h"
 #include "ui/console.h"
 #include "ui/input.h"
 #include "ui/kbd-state.h"

diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index 2367fe8f7fe84dc8b68c33bfbcaa4a11cc0277b4..26ffd0d6b54a5f73cff6ed66726f9cbb4fec8f33 100644 (file)
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -17,7 +17,6 @@
 #include "exec/ramlist.h"
 #include "exec/cpu-common.h"
 #include "trace.h"
-#include "qemu/queue.h"
 #include "qemu/error-report.h"
 #include "standard-headers/linux/pci_regs.h"
 #include "qemu/event_notifier.h"