Include qemu/module.h where needed, drop it from qemu-common.h

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190523143508.25387-4-armbru@redhat.com>
[Rebased with conflicts resolved automatically, except for
hw/usb/dev-hub.c hw/misc/exynos4210_rng.c hw/misc/bcm2835_rng.c
hw/misc/aspeed_scu.c hw/display/virtio-vga.c hw/arm/stm32f205_soc.c;
ui/cocoa.m fixed up]

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 49e688430998d6c3901cc6028ba4055766f06f4c..3745c823ad373ec58360696f41b23c2240528ca4 100644 (file)
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include <alsa/asoundlib.h>
-#include "qemu-common.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "audio.h"
 #include "trace.h"
 

diff --git a/audio/audio.c b/audio/audio.c
index 2040762feff1816dcdb1aa93e46c5ad89afd7c72..05adf7ffebf1de212a40cd5b1c988568d194b3ee 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "audio.h"
@@ -31,6 +32,7 @@
 #include "qapi/qapi-visit-audio.h"
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include "sysemu/replay.h"
 #include "trace.h"
 

diff --git a/audio/coreaudio.c b/audio/coreaudio.c
index 1ee43b7d5f1265dddf60e2309929c245b0f06eea..4bec6c8c5c13616b3b4d0ff2e3de5b282766d051 100644 (file)
--- a/audio/coreaudio.c
+++ b/audio/coreaudio.c
@@ -26,7 +26,7 @@
 #include <CoreAudio/CoreAudio.h>
 #include <pthread.h>            /* pthread_X */
 
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "audio.h"
 
 #define AUDIO_CAP "coreaudio"

diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index a7d04b5033a3956afe0b1991699ecd7e9865b010..5da4c864c3f20d0a852423137c2897aadf16be22 100644 (file)
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -27,12 +27,12 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "audio.h"
 
 #define AUDIO_CAP "dsound"
 #include "audio_int.h"
 #include "qemu/host-utils.h"
+#include "qemu/module.h"
 
 #include <windows.h>
 #include <mmsystem.h>

diff --git a/audio/noaudio.c b/audio/noaudio.c
index ccc611fc84701947124ad44a2c9db0befb3a08ff..9b195dc52ca3d04014b6d938fb7a7943e1171808 100644 (file)
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -21,9 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/host-utils.h"
+#include "qemu/module.h"
 #include "audio.h"
 #include "qemu/timer.h"
 

diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index fc28981a3972dd957204c489482ce8debe19b11f..c0af065b6ff2428cd176d95376749f54fcafd978 100644 (file)
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -21,11 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
-#include "qemu-common.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/host-utils.h"
 #include "audio.h"
 #include "trace.h"

diff --git a/audio/paaudio.c b/audio/paaudio.c
index 45295b4e5ecb832cd44572f646a45f23f834be65..fa9dd9efd4cc467330d491bd6c992e25c1bf2d49 100644 (file)
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -1,6 +1,7 @@
 /* public domain */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "audio.h"
 #include "qapi/opts-visitor.h"
 

diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index ff9248ba68e03bf4ef159d544af49ce51df8ee4b..e7179ff1d41059c1730d3ea79883267c83946888 100644 (file)
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include <SDL.h>
 #include <SDL_thread.h>
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "audio.h"
 
 #ifndef _WIN32

diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 4f7873af5afdedaee873cc9067c948c4235ffd6c..0ead5ae43adecb881f2e9d01b60b0a87745fae7e 100644 (file)
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/host-utils.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "ui/qemu-spice.h"

diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 8d30f572965eed0c2c4412d764d62f2594fab820..803b6cb1f3d022902d2fd1f09bf0e35065f2fde9 100644 (file)
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/host-utils.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qapi/opts-visitor.h"
 #include "audio.h"

diff --git a/authz/base.c b/authz/base.c
index baf39fff258a9559bc0bc9199dcfdb5a8b60be8e..c75bce3fd134ef2d88033e2c588fd014f5b7cec6 100644 (file)
--- a/authz/base.c
+++ b/authz/base.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "authz/base.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 bool qauthz_is_allowed(QAuthZ *authz,

diff --git a/authz/list.c b/authz/list.c
index 831da936feaabbf99b0a47adc2001c8573715c0a..5a48074d0aaea3bd98ab5ea9c8a91c143221a73e 100644 (file)
--- a/authz/list.c
+++ b/authz/list.c
@@ -23,6 +23,7 @@
 #include "trace.h"
 #include "qom/object_interfaces.h"
 #include "qapi/qapi-visit-authz.h"
+#include "qemu/module.h"
 
 static bool qauthz_list_is_allowed(QAuthZ *authz,
                                    const char *identity,

diff --git a/authz/listfile.c b/authz/listfile.c
index d74bbd10488114ca689f494cdd361f8efe1bc63b..e7a8c19bcba8d38fd34bd3818bc77ead361b7b1e 100644 (file)
--- a/authz/listfile.c
+++ b/authz/listfile.c
@@ -23,6 +23,7 @@
 #include "trace.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "qemu/filemonitor.h"
 #include "qom/object_interfaces.h"

diff --git a/authz/pamacct.c b/authz/pamacct.c
index 7539867923df7d4c1e1fd8c044031bdbea828e92..a8ad25b6c752430041c3af888c5eee4201e7799b 100644 (file)
--- a/authz/pamacct.c
+++ b/authz/pamacct.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "authz/pamacct.h"
 #include "trace.h"
+#include "qemu/module.h"
 #include "qom/object_interfaces.h"
 
 #include <security/pam_appl.h>

diff --git a/authz/simple.c b/authz/simple.c
index c409ce7efcdcc119e59588cbcbd69607d355c536..008912d24735a788ffaa083aa96786dd6ec18537 100644 (file)
--- a/authz/simple.c
+++ b/authz/simple.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "authz/simple.h"
 #include "trace.h"
+#include "qemu/module.h"
 #include "qom/object_interfaces.h"
 
 static bool qauthz_simple_is_allowed(QAuthZ *authz,

diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index 37ac6445d26ff5eafd92889643505502936cf00c..29e55c91952d859571a676ea50635c6df7d12c67 100644 (file)
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -9,10 +9,11 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/hostmem.h"
 #include "sysemu/sysemu.h"
 #include "qom/object_interfaces.h"

diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c
index 46b15b916af630ee11ef0afdac302120c9b3ff9c..26070b425e4085d55ba81556fcfec4d9b014ff9d 100644 (file)
--- a/backends/hostmem-memfd.c
+++ b/backends/hostmem-memfd.c
@@ -9,12 +9,13 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "sysemu/hostmem.h"
 #include "sysemu/sysemu.h"
 #include "qom/object_interfaces.h"
 #include "qemu/memfd.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 #define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"

diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c
index 24b65d9ae365f554f126dae99ef799bce6ff166e..6aab8d3a7317136f4c7ce824d9689677c7a9956b 100644 (file)
--- a/backends/hostmem-ram.c
+++ b/backends/hostmem-ram.c
@@ -9,9 +9,11 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "sysemu/hostmem.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qom/object_interfaces.h"
 
 #define TYPE_MEMORY_BACKEND_RAM "memory-backend-ram"

diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index d2b9ce6cbf1089c555acb1879409a1d2b57a4672..e3805194088c4d6ab81443b0a73bbd43fb198362 100644 (file)
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -15,6 +15,7 @@
 #include "chardev/char-fe.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/module.h"
 
 #define TYPE_RNG_EGD "rng-egd"
 #define RNG_EGD(obj) OBJECT_CHECK(RngEgd, (obj), TYPE_RNG_EGD)

diff --git a/backends/rng-random.c b/backends/rng-random.c
index e2a49b0571d79eab335d5a74841d92c50a727b6a..aa5b9285f04d3adccf1b04a76b903c68c8ad1389 100644 (file)
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -16,6 +16,7 @@
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 
 struct RngRandom
 {

diff --git a/backends/rng.c b/backends/rng.c
index 398ebe4a7d09f9eabe0a11e3cff7f52d60016702..391888b8b3ae40cc8e78655b32f712517f354bdd 100644 (file)
--- a/backends/rng.c
+++ b/backends/rng.c
@@ -14,6 +14,7 @@
 #include "sysemu/rng.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/module.h"
 #include "qom/object_interfaces.h"
 
 void rng_backend_request_entropy(RngBackend *s, size_t size,

diff --git a/backends/tpm.c b/backends/tpm.c
index a00438b904f2f03246e6bf7b541797ed010e3395..375587e743d022cac2dbea6affcf96dce4385a60 100644 (file)
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -18,6 +18,7 @@
 #include "sysemu/tpm.h"
 #include "qemu/thread.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "block/thread-pool.h"
 #include "qemu/error-report.h"
 

diff --git a/block/blklogwrites.c b/block/blklogwrites.c
index eb2b4901a516d4c22ec42b762bb63c9b655ea657..04d8b33607ee2acf5f5b6e443d5c427a3da6d31e 100644 (file)
--- a/block/blklogwrites.c
+++ b/block/blklogwrites.c
@@ -16,6 +16,7 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 /* Disk format stuff - taken from Linux drivers/md/dm-log-writes.c */

diff --git a/block/blkreplay.c b/block/blkreplay.c
index b5d9efdecab1ebbcf84b34363d98ec74dbfc429b..2b7931b940145858f26e1e842dbde35217b87aac 100644 (file)
--- a/block/blkreplay.c
+++ b/block/blkreplay.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "block/block_int.h"
 #include "sysemu/replay.h"
 #include "qapi/error.h"

diff --git a/block/blkverify.c b/block/blkverify.c
index 3ff77ff49af506d407ec36501f02439ad2d6b24d..304b0a1368c87a2edf5c3fbafaf492c9cc8f65ad 100644 (file)
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -14,6 +14,7 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 typedef struct {

diff --git a/block/copy-on-read.c b/block/copy-on-read.c
index 53972b1da3134d6e61ff97aa4bf3f0aac4d97641..22f24fd0db87eb325f97aef97838721a83a2ac2d 100644 (file)
--- a/block/copy-on-read.c
+++ b/block/copy-on-read.c
@@ -22,6 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "block/block_int.h"
+#include "qemu/module.h"
 
 
 static int cor_open(BlockDriverState *bs, QDict *options, int flags,

diff --git a/block/crypto.c b/block/crypto.c
index 7351fd479d76d543f4d159e87f91fb75a5da7c53..8237424ae6d296b3c8ae7d3884faeed575c68112 100644 (file)
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -28,6 +28,7 @@
 #include "qapi/qapi-visit-crypto.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "crypto.h"
 

diff --git a/block/curl.c b/block/curl.c
index 606709fea4f007d64b6f92ef81d7f27c4f72e4a1..d4c8e94f3e0fe26ee221e763356e300359d42946 100644 (file)
--- a/block/curl.c
+++ b/block/curl.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qdict.h"

diff --git a/block/gluster.c b/block/gluster.c
index e664ca4462441b1125728a312d28761cbc9a7fb8..dc16f0c3293cf8013b30f2c2edfc940df2ad5af3 100644 (file)
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -18,6 +18,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qemu/uri.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/cutils.h"
 

diff --git a/block/iscsi-opts.c b/block/iscsi-opts.c
index 9b19bd2f529c80978a5c227d5618876fecd810a4..afaf8837d6c144f574794886b93b4351ce517dee 100644 (file)
--- a/block/iscsi-opts.c
+++ b/block/iscsi-opts.c
@@ -23,8 +23,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/config-file.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 static QemuOptsList qemu_iscsi_opts = {

diff --git a/block/iscsi.c b/block/iscsi.c
index f31c612d531b1c6267139557a14f1a324cc0c18b..cf9d66c07f3eeec0b45bf34d772d7f07ddb7e397 100644 (file)
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -36,6 +36,7 @@
 #include "block/qdict.h"
 #include "scsi/constants.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/uuid.h"
 #include "qapi/error.h"

diff --git a/block/nfs.c b/block/nfs.c
index 531903610b5491a63806567ce2a0f12c5cbd6b13..d93241b3bb84cf0a662f0ddec5829744fa9b5a47 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -32,6 +32,7 @@
 #include "block/qdict.h"
 #include "trace.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/uri.h"
 #include "qemu/cutils.h"

diff --git a/block/null.c b/block/null.c
index a322929478fa3a4772e17b15b557f17f4fd7bce4..699aa295cb587c2f79ec0152997386fd743e09cb 100644 (file)
--- a/block/null.c
+++ b/block/null.c
@@ -14,6 +14,7 @@
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "block/block_int.h"
 

diff --git a/block/nvme.c b/block/nvme.c
index 0684bbd077ddc451dd00d8cb975b6fd2998dc6b8..73ed5fa75f2e6c8833a9b7c09e8bcce93c9b8eee 100644 (file)
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -17,6 +17,7 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/cutils.h"
 #include "qemu/option.h"
 #include "qemu/vfio-helpers.h"

diff --git a/block/qed.c b/block/qed.c
index bb4f5c98639c06d3078e0ded49548c563b2b1e8b..77c7cef175616b93cd2f27b7a86c2f9a121ccb7f 100644 (file)
--- a/block/qed.c
+++ b/block/qed.c
@@ -17,6 +17,7 @@
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/bswap.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "trace.h"
 #include "qed.h"

diff --git a/block/quorum.c b/block/quorum.c
index 133ee1820455c96ec3504db3039a0d279c25f538..df68adcfaa842203ae9acf970ba02c02709650a9 100644 (file)
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -15,6 +15,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "block/block_int.h"
 #include "block/qdict.h"

diff --git a/block/raw-format.c b/block/raw-format.c
index 385cdc249092baa61bcf09cbf5a4a22c611f4dfc..bffd424dd0da38049c06a6c7fc4ef3381907ba5a 100644 (file)
--- a/block/raw-format.c
+++ b/block/raw-format.c
@@ -29,6 +29,7 @@
 #include "qemu/osdep.h"
 #include "block/block_int.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 typedef struct BDRVRawState {

diff --git a/block/rbd.c b/block/rbd.c
index 0c549c9935ede843b2b145c21bd11f2ef46eb99d..f2ac2c06f441be999510f98ff7c8d49cb9b82f1a 100644 (file)
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -16,6 +16,7 @@
 #include <rbd/librbd.h>
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "block/block_int.h"
 #include "block/qdict.h"

diff --git a/block/replication.c b/block/replication.c
index 3d4dedddfcb564208a70adc8f1d70d75b70b5419..5cffb790b3362406d40224a61fb16691a5db6f8d 100644 (file)
--- a/block/replication.c
+++ b/block/replication.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "block/nbd.h"
 #include "block/blockjob.h"

diff --git a/block/sheepdog.c b/block/sheepdog.c
index f76d6ddbbcdf3f5ab8a3731f5adde4c246d30bea..1e2d824a584a86b45c0ab91d0f50a53e80ea97bb 100644 (file)
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -21,6 +21,7 @@
 #include "qapi/qobject-output-visitor.h"
 #include "qemu/uri.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "block/block_int.h"

diff --git a/block/ssh.c b/block/ssh.c
index 584c302fe6d9fa5cd975d80445d6e82433835a37..6da7b9cbfec6bd05dcc5d7da30dfc1457aaf4f01 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -31,6 +31,7 @@
 #include "block/qdict.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/ctype.h"
 #include "qemu/cutils.h"

diff --git a/block/throttle.c b/block/throttle.c
index f64dcc27b98e01cdd4c4e63eaf1662f4460caf39..0349f422576eb8009d8e84633b5afaae932a3b3b 100644 (file)
--- a/block/throttle.c
+++ b/block/throttle.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "block/throttle-groups.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/throttle-options.h"
 #include "qapi/error.h"

diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index 5e946846f1a2f0c39e7794ba98fd8e2d1701c480..fdd3a7adc3782872c629633eb678d8f4de3f2f6b 100644 (file)
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -17,12 +17,11 @@
  * See the COPYING.LIB file in the top-level directory.
  *
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/error-report.h"
-#include "qemu/module.h"
 #include "qemu/bswap.h"
 #include "vhdx.h"
 

diff --git a/block/vxhs.c b/block/vxhs.c
index 2e18229ba44897804c60185cb42abe99712db0d0..77fd5eb20d1bea7f569e4824085ab8a59a697b95 100644 (file)
--- a/block/vxhs.c
+++ b/block/vxhs.c
@@ -17,6 +17,7 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "trace.h"
+#include "qemu/module.h"
 #include "qemu/uri.h"
 #include "qapi/error.h"
 #include "qemu/uuid.h"

diff --git a/block/win32-aio.c b/block/win32-aio.c
index 9cd355d42f8a60d59b10a6c2ca853d6018928c4a..b7221a272f82686fbe87267218c80ac6919bb4b5 100644 (file)
--- a/block/win32-aio.c
+++ b/block/win32-aio.c
@@ -21,11 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/timer.h"
 #include "block/block_int.h"
-#include "qemu/module.h"
 #include "block/aio.h"
 #include "block/raw-aio.h"
 #include "qemu/event_notifier.h"

diff --git a/bsd-user/main.c b/bsd-user/main.c
index 7d4abd20ed3ff1536bfa6929647c4e879dd2daf5..72a95227ecd58037b49ff212a2c767dd49c60a07 100644 (file)
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -29,6 +29,7 @@
 #include "qemu/error-report.h"
 #include "qemu/path.h"
 #include "qemu/help_option.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "tcg.h"

diff --git a/chardev/baum.c b/chardev/baum.c
index 78b0c876253f45ef44777160c4f45edde63fbede..3dc81d5c6c66cc0dcd87e11935ddf5706d53d5e1 100644 (file)
--- a/chardev/baum.c
+++ b/chardev/baum.c
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "chardev/char.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"
 #include "ui/console.h"

diff --git a/chardev/char-console.c b/chardev/char-console.c
index 535ed65136c693ab0e0fb53f248c9b3b575578d4..6c4ce5dbce7e7acc9157bf08b19ec5c36e477902 100644 (file)
--- a/chardev/char-console.c
+++ b/chardev/char-console.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "chardev/char-win.h"
+#include "qemu/module.h"
 
 static void qemu_chr_open_win_con(Chardev *chr,
                                   ChardevBackend *backend,

diff --git a/chardev/char-fd.c b/chardev/char-fd.c
index 2c9b2ce56768d9742f6d37f499819b01cb77d5f8..32092369bf9453aad9bb5fdfff29b1d7a958a82e 100644 (file)
--- a/chardev/char-fd.c
+++ b/chardev/char-fd.c
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "chardev/char.h"
 #include "io/channel-file.h"
 

diff --git a/chardev/char-file.c b/chardev/char-file.c
index 87fb61088c65837e4b31cff0efd3dfadf8b7732e..2fd80707e5f4dfa6b618e4ea7b88db034dffd3a7 100644 (file)
--- a/chardev/char-file.c
+++ b/chardev/char-file.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "chardev/char.h"
 

diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index 23aa82125dc920ce102d0f4f4d52ad4aff9122eb..200c62a0d08bd779de8efdc95aad10b61f085865 100644 (file)
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "chardev/char.h"
 #include "sysemu/block-backend.h"

diff --git a/chardev/char-null.c b/chardev/char-null.c
index 90bafe76f43660f70b12fef4e972f23d19c03707..1c6a2900f9b5d506fdcab6ed2871046178f95dce 100644 (file)
--- a/chardev/char-null.c
+++ b/chardev/char-null.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "chardev/char.h"
+#include "qemu/module.h"
 
 static void null_chr_open(Chardev *chr,
                           ChardevBackend *backend,

diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c
index ab82c72ac7470c85c88aaeb5a448618f17772e90..05e7efbd6ca95e06e8a4d6fcdd97a80507f86ee4 100644 (file)
--- a/chardev/char-parallel.c
+++ b/chardev/char-parallel.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "chardev/char.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include <sys/ioctl.h>
 

diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
index 8a51872e5e986baf55d5bb29a1f5993eb59bd28b..cdaddb1e61990a7c652552902082b6e5c31c8c7e 100644 (file)
--- a/chardev/char-pipe.c
+++ b/chardev/char-pipe.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "chardev/char.h"
 

diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index 04759b0ef9031437ddfa5a9230861972abb63d22..8b34ce985a8b2c5f125941c0d6d271908b71642e 100644 (file)
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -21,13 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "chardev/char.h"
 #include "io/channel-file.h"
 #include "qemu/sockets.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/qemu-print.h"
 
 #include "chardev/char-io.h"

diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c
index 87832e27920ec78cab71db564b38f7fccaf3f19e..67397a8ce944b47379c0139984f96d8e649ddcd0 100644 (file)
--- a/chardev/char-ringbuf.c
+++ b/chardev/char-ringbuf.c
@@ -27,6 +27,7 @@
 #include "qapi/error.h"
 #include "qapi/qapi-commands-char.h"
 #include "qemu/base64.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 /* Ring buffer chardev */

diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index a8bae31b8dda416ffa7984b65d7b5c089978d91b..5b833ea0773bf5a850ac8409e796eff3d06b4910 100644 (file)
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "io/channel-file.h"

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index b2cf593107e9651b16d7cac47ed6f0ba18617920..7ca5d97af34129988d7099a110d009aecbcd3583 100644 (file)
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -29,6 +29,7 @@
 #include "io/channel-websock.h"
 #include "io/net-listener.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qapi/error.h"
 #include "qapi/clone-visitor.h"

diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c
index 9624220e6d5ebf297f0380cbd949ad3d1f8fe4d9..82eaebc1db6528b9238455d0ae3710134abaebee 100644 (file)
--- a/chardev/char-stdio.c
+++ b/chardev/char-stdio.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"

diff --git a/chardev/char-udp.c b/chardev/char-udp.c
index 097a2f0f42d0f9c1bf6c56b35a1ddace883e5f8f..bba4145f96e88e17dd9f10d142efe15b8c7bfcb6 100644 (file)
--- a/chardev/char-udp.c
+++ b/chardev/char-udp.c
@@ -26,6 +26,7 @@
 #include "chardev/char.h"
 #include "io/channel-socket.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 #include "chardev/char-io.h"

diff --git a/chardev/char-win-stdio.c b/chardev/char-win-stdio.c
index efcf7827eb026bcd671f7c3889dc96dff4291a9b..92d34e85aaf0af0db843f7d7ed0a99a22cf8574f 100644 (file)
--- a/chardev/char-win-stdio.c
+++ b/chardev/char-win-stdio.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "chardev/char-win.h"
 #include "chardev/char-win-stdio.h"
 

diff --git a/chardev/char-win.c b/chardev/char-win.c
index 05518e095822c2a7ec97192e0ea6802d31eb8fbf..0b8181339dbdde87a57f14efb897c4c6528667cb 100644 (file)
--- a/chardev/char-win.c
+++ b/chardev/char-win.c
@@ -21,8 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "chardev/char-win.h"
 

diff --git a/chardev/char.c b/chardev/char.c
index 54724a56b1d8cbccf87aa976f2ac75ec82cb19d8..e4887bcc8202fa0aeaca43291c2e81bdc78e2079 100644 (file)
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -35,6 +35,7 @@
 #include "qapi/qmp/qerror.h"
 #include "sysemu/replay.h"
 #include "qemu/help_option.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 #include "chardev/char-mux.h"

diff --git a/chardev/msmouse.c b/chardev/msmouse.c
index 0ffd137ce8eade2dc6bb1864cbd2edaf1b315147..6d8f06fed44c9c6a0f25099d7d5c0d45aeb97d57 100644 (file)
--- a/chardev/msmouse.c
+++ b/chardev/msmouse.c
@@ -21,8 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "chardev/char.h"
 #include "ui/console.h"
 #include "ui/input.h"

diff --git a/chardev/spice.c b/chardev/spice.c
index 22c30ae833dd99093465f65bdc9939b701ccbccf..241e2b7770eb322f7a0f2521347d38800aa177f5 100644 (file)
--- a/chardev/spice.c
+++ b/chardev/spice.c
@@ -5,6 +5,7 @@
 #include "chardev/spice.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include <spice/protocol.h>
 

diff --git a/chardev/testdev.c b/chardev/testdev.c
index 031e9a23e8b4e5d51b41e241a4671cd4fdaa413c..368a8c041e55f4b87d651bf9b4d9cab81a914d38 100644 (file)
--- a/chardev/testdev.c
+++ b/chardev/testdev.c
@@ -23,8 +23,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "chardev/char.h"
 
 #define BUF_SIZE 32

diff --git a/chardev/wctablet.c b/chardev/wctablet.c
index 35dbd29a3376f67ed410fcecd38c963307fed6c8..e9cb7ca71069e80b0924a16840f5146fad658f11 100644 (file)
--- a/chardev/wctablet.c
+++ b/chardev/wctablet.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "chardev/char-serial.h"
 #include "ui/console.h"
 #include "ui/input.h"

diff --git a/crypto/secret.c b/crypto/secret.c
index 388abd7df5f0d78fb71cc95e4b23f492f5fc2c76..30294b3229e8dac23a85b57c0215b0e774c9a116 100644 (file)
--- a/crypto/secret.c
+++ b/crypto/secret.c
@@ -24,6 +24,7 @@
 #include "qapi/error.h"
 #include "qom/object_interfaces.h"
 #include "qemu/base64.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 

diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
index 02255a6f3c6e0f08e09a125766bba1cd014fa4db..50ecb704ee0fbde5e95d11d4dc9ce1dbef9b38aa 100644 (file)
--- a/crypto/tlscreds.c
+++ b/crypto/tlscreds.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "tlscredspriv.h"
 #include "trace.h"
 

diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
index 7ad66d1e7d123cbd2dc529e0dfd0d59164e66d6c..3024b17cfd85d3e9d395c65ed01ec64a6814256b 100644 (file)
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -22,6 +22,7 @@
 #include "crypto/tlscredsanon.h"
 #include "tlscredspriv.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qom/object_interfaces.h"
 #include "trace.h"
 

diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c
index 7be7c8efdd78e3462048eaaae15e69c678d00440..9c53c6c7b1e04a05b07bed130283e1b4cf21fe50 100644 (file)
--- a/crypto/tlscredspsk.c
+++ b/crypto/tlscredspsk.c
@@ -22,6 +22,7 @@
 #include "crypto/tlscredspsk.h"
 #include "tlscredspriv.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qom/object_interfaces.h"
 #include "trace.h"
 

diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index d6ab4a98622ec1549ac78c37ea97430ffb55c4f2..5247dd3b18fcd9f76cb45c47058e1884c0efc407 100644 (file)
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -23,6 +23,7 @@
 #include "tlscredspriv.h"
 #include "crypto/secret.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qom/object_interfaces.h"
 #include "trace.h"
 

diff --git a/fsdev/qemu-fsdev-dummy.c b/fsdev/qemu-fsdev-dummy.c
index 489cd29081f798d2429c3100090b4c8bb7ecf9fb..8444a254be371ca18668eef45ddf13caf11c2087 100644 (file)
--- a/fsdev/qemu-fsdev-dummy.c
+++ b/fsdev/qemu-fsdev-dummy.c
@@ -10,10 +10,10 @@
  * the COPYING file in the top-level directory.
  *
  */
+
 #include "qemu/osdep.h"
 #include "qemu-fsdev.h"
 #include "qemu/config-file.h"
-#include "qemu/module.h"
 
 int qemu_fsdev_add(QemuOpts *opts, Error **errp)
 {

diff --git a/gdbstub.c b/gdbstub.c
index 9159d7d15314f58ae9a38b55f648b364e3ef7d18..1ba80f09f6fab2cd62b02486e9261c5d74a395ae 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -22,6 +22,7 @@
 #include "qemu/error-report.h"
 #include "qemu/ctype.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include "trace-root.h"
 #ifdef CONFIG_USER_ONLY
 #include "qemu.h"

diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 775e8ff76671af90841c66ff3433eae291018450..a3288cbe56adae814ed7b02eafaba37aa40f149b 100644 (file)
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -19,6 +19,7 @@
 #include "coth.h"
 #include "hw/virtio/virtio-access.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 
 static void virtio_9p_push_and_notify(V9fsPDU *pdu)
 {

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 9ed1629f36711812a0a761af6d42dc250bb9a084..228828a494dee6a59540f917246ded075554511a 100644 (file)
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -30,6 +30,7 @@
 #include "qapi/qapi-events-run-state.h"
 #include "qapi/qapi-visit-misc.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 
 struct acpi_table_header {

diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
index 02717a8b0dc0d030216e206b0f4b0a1083e6a34d..b891df375f8c02f9f97b332d9627aaaa7f91271b 100644 (file)
--- a/hw/acpi/vmgenid.c
+++ b/hw/acpi/vmgenid.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc.h"
+#include "qemu/module.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/aml-build.h"
 #include "hw/acpi/vmgenid.h"

diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c
index 329a8aa6732882122f2ab7790ccfcd8070d3d998..c93b60e22e07a8e6b42dbd9e4b314c0b6f3608d3 100644 (file)
--- a/hw/adc/stm32f2xx_adc.c
+++ b/hw/adc/stm32f2xx_adc.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/adc/stm32f2xx_adc.h"
 
 #ifndef STM_ADC_ERR_DEBUG

diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 9d57361c6702a1c356444ae820d8e234bfab157c..3f34a5153ff0af9f0921ce82add01288bb39edb9 100644 (file)
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -7,6 +7,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"

diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index 06ec6f4dc83ded389becebc3cf547aaf9db78231..35e906ca54f7157a4b9ade09464261d70e669592 100644 (file)
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -17,7 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
 #include "hw/arm/allwinner-a10.h"

diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
index 83b920334d5b6b95c1b7d89bf5f7cd9b16b9104c..47d13312dc1ca51a20dfb9c6c10cd13c27258173 100644 (file)
--- a/hw/arm/armsse.c
+++ b/hw/arm/armsse.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/bitops.h"
 #include "qapi/error.h"
 #include "trace.h"

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index 029572258f0d959290b6bdb79229fc32c113b516..1a8a6c8bf92003c4904275d87e07c10c03ec1ca1 100644 (file)
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -10,7 +10,6 @@
 #include "qemu/osdep.h"
 #include "hw/arm/armv7m.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
 #include "hw/arm/boot.h"
@@ -18,6 +17,7 @@
 #include "elf.h"
 #include "sysemu/qtest.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "exec/address-spaces.h"
 #include "target/arm/idau.h"
 

diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index faff42b84ad12ce1af85e6e1420312f7f596760b..a2ea8c748449ea72cc6161a40db88015024b91a8 100644 (file)
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -12,13 +12,13 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "exec/address-spaces.h"
 #include "hw/misc/unimp.h"
 #include "hw/arm/aspeed_soc.h"
 #include "hw/char/serial.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/i2c/aspeed_i2c.h"
 #include "net/net.h"
 

diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
index 0fb54c7964e53aa578faa8fc966b11f04893dc2d..8984e2e91f8a305f1f2df3323c5124541f557f37 100644 (file)
--- a/hw/arm/bcm2835_peripherals.c
+++ b/hw/arm/bcm2835_peripherals.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/arm/bcm2835_peripherals.h"
 #include "hw/misc/bcm2835_mbox_defs.h"
 #include "hw/arm/raspi_platform.h"

diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index 6a09c339d3ae0038b948deebde1a8076a93d49b3..493a913f892c467ea852423a4dad471cf4c0d3c7 100644 (file)
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -10,7 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/arm/bcm2836.h"
 #include "hw/arm/raspi_platform.h"

diff --git a/hw/arm/digic.c b/hw/arm/digic.c
index 6ef26c6bac39ffcf849ee36f281248e7343a0f4d..9015b60c230a2f70d11213d38e9d269c9d01b1d1 100644 (file)
--- a/hw/arm/digic.c
+++ b/hw/arm/digic.c
@@ -22,6 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/arm/digic.h"
 #include "sysemu/sysemu.h"
 

diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index 7b7b97f74ca0e26fcd38fb6f1b2e7d292eb6cb18..7129517378c1a5254953966b47865c6c88506dae 100644 (file)
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -21,11 +21,11 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "hw/arm/fsl-imx6.h"
 #include "sysemu/sysemu.h"
 #include "chardev/char.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #define IMX6_ESDHC_CAPABILITIES     0x057834b4
 

diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c
index 4b56bfa8d166f37a3ce02e50693903faccbdf2f5..05505bac56811f59cfb0f237c61b43a1cb0d637d 100644 (file)
--- a/hw/arm/fsl-imx6ul.c
+++ b/hw/arm/fsl-imx6ul.c
@@ -18,11 +18,11 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "hw/arm/fsl-imx6ul.h"
 #include "hw/misc/unimp.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #define NAME_SIZE 20
 

diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c
index 7663ad68610a5a2531554a89f7c55f018cf255af..b7e3526b4f3acd39641b3cec0ce021835de59629 100644 (file)
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -20,11 +20,11 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "hw/arm/fsl-imx7.h"
 #include "hw/misc/unimp.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #define NAME_SIZE 20
 

diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index 3d7c88910e01b6b2948d72830fa7a1a1ce67d31d..432876958dcaf456609d6f73a628c3f63609059f 100644 (file)
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -9,8 +9,8 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
 #include "hw/arm/pxa.h"

diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c
index e15070188eaa5546a0e3e4068f587b70d3e591f2..d1fc9cba67eb10e9a5d824d2c8a9ee1254a4fbd9 100644 (file)
--- a/hw/arm/pxa2xx_gpio.c
+++ b/hw/arm/pxa2xx_gpio.c
@@ -13,6 +13,7 @@
 #include "hw/sysbus.h"
 #include "hw/arm/pxa.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define PXA2XX_GPIO_BANKS      4
 

diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c
index 61275fa040fd44dc2070997dd3df8da2c2800a67..2f4b46156277a940f96bd0dc5e1e38fe0d602398 100644 (file)
--- a/hw/arm/pxa2xx_pic.c
+++ b/hw/arm/pxa2xx_pic.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"

diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
index e94be6db6c1da816f9c36ca78b68b4253e8a791d..717d22bcbe78c62b339fe0091876aed229e79d75 100644 (file)
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -25,6 +25,7 @@
 #include "hw/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/jhash.h"
+#include "qemu/module.h"
 
 #include "qemu/error-report.h"
 #include "hw/arm/smmu-common.h"

diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index a5b6f7bda2bb8c8b9c1eb393a80e9fa24408b8c5..c08041a1c55a1cbe6167a91fb7bc2fb3ac1506b1 100644 (file)
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "hw/arm/boot.h"
 #include "exec/address-spaces.h"
 #include "hw/arm/stm32f205_soc.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index bf54f10b515de1619a885c405b86898898b296bb..fae6779de302a12dbb3224e6fc3b73beefa091c2 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -49,6 +49,7 @@
 #include "exec/address-spaces.h"
 #include "qemu/bitops.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/pci-host/gpex.h"
 #include "hw/arm/sysbus-fdt.h"
 #include "hw/platform-bus.h"

diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index e8e4278eb3bf00b620cede644ef309e48a7edf94..98163eb1aaddb30f84477482d0433c3517afdfc8 100644 (file)
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -11,8 +11,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index 6e991903022b2c30a0a6fbf4b9b1faa4575b366f..a1ca9b5adf31ba84e72fcfc070c455431cc6f06b 100644 (file)
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -17,7 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/arm/xlnx-zynqmp.h"
 #include "hw/intc/arm_gic_common.h"

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index a4e8d99e7775e8cc122a2ddd50b1018b75e96451..fb98da267807da06b694d367178370a480821890 100644 (file)
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -22,6 +22,7 @@
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/pci/pci.h"
+#include "qemu/module.h"
 #include "sysemu/dma.h"
 
 enum {

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 0957780a3dc0ceae56e1530b5794e00b363eab02..7dd9a89b89fbf18dea7510b60bba86cbe571494f 100644 (file)
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"

diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c
index 30690f96ae43c4bb040bee80172029af2cebe077..8372299ebb4227bcbcf13f17f4b269a567a07667 100644 (file)
--- a/hw/audio/cs4231.c
+++ b/hw/audio/cs4231.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /*

diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index 62da75eefebb6cbf83bcf6fea75d9fef6f286fa4..7216b41cc18e1040b202389573f8f00009a8ed77 100644 (file)
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -21,12 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qapi/error.h"
 

diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index a5314d66fdc271e6b9a4fe3935afa42da7557c36..260c142b7008dee5ad078a59f1a6117450e4bd8d 100644 (file)
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -31,6 +31,7 @@
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/pci/pci.h"
+#include "qemu/module.h"
 #include "sysemu/dma.h"
 
 /* Missing stuff:

diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index b3e2a7fdd5044babfcd9bbed1b8eaddd2d05a470..9ab51631d9e5c26fe982ae1e4dcfe8ebdf0e003f 100644 (file)
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"

diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index c25bfa38b143df22781414a28ecc35633fa87ef5..84639b54245eed75d12ccf9f067e93f5afb186b4 100644 (file)
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -21,6 +21,7 @@
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "intel-hda.h"
+#include "qemu/module.h"
 #include "intel-hda-defs.h"
 #include "audio/audio.h"
 #include "trace.h"

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 33e333cc26d71f13f19f248101be828a080f9833..b78baac29542fcf9b3f1a5329dd5dc548499e86f 100644 (file)
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -24,6 +24,7 @@
 #include "qemu/timer.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/audio/soundhw.h"
 #include "intel-hda.h"
 #include "intel-hda-defs.h"

diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c
index 035dd76cbfa3c87e494d608a71cfb9de1c4d45ea..ff1a0d0d8ffe31e8e772c869b1c4ddd4b66fc52a 100644 (file)
--- a/hw/audio/marvell_88w8618.c
+++ b/hw/audio/marvell_88w8618.c
@@ -9,12 +9,14 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
+
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "hw/audio/wm8750.h"
 #include "audio/audio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #define MP_AUDIO_SIZE           0x00001000
 

diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c
index 90cce1e6ededff4071b8d46c8c6037ab4e7cce5d..bf6a5a6b96046ba38bd4898ca407175f6c725607 100644 (file)
--- a/hw/audio/milkymist-ac97.c
+++ b/hw/audio/milkymist-ac97.c
@@ -27,6 +27,7 @@
 #include "trace.h"
 #include "audio/audio.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 enum {
     R_AC97_CTRL = 0,

diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index 9c7fd74aeba7f678c41e86ec039d86755a6170e8..a7b3ab0c2b916f168ad74bfd2d68ea1a7fdfc620 100644 (file)
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -27,6 +27,7 @@
 #include "hw/isa/isa.h"
 #include "hw/audio/soundhw.h"
 #include "audio/audio.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/timer/i8254.h"
 #include "hw/audio/pcspk.h"

diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c
index c8cc503236e6b492a2ed1af11f8b580f1135c11a..59c6ce1f2ea0a1eeb61b2133502c57eed492d3d5 100644 (file)
--- a/hw/audio/pl041.c
+++ b/hw/audio/pl041.c
@@ -23,6 +23,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #include "pl041.h"
 #include "lm4549.h"

diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 65ea0cd93832e1372a5cec4e7976aa92c45b0e0a..a2db06a2bb2837772051af02683edff1589007f8 100644 (file)
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/audio/soundhw.h"
@@ -30,6 +31,7 @@
 #include "qemu/timer.h"
 #include "qemu/host-utils.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 #define dolog(...) AUD_log ("sb16", __VA_ARGS__)

diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c
index ca0ad73caf7d816e761bd342aa53b75706078dca..81f83eea881f3565d942643241f799ce0908e9bb 100644 (file)
--- a/hw/audio/wm8750.c
+++ b/hw/audio/wm8750.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
+#include "qemu/module.h"
 #include "hw/audio/wm8750.h"
 #include "audio/audio.h"
 

diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 37ccedc9f738d48ef2f8bfd7faadd23cd0edaae1..a64378f84bbdce35f2aff43a77c8a7b37bc91b4b 100644 (file)
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -40,6 +40,7 @@
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /********************************************************/

diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index e8dfa14b332f83cdf71b6002a4496767ddb54375..dd87affcf5f54c64a019f6af38111d2496b75af6 100644 (file)
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -28,6 +28,7 @@
 #include "hw/ssi/ssi.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 

diff --git a/hw/block/nand.c b/hw/block/nand.c
index 919cb9b803be127de719ac98b5f316b26222f9b3..0a2736b50eb54c1c111ba33dac52fb0e5c5cbd00 100644 (file)
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -25,6 +25,7 @@
 #include "hw/qdev.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 # define NAND_CMD_READ0                0x00
 # define NAND_CMD_READ1                0x01

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 30e50f7a385356eb84e01973ecac86a601b7d5df..107a719b953155ae6546ffaaddfe08f0d2fac836 100644 (file)
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -37,6 +37,7 @@
 #include "sysemu/block-backend.h"
 
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/cutils.h"
 #include "trace.h"
 #include "nvme.h"

diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index f11118a6876e2e855ec70a5832161fcff72e8829..b3644f7e897bb009e4958faf4d0be006125e4a4d 100644 (file)
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "hw/hw.h"
 #include "hw/block/flash.h"
 #include "hw/irq.h"
@@ -29,6 +28,7 @@
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /* 11 for 2kB-page OneNAND ("2nd generation") and 10 for 1kB-page chips */
 #define PAGE_SHIFT     11

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 333b73627718a8312f72722857e63782f285ba64..35080d915f75f8913c7e7861914aea44f795a35d 100644 (file)
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -47,6 +47,7 @@
 #include "qemu/error-report.h"
 #include "qemu/host-utils.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "hw/sysbus.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index f2c6201f813e77cc452483119afecc833ba62eaf..eb106f499648a1f19df58bbe20479b868c72b826 100644 (file)
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -43,6 +43,7 @@
 #include "qemu/timer.h"
 #include "sysemu/block-backend.h"
 #include "qemu/host-utils.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "trace.h"
 

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 06e57a4d395d51e42cab346ac98207dfc894ad05..cbb3729158fed8d658858985007cc8f87929fee8 100644 (file)
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -13,8 +13,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "trace.h"
 #include "hw/block/block.h"

diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index 31b0f5ccc85fc854ec4c36d431875f1eed4792bd..4de537aef4af3cca72a6ccf3c74ff7827633bc94 100644 (file)
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -7,6 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-block-core.h"

diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index fa6660a11399d8d52bed21b29a8fb2b8035d27fd..3d60654f44c1c88ca29637c461e71f53b33e89d5 100644 (file)
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "chardev/char-serial.h"
 #include "qemu/timer.h"
 #include "qemu/bswap.h"

diff --git a/hw/char/bcm2835_aux.c b/hw/char/bcm2835_aux.c
index 0364596c5524e83ffc6ee0d8d0d411a225dcc29e..94679d276cbc00e231e4081391c6af6f17f72757 100644 (file)
--- a/hw/char/bcm2835_aux.c
+++ b/hw/char/bcm2835_aux.c
@@ -23,6 +23,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/bcm2835_aux.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define AUX_IRQ         0x0
 #define AUX_ENABLES     0x4

diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index fbdbd463bb5d9141400af53643ce6aed1cd26499..fa25fe24da18908a19e14549ab0864c39b73ada8 100644 (file)
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -27,6 +27,7 @@
 #include "chardev/char-serial.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/char/cadence_uart.h"
 
 #ifdef CADENCE_UART_ERR_DEBUG

diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c
index ddfbb25c249972b6e25c6e629f9845d7b6c87b5a..606c9cc7d60dd2cd3540678c5dd4bbbd25af9e90 100644 (file)
--- a/hw/char/cmsdk-apb-uart.c
+++ b/hw/char/cmsdk-apb-uart.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/sysbus.h"

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index e2abc61b042c4cee7036e7da9d1ea6e2284edf66..e1b6d1190f468c9cbcb193a36624cf4814959828 100644 (file)
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -26,6 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "chardev/char-fe.h"
 #include "hw/isa/isa.h"

diff --git a/hw/char/digic-uart.c b/hw/char/digic-uart.c
index ccc75eaa4df6d7b83915ce6b7eabbaf2a34cd953..e4ac8435c83d8b9a516817ef0d4f71dce0b08be5 100644 (file)
--- a/hw/char/digic-uart.c
+++ b/hw/char/digic-uart.c
@@ -31,6 +31,7 @@
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #include "hw/char/digic-uart.h"
 

diff --git a/hw/char/escc.c b/hw/char/escc.c
index c5b05a63f140ee13261f53665301ee8ae4bbbf1b..8ddbb4be4fab1aa919ab32f9b6a573b863a72aed 100644 (file)
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "hw/char/escc.h"
 #include "ui/console.h"
 #include "trace.h"

diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index a18402641085d7efbedf319a94a84d7de0a6de80..9745bca86c922767b56382b65cb15e3acf9e52ef 100644 (file)
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define D(x)
 

diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index a5a285655fc42adaf40b0e7e425ed8cb5e22aff0..c5700eeaec4f0b0fcd293b7596b0fd766e5258ab 100644 (file)
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -22,6 +22,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "chardev/char-fe.h"
 #include "chardev/char-serial.h"

diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index 9623016d56a8d18300ea0f6697deb1fc30c4f3ed..c2bb3ac15312796c6caa890c16da4d1e8d2df723 100644 (file)
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/sparc/grlib.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "chardev/char-fe.h"
 
 #include "trace.h"

diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
index 1e363190e3d68cc4d25f35abfc859cc134ffcd39..0655a9571bc7eb0f4e154fe2c4443cd6886f0d48 100644 (file)
--- a/hw/char/imx_serial.c
+++ b/hw/char/imx_serial.c
@@ -22,6 +22,7 @@
 #include "hw/char/imx_serial.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef DEBUG_IMX_UART
 #define DEBUG_IMX_UART 0

diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index 5e09caf851e7d0040bd56627b202be0a092261f2..5ab731e40806e55f6e19691cda1fbfe730773fd6 100644 (file)
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/ipack/ipack.h"
 #include "qemu/bitops.h"
+#include "qemu/module.h"
 #include "chardev/char-fe.h"
 
 /* #define DEBUG_IPOCTAL */

diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index d75c835ad22a8e5b0264f9e0b254b9de5433a0bd..41a3ec81e36c868e82d6a7867f81bdb3fb00f363 100644 (file)
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "chardev/char-fe.h"
 

diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c
index c4a3b9b275595404078684c3f9254b8b27d0e17e..d047a44e342050eb3f3aeab2857333d0a88f3c25 100644 (file)
--- a/hw/char/lm32_uart.c
+++ b/hw/char/lm32_uart.c
@@ -28,6 +28,7 @@
 #include "trace.h"
 #include "chardev/char-fe.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 enum {
     R_RXTX = 0,

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 787f985db6bf83e0a7a4e4e2d68922ae59a0c6f3..7b06110c4d6aaab63662dab612c66600ec7b3456 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -5,9 +5,11 @@
  *
  * This code is licensed under the GPL
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "hw/m68k/mcf.h"
 #include "chardev/char-fe.h"
 

diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index 548ee27bca278aa174f4507e4ffeb7666f7fd298..8a78fcca8f012d2b476c60129cf57bf18d70bb53 100644 (file)
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -27,6 +27,7 @@
 #include "trace.h"
 #include "chardev/char-fe.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 enum {
     R_RXTX = 0,

diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c
index 2f5fae61671f16605f0e958ac678c1efc520a21a..c90b49147722e6c19b9ab4034f83a6575006374a 100644 (file)
--- a/hw/char/nrf51_uart.c
+++ b/hw/char/nrf51_uart.c
@@ -14,6 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/char/nrf51_uart.h"
 #include "trace.h"
 

diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index a80da47ecf567dc0ff1738c021204efadd5a17d0..1cd4c54a02261e52802513168f3d2b2d39de3bbe 100644 (file)
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -22,8 +22,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "chardev/char-parallel.h"
 #include "chardev/char-fe.h"

diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index e5dd448f8546f42211c150fcf53885c95bd0ca5c..c1ae2f31f5184f49e901afefe1c7d74ce9bd93d8 100644 (file)
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -23,6 +23,7 @@
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define PL011_INT_TX 0x20

diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c
index dbc91a1e5b674fd098650ded3c1e2084ae1c47c0..691dc870eddc37be65207e4faf57952360163365 100644 (file)
--- a/hw/char/sclpconsole-lm.c
+++ b/hw/char/sclpconsole-lm.c
@@ -17,6 +17,7 @@
 #include "hw/qdev.h"
 #include "qemu/thread.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "chardev/char-fe.h"
 
 #include "hw/s390x/sclp.h"

diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c
index 1fa16e90556ac082452fb84f24f413ff1711ef1e..09b1d45d7acea328ab2d4a22b4bf7b8e7094f8c5 100644 (file)
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -16,6 +16,7 @@
 #include "hw/qdev.h"
 #include "qemu/thread.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #include "hw/s390x/sclp.h"
 #include "hw/s390x/event-facility.h"

diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c
index 116b7b2e69d4cf75a3350e48da2a8c8f27a3ef2a..610426111af6c6f726334cfb815b9f26aba789ba 100644 (file)
--- a/hw/char/serial-isa.c
+++ b/hw/char/serial-isa.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/char/serial.h"
 #include "hw/isa/isa.h"
 

diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 2d5ffae5cf52e3e7cae18967adf6c06c204f4129..9028efbda8671e165a1b4061d1bd55c2eeed4014 100644 (file)
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -27,6 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/char/serial.h"
 #include "hw/pci/pci.h"
 

diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 617303dbaf2ab8fea76060fda86aa8ef546300b7..871d2666f3ea1645aeac215dfbf02d31359a9284 100644 (file)
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -1,7 +1,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "hw/qdev.h"
 #include "chardev/char-fe.h"

diff --git a/hw/char/stm32f2xx_usart.c b/hw/char/stm32f2xx_usart.c
index 10392c70e2ddea0caea8b1d7eeb10b507126cb1e..40c365b908280ef1b63e4fc6a54db7089a4e8e91 100644 (file)
--- a/hw/char/stm32f2xx_usart.c
+++ b/hw/char/stm32f2xx_usart.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/stm32f2xx_usart.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef STM_USART_ERR_DEBUG
 #define STM_USART_ERR_DEBUG 0

diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c
index 35b079d5c4bc8dc46ce8bafe2df745bf2c095d98..3785886c2546b079a4f7e85bed05b88c32f068e7 100644 (file)
--- a/hw/char/terminal3270.c
+++ b/hw/char/terminal3270.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "chardev/char-fe.h"
 #include "hw/s390x/3270-ccw.h"
 

diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 2cbe1d4ed511fcc0e738f0fd86496fd3c3e7ce0a..1bbeb00fae6b8455aac1248190b7a171463caf82 100644 (file)
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "chardev/char-fe.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "hw/virtio/virtio-serial.h"
 #include "qapi/error.h"

diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index bdd917bbb83c2413d44fcf84622754a36b6f9f5d..f7a54f261b21e9d351f374d51e91212351d1214b 100644 (file)
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"
 #include "qemu/queue.h"

diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index 2a8bc1e49756424b00f9bd9793121923c20e94bb..880962a756538a17dab8eaf32e72c05b1edb331a 100644 (file)
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "chardev/char-fe.h"
 
 #define DUART(x)

diff --git a/hw/core/bus.c b/hw/core/bus.c
index 60c47203791c44802ead69c33ac09f0e4fbffe03..e6baa04e52b48f9acaf27a9b9a7d6af33eba489b 100644 (file)
--- a/hw/core/bus.c
+++ b/hw/core/bus.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/ctype.h"
+#include "qemu/module.h"
 #include "hw/qdev.h"
 #include "qapi/error.h"
 

diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c
index 239f78e2a771c068fa57a90b6469a58469869858..c69453204691ad2a5f5a5178067b970fd6edc893 100644 (file)
--- a/hw/core/empty_slot.c
+++ b/hw/core/empty_slot.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "hw/empty_slot.h"
 
 //#define DEBUG_EMPTY_SLOT

diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
index 33b99830e78473650e5c9101efda979d1708d3b6..4840faefd1af1caf8f7a79a7399cdad2f448d457 100644 (file)
--- a/hw/core/fw-path-provider.c
+++ b/hw/core/fw-path-provider.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/fw-path-provider.h"
+#include "qemu/module.h"
 
 char *fw_path_provider_get_dev_path(FWPathProvider *p, BusState *bus,
                                     DeviceState *dev)

diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c
index 3695dd439cd07699dd10d28afcc7605edc5d5625..79a493e577ba57f565fa098379930e730b420836 100644 (file)
--- a/hw/core/generic-loader.c
+++ b/hw/core/generic-loader.c
@@ -36,6 +36,7 @@
 #include "sysemu/dma.h"
 #include "hw/loader.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/core/generic-loader.h"
 
 #define CPU_NONE 0xFFFFFFFF

diff --git a/hw/core/nmi.c b/hw/core/nmi.c
index bfd0896daf57b413e896c2065785031dce32fd35..481c4b3c7e53a5dc500c1f3d92c72aa9f04baa39 100644 (file)
--- a/hw/core/nmi.c
+++ b/hw/core/nmi.c
@@ -23,6 +23,7 @@
 #include "hw/nmi.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/module.h"
 #include "monitor/monitor.h"
 
 struct do_nmi_s {

diff --git a/hw/core/or-irq.c b/hw/core/or-irq.c
index a86901b673c1c9a892d8dc16d363e3c871e5005b..123a8c644a6a8bc42325046f16643d6791fced74 100644 (file)
--- a/hw/core/or-irq.c
+++ b/hw/core/or-irq.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/or-irq.h"
+#include "qemu/module.h"
 
 static void or_irq_handler(void *opaque, int n, int level)
 {

diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index e473a447468d72e2a266a2de9159ca2e6a0369ef..5fecb29239ebc6b0fd8918ab3f5bc1535f499928 100644 (file)
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -22,6 +22,7 @@
 #include "qemu/osdep.h"
 #include "hw/platform-bus.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 
 

diff --git a/hw/core/register.c b/hw/core/register.c
index d2d1636250b3a79309d61035790ec67cbf3b26a0..bb5ab9d4790c7785580d7c3915cb1ec02360bd09 100644 (file)
--- a/hw/core/register.c
+++ b/hw/core/register.c
@@ -19,6 +19,7 @@
 #include "hw/register.h"
 #include "hw/qdev.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 static inline void register_write_val(RegisterInfo *reg, uint64_t val)
 {

diff --git a/hw/core/split-irq.c b/hw/core/split-irq.c
index 7e64cd49693a99eb094caa7852df1c6f5de43dfa..c606f4a802a955f6258647603b833042749e3de1 100644 (file)
--- a/hw/core/split-irq.c
+++ b/hw/core/split-irq.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/core/split-irq.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 static void split_irq_handler(void *opaque, int n, int level)
 {

diff --git a/hw/core/stream.c b/hw/core/stream.c
index 4439ecdf0b98854b397e1781e9f2d06160a7570e..39b1e595cd90b6575870b914490856fdbeee12fe 100644 (file)
--- a/hw/core/stream.c
+++ b/hw/core/stream.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/stream.h"
+#include "qemu/module.h"
 
 size_t
 stream_push(StreamSlave *sink, uint8_t *buf, size_t len)

diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index 689a867a2274905a7a0aa167b89dc4ae1f69af93..9e69c83aedfe8578e9988ba93e7916e6ff12219c 100644 (file)
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "monitor/monitor.h"
 #include "exec/address-spaces.h"

diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index 5649843cd8ea2c5fa85c3647c195e2dd37c29ffc..980f230d758adbb979b38605736182609c63288a 100644 (file)
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/cpu/a15mpcore.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"

diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index a5b867872ccfb9dcfadb847c94297f8d5ca8b103..187e4d939ededaa8d52f6b72a0357a15fa79ad8a 100644 (file)
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/cpu/a9mpcore.h"
 #include "qom/cpu.h"
 

diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c
index 8aead3794e8b7a6f215889caa4f8c33068ef9b0f..2404f93a3ea3fb01b64331675eca4cd1995b87d4 100644 (file)
--- a/hw/cpu/arm11mpcore.c
+++ b/hw/cpu/arm11mpcore.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
 

diff --git a/hw/cpu/core.c b/hw/cpu/core.c
index 7e42e2c87a50ba664953ee94fe3da834d1976876..e57c73f0ce273639c216ff8a49c1c6a4256ae072 100644 (file)
--- a/hw/cpu/core.c
+++ b/hw/cpu/core.c
@@ -6,9 +6,11 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "hw/cpu/core.h"
 #include "qapi/visitor.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "sysemu/cpus.h"
 

diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c
index 9d3f8378fbea30950dd7975ff13cb6c46279476e..f06294bb5e983fc89b569013c5f6f71c80579ad3 100644 (file)
--- a/hw/cpu/realview_mpcore.c
+++ b/hw/cpu/realview_mpcore.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
 

diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c
index 166edade7dc00933674cc22c39e341d49cbea9fa..1a97e9763830620ffcca398df9c7d6e63ac33867 100644 (file)
--- a/hw/display/ads7846.c
+++ b/hw/display/ads7846.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 
 typedef struct {

diff --git a/hw/display/ati.c b/hw/display/ati.c
index 75716dd944ec13f3f1220cdcdc5862a79ee23ded..76595d9511810741fe356eb9289f14fa4c5ba1e5 100644 (file)
--- a/hw/display/ati.c
+++ b/hw/display/ati.c
@@ -21,6 +21,7 @@
 #include "ati_regs.h"
 #include "vga_regs.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "hw/hw.h"

diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 599863e4e17fb91ad67a50d8d8a96894d6eeb2de..2311ec75b804e7643936791413235a8b8d22c2f2 100644 (file)
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -30,6 +30,7 @@
 #include "ui/pixel_ops.h"
 #include "hw/misc/bcm2835_mbox_defs.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define DEFAULT_VCRAM_SIZE 0x4000000
 #define BCM2835_FB_OFFSET  0x00100000

diff --git a/hw/display/bochs-display.c b/hw/display/bochs-display.c
index 3d439eb2407b423079b9365780cd5014f1c4841b..0a2a3e27c446657d3b5cfa22ba4904204917798c 100644 (file)
--- a/hw/display/bochs-display.c
+++ b/hw/display/bochs-display.c
@@ -4,7 +4,9 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"

diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index e50d97e48c4832a4499c88be26e5166cbce61806..c6b7361be257f9cd569b4e49582cac45707da5bd 100644 (file)
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -25,12 +25,12 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"
 #include "hw/sysbus.h"
 #include "hw/loader.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /* Change to 1 to enable debugging */
 #define DEBUG_CG3 0

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 76c052c702ef1ae248e4e0fb4c9b6bf10b2dd115..2e4911a1e321d7b845cfabc8782e6c84e97238e7 100644 (file)
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -31,7 +31,9 @@
  *
  *  https://pdos.csail.mit.edu/6.828/2005/readings/hardware/vgadoc
  */
+
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "trace.h"

diff --git a/hw/display/cirrus_vga_isa.c b/hw/display/cirrus_vga_isa.c
index fa10b74230426a4055bf1066bbc8ae1b5b8edaee..69cdb9e066eb26c292b5623ac1ec0678d61c3a85 100644 (file)
--- a/hw/display/cirrus_vga_isa.c
+++ b/hw/display/cirrus_vga_isa.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/loader.h"
 #include "hw/isa/isa.h"

diff --git a/hw/display/dpcd.c b/hw/display/dpcd.c
index 943002bee5e3fc95a67c3c860c1de8f152486767..88cde54821e3c92195a87f2fed3300895b375890 100644 (file)
--- a/hw/display/dpcd.c
+++ b/hw/display/dpcd.c
@@ -28,6 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/misc/auxbus.h"
 #include "hw/display/dpcd.h"
 

diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 083b3172da4d21eb4f8d96ed2b3645709560ea69..61f7408b1c70c2c84eb7f24fb2f39fffdfa02bcf 100644 (file)
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -23,11 +23,11 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "hw/sysbus.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "qemu/bswap.h"
+#include "qemu/module.h"
 
 /* Debug messages configuration */
 #define EXYNOS4210_FIMD_DEBUG              0

diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 3407adf98d2bb4e4a194d9c4e6eb16e1ba021dd6..1774b4452eedb7532938d618e74a651c0646358a 100644 (file)
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -21,6 +21,7 @@
 #include "qemu/units.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "trace.h"

diff --git a/hw/display/i2c-ddc.c b/hw/display/i2c-ddc.c
index 9fe5403a923e0b23373b67f6f41f3bad42b416d9..041fc4f4089cdcca019a658cfd8f2d7294027991 100644 (file)
--- a/hw/display/i2c-ddc.c
+++ b/hw/display/i2c-ddc.c
@@ -17,8 +17,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/i2c/i2c.h"
 #include "hw/display/i2c-ddc.h"
 

diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c
index eb7933d2a35c02e8b80648073a1c3c7d6d0ac8e2..783189ebcd893dfae20eaa89a1cde8d09bbd6dfa 100644 (file)
--- a/hw/display/jazz_led.c
+++ b/hw/display/jazz_led.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "trace.h"

diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c
index b33fc234e9afe9960bce8d9584e38320625e7727..e1ed018b8f97cb4bbf3ccc1aaa19e629239de4e1 100644 (file)
--- a/hw/display/milkymist-tmu2.c
+++ b/hw/display/milkymist-tmu2.c
@@ -30,6 +30,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/display/milkymist_tmu2.h"
 

diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c
index 177fdac7d87992a38ef041ec3ec19f041547c20f..dce1dd7ad640b62a88d26b9c99f1865a476a9563 100644 (file)
--- a/hw/display/milkymist-vgafb.c
+++ b/hw/display/milkymist-vgafb.c
@@ -30,6 +30,7 @@
 #include "framebuffer.h"
 #include "ui/pixel_ops.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #define BITS 8
 #include "milkymist-vgafb_template.h"

diff --git a/hw/display/pl110.c b/hw/display/pl110.c
index cf68457fd15a2b80a3571c9e3a4cd1e61bdc282e..2bdfc3cc49223be3c2be1e96c62002e6f4cd92d5 100644 (file)
--- a/hw/display/pl110.c
+++ b/hw/display/pl110.c
@@ -14,6 +14,7 @@
 #include "ui/pixel_ops.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define PL110_CR_EN   0x001
 #define PL110_CR_BGR  0x100

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 3880a7410b73eaede24689d9a22f643acbf51c95..98c7410032024f2ff64e5136ba45f6050bf7ea36 100644 (file)
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -23,10 +23,10 @@
 #include <zlib.h>
 
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/queue.h"
 #include "qemu/atomic.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "migration/blocker.h"
 #include "trace.h"

diff --git a/hw/display/ramfb-standalone.c b/hw/display/ramfb-standalone.c
index 6441449e7bc12223f94069637ca6fe546ad4ffef..56215ef88cff88b78a11739a5b628ac774d4ea19 100644 (file)
--- a/hw/display/ramfb-standalone.c
+++ b/hw/display/ramfb-standalone.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/loader.h"
 #include "hw/isa/isa.h"
 #include "hw/display/ramfb.h"

diff --git a/hw/display/sii9022.c b/hw/display/sii9022.c
index 9c36e4c17ec9fb12c093549081ff4ebdc251c604..0bebb85a589909f5acae313d8037fe980195c0f9 100644 (file)
--- a/hw/display/sii9022.c
+++ b/hw/display/sii9022.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "hw/i2c/i2c.h"
 #include "hw/display/i2c-ddc.h"
 #include "trace.h"

diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 1e2709b2d0025f0c5da34a044aa7500a0587bc74..5918f59b2be1c61cca63fc8ba5233755635dcb58 100644 (file)
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -27,7 +27,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/char/serial.h"

diff --git a/hw/display/ssd0303.c b/hw/display/ssd0303.c
index 8edf34986cf2abed4fd301fe8f3f6e67ec74d809..f2a60c44c9e0a95d73b7fe846a9aca6c6d6f60be 100644 (file)
--- a/hw/display/ssd0303.c
+++ b/hw/display/ssd0303.c
@@ -10,8 +10,10 @@
 /* The controller can support a variety of different displays, but we only
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
+
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 
 //#define DEBUG_SSD0303 1

diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c
index e18289315755b544bbe81ee9fefe940881a07667..ac373f1e781b71879becdfc7545ff8507cab1d06 100644 (file)
--- a/hw/display/ssd0323.c
+++ b/hw/display/ssd0323.c
@@ -10,8 +10,10 @@
 /* The controller can support a variety of different displays, but we only
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
+
 #include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 
 //#define DEBUG_SSD0323 1

diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index 66f24592267448a8308b414c13c43edd4067eae0..bd5ac8f82367c5082ab8e6643edab8bd35fd8a9a 100644 (file)
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -24,12 +24,12 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #define TCX_ROM_FILE "QEMU,tcx.bin"
 #define FCODE_MAX_ROM_SIZE 0x10000

diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index fa44242e0dd43f882599d204beb27616bd0de699..945952a9b0c4e5c1cbb020c09102d074806dda32 100644 (file)
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -23,11 +23,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/loader.h"
 

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index a17c96e703febf15c5d01f9c073efa0aa4acc7ef..c66d9ec7ee243cdb854d40ece8873d33a162c81e 100644 (file)
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -23,11 +23,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "vga_int.h"
 #include "ui/pixel_ops.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/loader.h"
 #include "hw/display/edid.h"

diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c
index 206870cd4cc8787053061931e506b1b22323cc23..d6f01b4a988b01fc1b7e0d51f8b817a0b6ce4b38 100644 (file)
--- a/hw/display/virtio-gpu-pci.c
+++ b/hw/display/virtio-gpu-pci.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/pci/pci.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-bus.h"

diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 4a49da5ecbda1bb9926dcd2ddd022e67b5bc5bf9..2b0f66b1d68d089503739a6529b1bf0a8ade2e2f 100644 (file)
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.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 "trace.h"
@@ -25,6 +24,7 @@
 #include "hw/virtio/virtio-bus.h"
 #include "hw/display/edid.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 

diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 67e34935c21f30be99d8022b0575eef97f7d6e78..416e7fec87da0f2e7ee74f61c854ec6f4e1ba220 100644 (file)
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -3,6 +3,7 @@
 #include "hw/pci/pci.h"
 #include "hw/virtio/virtio-gpu.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-vga.h"
 
 static void virtio_vga_base_invalidate_display(void *opaque)

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index afbf1c597389f371fd68c58c6b6c2dd440650dbc..249a179bf61603eda0cbb2def3d55d1d080f2c45 100644 (file)
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -21,7 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "hw/hw.h"

diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index 11b09bd18c19a3baee0aa8b2e55b1b4c33d5d70f..cfd4c700b7f0184e7297e955f6f76624d52d39c4 100644 (file)
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/display/xlnx_dp.h"
 
 #ifndef DEBUG_DP

diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
index 5d144a263324d37a4312dff47224c7d5c22da757..a39e8f496813f8c258a2d6e3e5206a3fd5e2aba0 100644 (file)
--- a/hw/dma/bcm2835_dma.c
+++ b/hw/dma/bcm2835_dma.c
@@ -7,6 +7,7 @@
 #include "qapi/error.h"
 #include "hw/dma/bcm2835_dma.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /* DMA CS Control and Status bits */
 #define BCM2708_DMA_ACTIVE      (1 << 0)

diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index 892f655a7e3cd929130ae2d3bc7bc521b2002334..68fad2dd12f50ecc5db57dd62cbacaafc8563029 100644 (file)
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/isa/isa.h"
 #include "hw/dma/i8257.h"
 

diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 3e1f13a4aaf4dd1320d77d6e87f06ccfdfc61503..30a3442437b22e7ab030c586831de07c50118b7b 100644 (file)
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -21,11 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "hw/dma/i8257.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/log.h"
 #include "trace.h"
 

diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index ef15d3e628dac0ade27a0fb5d46d97a25c2e303d..7e5762457bba91ac32474065ec934d4cddc5df1e 100644 (file)
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -11,6 +11,7 @@
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/dma/pl080.h"
 #include "qapi/error.h"
 

diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index d071049233b101e2922a28c0ed614a9a31a0cc6f..62ad35615648125ff18e8ee0579bb9057a2bf351 100644 (file)
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -20,6 +20,7 @@
 #include "qemu/timer.h"
 #include "sysemu/dma.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef PL330_ERR_DEBUG
 #define PL330_ERR_DEBUG 0

diff --git a/hw/dma/puv3_dma.c b/hw/dma/puv3_dma.c
index c89eade0292e40f14e69af38e02aae9459a41386..122f87aff1f0bc0a19ecb619bf6820d4ff303744 100644 (file)
--- a/hw/dma/puv3_dma.c
+++ b/hw/dma/puv3_dma.c
@@ -8,12 +8,14 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 
 #undef DEBUG_PUV3
 #include "hw/unicore32/puv3.h"
+#include "qemu/module.h"
 
 #define PUV3_DMA_CH_NR          (6)
 #define PUV3_DMA_CH_MASK        (0xff)

diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c
index d498de8ffe3e9628f1f5be7a008f30c05e8d307b..d6fb9574179f79fed9bca186b7a173453d47ba91 100644 (file)
--- a/hw/dma/pxa2xx_dma.c
+++ b/hw/dma/pxa2xx_dma.c
@@ -13,6 +13,7 @@
 #include "hw/arm/pxa.h"
 #include "hw/sysbus.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #define PXA255_DMA_NUM_CHANNELS 16
 #define PXA27X_DMA_NUM_CHANNELS 32

diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index ccd8612888e5e0013033a0f03fbcf00ed9fb445c..6ccafece1854fc2c1f702e848df21acdcd2030bf 100644 (file)
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -28,6 +28,7 @@
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "exec/address-spaces.h"
 #include "trace.h"
 

diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index 7b00a27de6754be49839f7765dea0ee093aa8c22..88765d0c252ad9b8aa301d7cab75b659986f2173 100644 (file)
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -32,6 +32,7 @@
 #include "hw/sysbus.h"
 #include "sysemu/dma.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /*

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 401a328e275fb5c45cef00f9062c2d6c4c454738..921be178d98dd94fccf7552d72265b9f03313505 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -29,6 +29,7 @@
 #include "hw/ptimer.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 
 #include "hw/stream.h"
 

diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index b6745f5bcfa3cdcdf4d95945c89c577cc69d4f44..51e1ead4faf33ab0787cf19d2c9e20a4d2c91e06 100644 (file)
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -30,6 +30,7 @@
 #include "hw/dma/xlnx-zdma.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 #ifndef XLNX_ZDMA_ERR_DEBUG

diff --git a/hw/dma/xlnx-zynq-devcfg.c b/hw/dma/xlnx-zynq-devcfg.c
index 12bb2e37168e9c729f540c21d720cdaabb847de5..7a03ce1b025aa911cb96ec709987fad73cb8b814 100644 (file)
--- a/hw/dma/xlnx-zynq-devcfg.c
+++ b/hw/dma/xlnx-zynq-devcfg.c
@@ -30,6 +30,7 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define FREQ_HZ 900000000
 

diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c
index 077c7da9ccd38a22bb33c853fbed679b7afceef4..040df70a931deaf9bb863bcc689c6d511cddeb6d 100644 (file)
--- a/hw/dma/xlnx_dpdma.c
+++ b/hw/dma/xlnx_dpdma.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/dma/xlnx_dpdma.h"
 
 #ifndef DEBUG_DPDMA

diff --git a/hw/gpio/bcm2835_gpio.c b/hw/gpio/bcm2835_gpio.c
index acc2e3cf9ee555b4beba20487aa1637992fefeef..ba8dd6c393d80d55a9119b33a062d600ecc66bb9 100644 (file)
--- a/hw/gpio/bcm2835_gpio.c
+++ b/hw/gpio/bcm2835_gpio.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"

diff --git a/hw/gpio/gpio_key.c b/hw/gpio/gpio_key.c
index b34aa49dfb8bbe797a82c46e74a4dd1a1375b537..7d5510257eb305eb6ead8a80ca36230c29f56749 100644 (file)
--- a/hw/gpio/gpio_key.c
+++ b/hw/gpio/gpio_key.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 
 #define TYPE_GPIOKEY "gpio-key"

diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c
index c36c394fdaf22c26e37d489886afce4e90a8c814..a51af72c1f8d6d60447b6cee4e8ce48919574d9d 100644 (file)
--- a/hw/gpio/imx_gpio.c
+++ b/hw/gpio/imx_gpio.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/gpio/imx_gpio.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef DEBUG_IMX_GPIO
 #define DEBUG_IMX_GPIO 0

diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c
index c6f686c3eb59ddd5116798090fbcd887aee9960d..273da622cab96761ff1140c8ce9d1274491cfeea 100644 (file)
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
+#include "qemu/module.h"
 
 #define TYPE_MAX7310 "max7310"
 #define MAX7310(obj) OBJECT_CHECK(MAX7310State, (obj), TYPE_MAX7310)

diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c
index e12edb493341c432a407242f50cb1aee25d8547f..6ff56dc3f24a437797d4812619535e8cde0b903f 100644 (file)
--- a/hw/gpio/mpc8xxx.c
+++ b/hw/gpio/mpc8xxx.c
@@ -21,6 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 
 #define TYPE_MPC8XXX_GPIO "mpc8xxx_gpio"
 #define MPC8XXX_GPIO(obj) OBJECT_CHECK(MPC8XXXGPIOState, (obj), TYPE_MPC8XXX_GPIO)

diff --git a/hw/gpio/nrf51_gpio.c b/hw/gpio/nrf51_gpio.c
index 87a2f2a0dc37cba37de137c02b915c0501d7163f..dd6c16a841cd931082d585fcc509c34d71370c96 100644 (file)
--- a/hw/gpio/nrf51_gpio.c
+++ b/hw/gpio/nrf51_gpio.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/gpio/nrf51_gpio.h"
 #include "trace.h"
 

diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 08472193b5c37f6cb18a0e3fcf32e85adfb8f812..e2785c5dc7d757e275b02d2ad8ab95cf835f54b0 100644 (file)
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -23,6 +23,7 @@
 #include "hw/arm/omap.h"
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 struct omap_gpio_s {

diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c
index 4ae2aa156622b7e251d61e0ae355b29a5340e253..02c01fd521e268a86237268dcd00d9a23e64685b 100644 (file)
--- a/hw/gpio/pl061.c
+++ b/hw/gpio/pl061.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 //#define DEBUG_PL061 1
 

diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c
index 33241b8564cec4609fc18478a485d121956472c9..54d30cada25fc45782278b187f0b95781868838f 100644 (file)
--- a/hw/gpio/puv3_gpio.c
+++ b/hw/gpio/puv3_gpio.c
@@ -8,12 +8,14 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 
 #undef DEBUG_PUV3
 #include "hw/unicore32/puv3.h"
+#include "qemu/module.h"
 
 #define TYPE_PUV3_GPIO "puv3_gpio"
 #define PUV3_GPIO(obj) OBJECT_CHECK(PUV3GPIOState, (obj), TYPE_PUV3_GPIO)

diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c
index 15865e1081a5b3c46a1e24268741bf4a2a3da23a..f2f1f672665cfd4ea9e3bd79b0c592b564664d03 100644 (file)
--- a/hw/gpio/zaurus.c
+++ b/hw/gpio/zaurus.c
@@ -15,10 +15,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/arm/sharpsl.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 
 #undef REG_FMT
 #define REG_FMT                        "0x%02lx"

diff --git a/hw/hppa/dino.c b/hw/hppa/dino.c
index 4d1380c51fa92729ccd2739c67f21fa573dbfd1c..e94614abbdf89ae2866d47d449ca8e3e1e8aaa6d 100644 (file)
--- a/hw/hppa/dino.c
+++ b/hw/hppa/dino.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "cpu.h"

diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c
index 8758635227ba216de5ea7df122bc33617122e70f..6ebf31c310d723be11746162f02c1804c089874d 100644 (file)
--- a/hw/hyperv/hyperv.c
+++ b/hw/hyperv/hyperv.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "exec/address-spaces.h"
 #include "sysemu/kvm.h"

diff --git a/hw/hyperv/hyperv_testdev.c b/hw/hyperv/hyperv_testdev.c
index 4880333cf5307d0b495a597eac85c967099c4e51..0d343a8bc07882fffb80b2dabc072c9690a4372e 100644 (file)
--- a/hw/hyperv/hyperv_testdev.c
+++ b/hw/hyperv/hyperv_testdev.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/queue.h"
 #include "hw/qdev.h"
 #include "hw/isa/isa.h"

diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
index a085510cfd30d51219361cdc7d72d5e2ce3660e9..219ad3806f159c0d0f9795ebfbbe7ed82d55aacf 100644 (file)
--- a/hw/i2c/aspeed_i2c.c
+++ b/hw/i2c/aspeed_i2c.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/i2c/aspeed_i2c.h"
 
 /* I2C Global Register */

diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c
index 8be88ee265c130c1dcdaf67c327f962606e0bcd7..5dfc72d9d7b72e97400939a4d136415a3dd5b73d 100644 (file)
--- a/hw/i2c/bitbang_i2c.c
+++ b/hw/i2c/bitbang_i2c.c
@@ -9,10 +9,12 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "bitbang_i2c.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 
 //#define DEBUG_BITBANG_I2C
 

diff --git a/hw/i2c/core.c b/hw/i2c/core.c
index 15237ad07369f9fc3ef9b64a646ec8d3a326f022..20f36f1d5505b3dcc428412eee1d25d002d62911 100644 (file)
--- a/hw/i2c/core.c
+++ b/hw/i2c/core.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define I2C_BROADCAST 0x00

diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c
index d154b05739594d0a74a6897dc30064d44f34532b..70a97a3e2d7a091ffc31ff61738887ad48eb469d 100644 (file)
--- a/hw/i2c/exynos4210_i2c.c
+++ b/hw/i2c/exynos4210_i2c.c
@@ -21,6 +21,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/sysbus.h"
 #include "hw/i2c/i2c.h"

diff --git a/hw/i2c/imx_i2c.c b/hw/i2c/imx_i2c.c
index 6da5224e2e60fe9ccf40da17ad1070eec2efb89f..ce7a94c282bdef2bc62d758dbaecdd99265f5330 100644 (file)
--- a/hw/i2c/imx_i2c.c
+++ b/hw/i2c/imx_i2c.c
@@ -22,6 +22,7 @@
 #include "hw/i2c/imx_i2c.h"
 #include "hw/i2c/i2c.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef DEBUG_IMX_I2C
 #define DEBUG_IMX_I2C 0

diff --git a/hw/i2c/microbit_i2c.c b/hw/i2c/microbit_i2c.c
index 793f1b0f8ba98c282fc77b29836eff8910528eb8..214be07c5ae4d7f0939cb4e1b7ad5383e10fdf10 100644 (file)
--- a/hw/i2c/microbit_i2c.c
+++ b/hw/i2c/microbit_i2c.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/i2c/microbit_i2c.h"
 
 static const uint32_t twi_read_sequence[] = {0x5A, 0x5A, 0x40};

diff --git a/hw/i2c/mpc_i2c.c b/hw/i2c/mpc_i2c.c
index 693ca7ef6b0b9f3b9bc00d3eb35c56fe750bb21e..e9a11270507ca4273f55e91ed1dc9c7d60484d15 100644 (file)
--- a/hw/i2c/mpc_i2c.c
+++ b/hw/i2c/mpc_i2c.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/i2c/i2c.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 
 /* #define DEBUG_I2C */

diff --git a/hw/i2c/omap_i2c.c b/hw/i2c/omap_i2c.c
index d02e734ea8eba5dac2650be2e47bf681f91df39c..d7ebeae8e2e258803500f23eaf3b60a882756806 100644 (file)
--- a/hw/i2c/omap_i2c.c
+++ b/hw/i2c/omap_i2c.c
@@ -16,8 +16,10 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/arm/omap.h"

diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c
index d6dfafab31d46ff977a081c2fc31366237869ab4..d606d3dbeb816ba58f3fee3d824a8a1dff7762cd 100644 (file)
--- a/hw/i2c/ppc4xx_i2c.c
+++ b/hw/i2c/ppc4xx_i2c.c
@@ -25,8 +25,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/i2c/ppc4xx_i2c.h"

diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
index 251d3d142ff9a5a6ef647f8c8ce1c74f8519cb13..51a03046a6ec9a442634af9696f8792a348099e5 100644 (file)
--- a/hw/i2c/smbus_ich9.c
+++ b/hw/i2c/smbus_ich9.c
@@ -19,10 +19,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i2c/pm_smbus.h"
 #include "hw/pci/pci.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 
 #include "hw/i386/ich9.h"

diff --git a/hw/i2c/smbus_slave.c b/hw/i2c/smbus_slave.c
index 9a2d314d1a9596797becea61deae52ed59b6c296..a9908c1a9b96e744ff47cabc252944f936e456d2 100644 (file)
--- a/hw/i2c/smbus_slave.c
+++ b/hw/i2c/smbus_slave.c
@@ -17,6 +17,7 @@
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "hw/i2c/smbus_slave.h"
+#include "qemu/module.h"
 
 //#define DEBUG_SMBUS 1
 

diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c
index da9f298ee550caa7ccb202efbe22b127c183b1ad..e07be9890c8a2d4d5653ea1d7dd9dcb2a17b7f50 100644 (file)
--- a/hw/i2c/versatile_i2c.c
+++ b/hw/i2c/versatile_i2c.c
@@ -25,6 +25,7 @@
 #include "hw/sysbus.h"
 #include "bitbang_i2c.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define TYPE_VERSATILE_I2C "versatile_i2c"
 #define VERSATILE_I2C(obj) \

diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c
index 1df6d26816f97b70c1256214cfefc6068bd5b66c..91fb622d630d6f820852b671ae2f2203664b97c3 100644 (file)
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
@@ -9,8 +9,9 @@
  * This work is licensed under the terms of the GNU GPL version 2.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/pci/msi.h"

diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 25ea783bec2c5c3537dbdb74f940ed9977a21c62..a5cda15b85fc925d1e5356d813216c93b2924f5a 100644 (file)
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -14,9 +14,9 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "qemu/host-utils.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "sysemu/hw_accel.h"

diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c
index d4d4a859f0d8bb7c13e21fabbb4c83004c6fa324..c29956ab779f89bbdaad45c448bb4bff1dfc7c26 100644 (file)
--- a/hw/i386/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include <linux/kvm.h>
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/timer/i8254.h"

diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c
index 83b6bfec77eb4c9c7837576e418669e335a39241..bfdeab29bea7833f1a488cb6f4682604fb90d2dc 100644 (file)
--- a/hw/i386/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
@@ -9,8 +9,10 @@
  * This work is licensed under the terms of the GNU GPL version 2.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "hw/isa/i8259_internal.h"
+#include "qemu/module.h"
 #include "hw/i386/apic_internal.h"
 #include "sysemu/kvm.h"
 

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index fe5b12ef6ea51ef1505096fce9e0a6d42a274c87..ca8df462b6d2852a1ee64176f3a7a0ad729bfe9c 100644 (file)
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -8,8 +8,9 @@
  * (at your option) any later version. See the COPYING file in the
  * top-level directory.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/cpus.h"

diff --git a/hw/i386/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
index 55769eba7ede5a9a28d02b9da3c99761dd654b70..7c7a60b166e59bea23dce5f4eb3a2703132094a8 100644 (file)
--- a/hw/i386/xen/xen_apic.c
+++ b/hw/i386/xen/xen_apic.c
@@ -9,10 +9,12 @@
  * This work is licensed under the terms of the GNU GPL version 2 or
  * later. See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/pci/msi.h"
 #include "hw/xen/xen.h"
+#include "qemu/module.h"
 
 static uint64_t xen_apic_mem_read(void *opaque, hwaddr addr,
                                   unsigned size)

diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index 16afb54fee8f84c15a76c650d98b64e9ae58feef..7a972e46cf70ee6ff73ee988a3db446b9e8e2912 100644 (file)
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -35,6 +35,7 @@
 #include "exec/address-spaces.h"
 #include "sysemu/block-backend.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #include <xenguest.h>
 

diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
index a146f1883a60bfb2ae58455c322a71ea2ccfe4b1..23748f36a299e8aecff2d0c32638d0060d5eb3b8 100644 (file)
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -31,6 +31,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "trace.h"

diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
index f98e6cb3d4fcbb3bdf09f6e583f73d321958f6cc..de08d877905fb36b69689c2fc202765db36133f5 100644 (file)
--- a/hw/ide/ahci-allwinner.c
+++ b/hw/ide/ahci-allwinner.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/dma.h"
 #include "hw/ide/internal.h"
 #include "ahci_internal.h"

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index d700ca973b36d4a530b4a7154a8b80a9615a1c71..00ba422a48dc9007d7e03eb9c49153c8436e9754 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -28,6 +28,7 @@
 
 #include "qemu/error-report.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"
 #include "hw/ide/internal.h"

diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index 5a5679134a3593446dfb8eea3db498f7d812adcd..ed23aabf2122beaca842f5c2cff17d92f2cfdc26 100644 (file)
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -22,9 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
+#include "qemu/module.h"
 #include "hw/isa/isa.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"

diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 51c935a0dae8d4aa1b713a02c2469df6ad8e4e40..c1ba927574ce5f4f94ea8ca6dfe6094cc0892b83 100644 (file)
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -64,6 +64,7 @@
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pci.h"
+#include "qemu/module.h"
 #include "hw/isa/isa.h"
 #include "sysemu/dma.h"
 #include "hw/ide/pci.h"

diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 028bd61774c882c549f0eba80a11793d0140487c..4b5784e3fdfa36bf0c5b69eb9a6bb57dd10b12b7 100644 (file)
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -22,9 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
+#include "qemu/module.h"
 #include "sysemu/dma.h"
 
 #include "hw/ide/internal.h"

diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index bab8c45a4338802e91c7cc4b74d2841d6a390d29..54571fed124b41e33c1d107abc1aa0f5141c567e 100644 (file)
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -22,10 +22,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/ppc/mac.h"
 #include "hw/ppc/mac_dbdma.h"
+#include "qemu/module.h"
 #include "hw/misc/macio/macio.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"

diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 34bb98dce83f5e6b2b07e03da0303550278cc0a9..92ee6e0af8ccbc652665f180b239bb80dc566073 100644 (file)
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -22,9 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pcmcia.h"
+#include "qemu/module.h"
 #include "sysemu/dma.h"
 
 #include "hw/ide/internal.h"

diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index 42fcf139eeec6bf64629e636f40e1cac1d4b09a0..70a58016d0181c1248ea05d69640e361709caad6 100644 (file)
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -22,9 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "sysemu/dma.h"
 
 #include "hw/ide/internal.h"

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 942613a9a95073f1332bd106c75528ac37cced6e..4c6fb9a68ee2e61a83374c108493fda73440a0b3 100644 (file)
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -22,11 +22,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "sysemu/dma.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/ide/pci.h"
 #include "trace.h"
 

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 885c16e93871f43c5be9ab5590998f8cf2073a6c..b97e555072e092a68535f0e862d310f404b9e63d 100644 (file)
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
+#include "qemu/module.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 360cd20bd87ad425f598c0c9a3ced7bdb0c01308..9d8502785d290bcd13fb103dc8d4b8d144e54ee2 100644 (file)
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -16,11 +16,13 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "sysemu/dma.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/ide/internal.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c
index 59db09cfe4a0de900ec60e96986e0f46cddd1989..d7590d4ba431c8c3aa6eab3afd71e331a53b2ccc 100644 (file)
--- a/hw/ide/sii3112.c
+++ b/hw/ide/sii3112.c
@@ -14,6 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ide/pci.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define TYPE_SII3112_PCI "sii3112"

diff --git a/hw/ide/via.c b/hw/ide/via.c
index ac9385228ce009ba6f50beebe2c54c4bf024650d..c3bda909f99c3951e434a9fb404e2c93769c458d 100644 (file)
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -23,9 +23,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 

diff --git a/hw/input/adb-kbd.c b/hw/input/adb-kbd.c
index b026e9d49fda872e0285d5ab9e0ed0f022b63d2f..da361f56df40c9cff1d1995dc4eb0eab31ad09be 100644 (file)
--- a/hw/input/adb-kbd.c
+++ b/hw/input/adb-kbd.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/input/adb.h"
+#include "qemu/module.h"
 #include "ui/input.h"
 #include "hw/input/adb-keys.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/input/adb-mouse.c b/hw/input/adb-mouse.c
index 83833b003567d8d486419b4b914e52b8ee389d89..52526fddb75c636a8ea7c3017a1c6e02c0482a6a 100644 (file)
--- a/hw/input/adb-mouse.c
+++ b/hw/input/adb-mouse.c
@@ -21,9 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "ui/console.h"
 #include "hw/input/adb.h"
+#include "qemu/module.h"
 #include "adb-internal.h"
 #include "trace.h"
 

diff --git a/hw/input/adb.c b/hw/input/adb.c
index bbb40aeef1ba598293ad43296308abbd0325544f..1446f32521e23031f08aaf2a54d40e5cc841b425 100644 (file)
--- a/hw/input/adb.c
+++ b/hw/input/adb.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/input/adb.h"
+#include "qemu/module.h"
 #include "adb-internal.h"
 
 /* error codes */

diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c
index 1fc7b86f1929f0e72a7d256ec8f5ae9005c9c585..5203da2bcfc91404d340e9fa7b89318fd713790a 100644 (file)
--- a/hw/input/lm832x.c
+++ b/hw/input/lm832x.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "ui/console.h"
 

diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index 8766a17d9e0fd9715a225f031a1ced31196a41bf..f779cd43702352029f2d8dcaa8c7e84c88becedb 100644 (file)
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -29,6 +29,7 @@
 #include "ui/console.h"
 #include "hw/input/hid.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 enum {
     R_CTRL = 0,

diff --git a/hw/input/pl050.c b/hw/input/pl050.c
index 15bffbfcadbcf553cf068058a2ff83069332ecd3..b79bf1647d92cacbf0ffd542e7d1f7594daf867b 100644 (file)
--- a/hw/input/pl050.c
+++ b/hw/input/pl050.c
@@ -11,6 +11,7 @@
 #include "hw/sysbus.h"
 #include "hw/input/ps2.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define TYPE_PL050 "pl050"
 #define PL050(obj) OBJECT_CHECK(PL050State, (obj), TYPE_PL050)

diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c
index bc5f9a2ed236b489f5393b794892cdd3aeaff6cd..f15a063facdcd32f470bb5c15a36c58c0a88ff32 100644 (file)
--- a/hw/input/virtio-input-hid.c
+++ b/hw/input/virtio-input-hid.c
@@ -6,6 +6,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 
 #include "hw/qdev.h"
 #include "hw/virtio/virtio.h"

diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index cb79e80024eb29c57739af1ce2d1f2ebcbcffe0d..a54c31eb09f29d0b27554003ac723965d7a67c21 100644 (file)
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -6,7 +6,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 
 #include "hw/qdev.h"

diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index 0e42f0d02c583e273fedf5dfa53568b41d2ff1b3..9946394cf4a161f9c8f733e6973dddd2e3b4d588 100644 (file)
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -7,6 +7,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #include "hw/qdev.h"

diff --git a/hw/intc/allwinner-a10-pic.c b/hw/intc/allwinner-a10-pic.c
index 1aa628cbbb8a08437ec99c0e55a0feea8d3bed42..080bdd791f9f28b4a49e0274dae5667390171f28 100644 (file)
--- a/hw/intc/allwinner-a10-pic.c
+++ b/hw/intc/allwinner-a10-pic.c
@@ -20,6 +20,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/intc/allwinner-a10-pic.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 static void aw_a10_pic_update(AwA10PICState *s)
 {

diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 78903ea909175e07b20a6ec7988cb20d43550dee..e764a2bb0387bd962106eb9cbc879253a96da320 100644 (file)
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -17,10 +17,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
+
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "qapi/visitor.h"
 #include "hw/i386/apic.h"

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index b3ac2d11fc54fe0acaf8d1f68b412af7010d574b..77427a418815da464eec00221642d33c73832ff6 100644 (file)
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -24,6 +24,7 @@
 #include "qapi/error.h"
 #include "qom/cpu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "sysemu/kvm.h"
 

diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c
index 57569a4e590a440dac7aa01447998b27d009e26f..ccc50d00b650a7705433616e05f8eb95a227e2c8 100644 (file)
--- a/hw/intc/arm_gic_common.c
+++ b/hw/intc/arm_gic_common.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "gic_internal.h"
 #include "hw/arm/linux-boot-if.h"
 

diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index a611e8ee125254db7e824de81e9878c6eecab443..b56fda144f97ba51665fd42210a27b8b8d285efb 100644 (file)
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -21,7 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
 #include "migration/blocker.h"

diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index 3922fbc1c1370cb791239fe5ede8344a735e7d6b..05f299fc7f72f3ee1ef5e210cf8402ce8b49f82b 100644 (file)
--- a/hw/intc/arm_gicv2m.c
+++ b/hw/intc/arm_gicv2m.c
@@ -31,6 +31,7 @@
 #include "hw/pci/msi.h"
 #include "sysemu/kvm.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define TYPE_ARM_GICV2M "arm-gicv2m"
 #define ARM_GICV2M(obj) OBJECT_CHECK(ARMGICv2mState, (obj), TYPE_ARM_GICV2M)

diff --git a/hw/intc/arm_gicv3.c b/hw/intc/arm_gicv3.c
index 7044133e2d70dc035b8b96d20ed8204828d27e41..66eaa9719828ca2c257cdee9e7e8b0f615e61e78 100644 (file)
--- a/hw/intc/arm_gicv3.c
+++ b/hw/intc/arm_gicv3.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "hw/intc/arm_gicv3.h"
 #include "gicv3_internal.h"

diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index 52480c3b4cf949198615cf1efc9797acef921298..5edabb928f7a4f47c0502e49e389ec9f90f68c6f 100644 (file)
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -23,6 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qom/cpu.h"
 #include "hw/intc/arm_gicv3_common.h"
 #include "gicv3_internal.h"

diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c
index 284c0a7584f1eaeec92ae093bf9458fd0d005913..efb3d51fb52b5715d88fa22718a720b69136188d 100644 (file)
--- a/hw/intc/arm_gicv3_its_common.c
+++ b/hw/intc/arm_gicv3_its_common.c
@@ -22,6 +22,7 @@
 #include "hw/pci/msi.h"
 #include "hw/intc/arm_gicv3_its_common.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 static int gicv3_its_pre_save(void *opaque)
 {

diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c
index 01573abb488c207261d5c0469a76fa4b649a51ad..52ac01aba3014610efaa1da90dda33afba90781a 100644 (file)
--- a/hw/intc/arm_gicv3_its_kvm.c
+++ b/hw/intc/arm_gicv3_its_kvm.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/intc/arm_gicv3_its_common.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"

diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
index 1e11200fe2eec42b24070e98364a4d35f5b57416..d9c72f85bec32f82993ce5257043143e9014e5fd 100644 (file)
--- a/hw/intc/arm_gicv3_kvm.c
+++ b/hw/intc/arm_gicv3_kvm.c
@@ -24,6 +24,7 @@
 #include "hw/intc/arm_gicv3_common.h"
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/kvm.h"
 #include "sysemu/sysemu.h"
 #include "kvm_arm.h"

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index dc2c206d9ad9976c2d82ff8708362952c46e8e98..b8ede30b3cb8c31cb5b2b9a6991c5e52a308e662 100644 (file)
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
@@ -20,6 +19,7 @@
 #include "target/arm/cpu.h"
 #include "exec/exec-all.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /* IRQ number counting:

diff --git a/hw/intc/aspeed_vic.c b/hw/intc/aspeed_vic.c
index 2370e7485fa5e0cd5e006e97dbbd12b387a072bd..927638d5322a40afcc95228a4c0db1245f72a59f 100644 (file)
--- a/hw/intc/aspeed_vic.c
+++ b/hw/intc/aspeed_vic.c
@@ -31,6 +31,7 @@
 #include "hw/intc/aspeed_vic.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define AVIC_NEW_BASE_OFFSET 0x80

diff --git a/hw/intc/bcm2835_ic.c b/hw/intc/bcm2835_ic.c
index 00d25306fdc4e14bfc6ad18439cc810c125f7ba4..61d37643a15fbbb78d451ddb2d208c5d0560ca97 100644 (file)
--- a/hw/intc/bcm2835_ic.c
+++ b/hw/intc/bcm2835_ic.c
@@ -15,6 +15,7 @@
 #include "qemu/osdep.h"
 #include "hw/intc/bcm2835_ic.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define GPU_IRQS 64
 #define ARM_IRQS 8

diff --git a/hw/intc/bcm2836_control.c b/hw/intc/bcm2836_control.c
index 421469f2ef5e8e81e6bd4b1dc145f36faec940f5..66417c85e4ec9c77236737ae87d546f0e7ab3f13 100644 (file)
--- a/hw/intc/bcm2836_control.c
+++ b/hw/intc/bcm2836_control.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 #include "hw/intc/bcm2836_control.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define REG_GPU_ROUTE           0x0c
 #define REG_LOCALTIMERROUTING   0x24

diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c
index 1bfde2f09ebf905e0902ec2080a08aca91f740d9..20e1391d6429866598e6e593960a97d1a0677b62 100644 (file)
--- a/hw/intc/etraxfs_pic.c
+++ b/hw/intc/etraxfs_pic.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 //#include "pc.h"
 //#include "etraxfs.h"

diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index f19a7062be3a1ffa07d6fcdfcbf4392e792fd5ad..6fed0e8d1690a8ed480134e20972d2a1fbc6614d 100644 (file)
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -29,6 +29,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 
 #include "hw/arm/exynos4210.h"
 

diff --git a/hw/intc/exynos4210_gic.c b/hw/intc/exynos4210_gic.c
index 69f9c18d736de30c416c3f0543455d8246977eaa..e37d457fcf3ae8f37ae3c4047161fd1b19c84f55 100644 (file)
--- a/hw/intc/exynos4210_gic.c
+++ b/hw/intc/exynos4210_gic.c
@@ -22,7 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "hw/irq.h"
 #include "hw/arm/exynos4210.h"
 

diff --git a/hw/intc/grlib_irqmp.c b/hw/intc/grlib_irqmp.c
index 20accb6c4d19d7fbde6322a082b0fe1169430c39..21c77a5ec1e535647cb72030b753040e76486378 100644 (file)
--- a/hw/intc/grlib_irqmp.c
+++ b/hw/intc/grlib_irqmp.c
@@ -32,6 +32,7 @@
 
 #include "trace.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #define IRQMP_MAX_CPU 16
 #define IRQMP_REG_SIZE 256      /* Size of memory mapped registers */

diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c
index b8b997decac002d4f31a3c76e6ccadee45091f1e..c282ac4006039dd779e38a40f531a4f40d225162 100644 (file)
--- a/hw/intc/heathrow_pic.c
+++ b/hw/intc/heathrow_pic.c
@@ -22,9 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/ppc/mac.h"
+#include "qemu/module.h"
 #include "hw/intc/heathrow_pic.h"
 #include "trace.h"
 

diff --git a/hw/intc/imx_avic.c b/hw/intc/imx_avic.c
index 813e587a631e5aaa19f10e82c411fac017fd0978..83a4101528fe23d7cdd5c5951d9d308c9f9a5d64 100644 (file)
--- a/hw/intc/imx_avic.c
+++ b/hw/intc/imx_avic.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 #include "hw/intc/imx_avic.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef DEBUG_IMX_AVIC
 #define DEBUG_IMX_AVIC 0

diff --git a/hw/intc/imx_gpcv2.c b/hw/intc/imx_gpcv2.c
index 4eb9ce2668162683e53c483c6b05f67c4f31e171..a83333bdea03b131e2fddd2a6e2e83716d20f85c 100644 (file)
--- a/hw/intc/imx_gpcv2.c
+++ b/hw/intc/imx_gpcv2.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/intc/imx_gpcv2.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define GPC_PU_PGC_SW_PUP_REQ       0x0f8
 #define GPC_PU_PGC_SW_PDN_REQ       0x104

diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index 692dc37bb61b8ead92b0ff6efff42908106286ac..fa50382d43e249806ee86e88b5c110887b716836 100644 (file)
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -21,6 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "monitor/monitor.h"
 #include "hw/i386/ioapic.h"
 #include "hw/i386/ioapic_internal.h"

diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c
index db6c7afc2f60779b3014ba2d38b0daec726cb399..170fa7a1ac4e909d087fa19b2f1cebfdb97cf595 100644 (file)
--- a/hw/intc/lm32_pic.c
+++ b/hw/intc/lm32_pic.c
@@ -21,6 +21,7 @@
 
 #include "hw/hw.h"
 #include "monitor/monitor.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "trace.h"
 #include "hw/lm32/lm32_pic.h"

diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
index 8f509493ea69b07081c751b597ed382401a56992..33ab51c5b82b5c7b02d24f5a09829d9203d5119b 100644 (file)
--- a/hw/intc/mips_gic.c
+++ b/hw/intc/mips_gic.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"

diff --git a/hw/intc/nios2_iic.c b/hw/intc/nios2_iic.c
index 016426f964a2b3a6d7bf538cea352a7e46eaec16..7329434b91a98af8fcb597407edae599d0e0e0f0 100644 (file)
--- a/hw/intc/nios2_iic.c
+++ b/hw/intc/nios2_iic.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 #include "hw/sysbus.h"

diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index 6844c1aa834180d053fe5a57d07a6013daef3c0e..053e67c66ba9432ec1d7bfac398aea914ab905d8 100644 (file)
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -17,11 +17,13 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/arm/omap.h"
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 /* Interrupt Handlers */

diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c
index c0e34d1268a437a07b20544682cfa83925ffd2a3..9cb310a5ddc6c1e01e5c254a71cdd419697eb482 100644 (file)
--- a/hw/intc/ompic.c
+++ b/hw/intc/ompic.c
@@ -8,6 +8,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"

diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 811cee9b26d7e4daefae671233b98de3b7c1bfbf..9b4fc6cf43667836664576530ea2d024b9011236 100644 (file)
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -33,6 +33,7 @@
  * Serial interrupts, as implemented in Raven chipset are not supported yet.
  *
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/ppc/mac.h"
@@ -45,6 +46,7 @@
 #include "qemu/bitops.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qemu/error-report.h"
 

diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 928bc04a4eb85b3d0c2fc4fb720da2bcffcb3d3a..49fc6fa0cf3e53f529e22b3e377319bcf04f4fff 100644 (file)
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include <sys/ioctl.h>
 #include "exec/address-spaces.h"
@@ -35,6 +34,7 @@
 #include "hw/sysbus.h"
 #include "sysemu/kvm.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define GCR_RESET        0x80000000
 

diff --git a/hw/intc/pl190.c b/hw/intc/pl190.c
index 55ea15de7618ad39a97ffe69582d3ec31fdcc962..b4f31efc4591b9f1105ff7e6f5f2aa1b75713b76 100644 (file)
--- a/hw/intc/pl190.c
+++ b/hw/intc/pl190.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /* The number of virtual priority levels.  16 user vectors plus the
    unvectored IRQ.  Chained interrupts would require an additional level

diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
index bb0877cbdf3be851d78c335ea76aab5be11aa0bd..a55c2bbc88eb15494fca064c1dce791dac713294 100644 (file)
--- a/hw/intc/pnv_xive.c
+++ b/hw/intc/pnv_xive.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "target/ppc/cpu.h"
 #include "sysemu/cpus.h"

diff --git a/hw/intc/puv3_intc.c b/hw/intc/puv3_intc.c
index 69ddc8c19ab46305749d03c1f21c11325d33f94a..e2f6d9875a8c2af6fb105b5e51dc7b2e7fbebb3d 100644 (file)
--- a/hw/intc/puv3_intc.c
+++ b/hw/intc/puv3_intc.c
@@ -8,11 +8,13 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 
 #undef DEBUG_PUV3
 #include "hw/unicore32/puv3.h"
+#include "qemu/module.h"
 
 #define TYPE_PUV3_INTC "puv3_intc"
 #define PUV3_INTC(obj) OBJECT_CHECK(PUV3INTCState, (obj), TYPE_PUV3_INTC)

diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c
index 7f2ff85c83f68448dbc7a7eb905a239ad2f321bb..99557544dbef256ca2d9647319bd2373f26886c2 100644 (file)
--- a/hw/intc/realview_gic.c
+++ b/hw/intc/realview_gic.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/intc/realview_gic.h"
 
 static void realview_gic_set_irq(void *opaque, int irq, int level)

diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index 5f8168f0f07f0222fd70005fc5911b00796b7085..d0be755c827257acf5e19762abdf1344f0556061 100644 (file)
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "hw/s390x/ioinst.h"
 #include "hw/s390x/s390_flic.h"

diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index a03df37560a897484ac37b1603d4d981dcb651fb..ff45b4ab0b8b20f945fc1b02726d9b7bbbe82f9b 100644 (file)
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -11,11 +11,11 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "kvm_s390x.h"
 #include <sys/ioctl.h>
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "sysemu/kvm.h"

diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c
index 817e02617e59072e7878642e2c3932ee714a947c..ca528753bf30465a0a7bff877ee9660bbe13c206 100644 (file)
--- a/hw/intc/slavio_intctl.c
+++ b/hw/intc/slavio_intctl.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "monitor/monitor.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "hw/intc/intc.h"
 #include "trace.h"

diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
index 62e0ef8fa5b467298899327ca2f4d5efec37a4c7..58c2e5d890bd974b84001c2ed78ca2d67344cad4 100644 (file)
--- a/hw/intc/spapr_xive.c
+++ b/hw/intc/spapr_xive.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "target/ppc/cpu.h"

diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 79f5a8a9166508c52a3926c8db1e93c2d03532d4..29f7d397813ea674fc35217bb4a8420cdd2413d8 100644 (file)
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -27,13 +27,13 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "trace.h"
 #include "qemu/timer.h"
 #include "hw/ppc/xics.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/visitor.h"
 #include "monitor/monitor.h"
 #include "hw/intc/intc.h"

diff --git a/hw/intc/xics_pnv.c b/hw/intc/xics_pnv.c
index fa48505f365eeb186110e9f4fcf235059eba83c7..67f2702e521c842fc97ca4f95aba3488939d551b 100644 (file)
--- a/hw/intc/xics_pnv.c
+++ b/hw/intc/xics_pnv.c
@@ -21,6 +21,7 @@
 #include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/ppc/xics.h"
 
 #define ICP_XIRR_POLL    0 /* 1 byte (CPRR) or 4 bytes */

diff --git a/hw/intc/xilinx_intc.c b/hw/intc/xilinx_intc.c
index 9d8139bc6d41b02467e77ebb34583b632385fee0..d5363e977f422f878ce4086bef0fd1ad3f7ca052 100644 (file)
--- a/hw/intc/xilinx_intc.c
+++ b/hw/intc/xilinx_intc.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 
 #define D(x)

diff --git a/hw/intc/xive.c b/hw/intc/xive.c
index 0c74e47aa49ce8813e8405fedebd277c78f33525..b7e082979506319d35c75a24e613524e7ed9e3e5 100644 (file)
--- a/hw/intc/xive.c
+++ b/hw/intc/xive.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "target/ppc/cpu.h"
 #include "sysemu/cpus.h"

diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c
index 59235351ba9fed8bba58c40a4b70ec2743bd4683..0b8ff897dc0e6491cd174f931272eaa66d3e5b4a 100644 (file)
--- a/hw/intc/xlnx-pmu-iomod-intc.c
+++ b/hw/intc/xlnx-pmu-iomod-intc.c
@@ -29,6 +29,7 @@
 #include "hw/register.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/intc/xlnx-pmu-iomod-intc.h"
 
 #ifndef XLNX_PMU_IO_INTC_ERR_DEBUG

diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c
index aa50a8ac08d31466d8603be27fd184442671b9ac..0dad6c04f5334411123398d40d45d9c8d0c6bfee 100644 (file)
--- a/hw/intc/xlnx-zynqmp-ipi.c
+++ b/hw/intc/xlnx-zynqmp-ipi.c
@@ -30,6 +30,7 @@
 #include "hw/register.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/intc/xlnx-zynqmp-ipi.h"
 
 #ifndef XLNX_ZYNQMP_IPI_ERR_DEBUG

diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c
index 6021e6d135c1dbc0d3504c8651ed46ac48fe37a8..6b1b72f94d2eee6b8d70bd428e088eac81bcccc6 100644 (file)
--- a/hw/ipack/ipack.c
+++ b/hw/ipack/ipack.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/ipack/ipack.h"
 
 IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)

diff --git a/hw/ipack/tpci200.c b/hw/ipack/tpci200.c
index cd3e79139d50c1445ca65622f44b5cb8268f5771..d4d85107d030e215a2e23e624120ff7cc23a7d04 100644 (file)
--- a/hw/ipack/tpci200.c
+++ b/hw/ipack/tpci200.c
@@ -13,6 +13,7 @@
 #include "hw/ipack/ipack.h"
 #include "hw/pci/pci.h"
 #include "qemu/bitops.h"
+#include "qemu/module.h"
 
 /* #define DEBUG_TPCI */
 

diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index 63c031703d4d4501de90afbbbd9104a000ff8665..a837f91782a7375738585b2321ea139715596c9d 100644 (file)
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -30,6 +30,7 @@
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc.h"
 #include "qapi/visitor.h"
+#include "qemu/module.h"
 
 static uint32_t ipmi_current_uuid = 1;
 

diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index bf0b7ee0f599cac2734c2a964478293f9f65509a..c0a8dac3461fc090f7e8aded12ee4757ea1c833f 100644 (file)
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -29,6 +29,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "chardev/char-fe.h"

diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 9b509f829b480a4171e7b73225e4757b83d4f64c..19805365171dc6a7a01dfacbe9d1cf7615c5b63a 100644 (file)
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -27,6 +27,7 @@
 #include "qemu/timer.h"
 #include "hw/ipmi/ipmi.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/loader.h"
 
 #define IPMI_NETFN_CHASSIS            0x00

diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index 8bbb1fa785077e84996c83cb336c0665bab12384..1846d5b9a4f304f55d8c1b61ec07f21de18f3788 100644 (file)
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"

diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index a79431554adde396f7b88ed12af274948ea9c91f..068f3412565a309bfd1cb409f274566bec685216 100644 (file)
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"

diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 63fa77effc90c96e65f42dcb36b8103df195d46a..388800603b62bfdf7989e437ccf64832044e31fc 100644 (file)
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -16,8 +16,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
 #include "monitor/monitor.h"

diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
index d54463bf0358cb9e3f680ade5072e6825791df6a..4c73c2100f22b5062155d894e82ccfe4b1d50d4f 100644 (file)
--- a/hw/isa/isa-superio.c
+++ b/hw/isa/isa-superio.c
@@ -9,8 +9,10 @@
  * See the COPYING file in the top-level directory.
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 5cf64505fe83eba06453666e5e2f4293e791d7a1..85dbc9443963727e930367e43e555d742b732252 100644 (file)
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -27,6 +27,7 @@
 #include "hw/isa/pc87312.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 

diff --git a/hw/isa/smc37c669-superio.c b/hw/isa/smc37c669-superio.c
index 64466a937358043ae31650f7aa2390dd567217a2..901a9f8e6529df9db2718eabd0aa8b07cdb8ca61 100644 (file)
--- a/hw/isa/smc37c669-superio.c
+++ b/hw/isa/smc37c669-superio.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/superio.h"
+#include "qemu/module.h"
 
 /* UARTs (compatible with NS16450 or PC16550) */
 

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index d46754f61cfb97086dde0f9c09bd8bac918ec7e3..12c460590ff0367eca748d58dce689a4db8900ab 100644 (file)
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -23,6 +23,7 @@
 #include "hw/acpi/acpi.h"
 #include "hw/i2c/pm_smbus.h"
 #include "sysemu/sysemu.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index 393ce284a24a2eb263f7a85225ddadecc8655465..a613aed820b773e1607c244e8fb5c89a4e3721a9 100644 (file)
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -5,8 +5,9 @@
  *
  * This code is licensed under the GPL
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"

diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index bf2adf5e16757040feaafbc056652d990d42e8c5..f438abb3870c50e4420813f5ddad4e74888c5af6 100644 (file)
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/pmem.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 152400b1fc8191ba65f989789bf2e3e6e18eaef0..b1239fd0d37872d30210f310766519a3e63f825e 100644 (file)
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -24,6 +24,7 @@
 #include "hw/mem/memory-device.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
+#include "qemu/module.h"
 #include "sysemu/numa.h"
 #include "trace.h"
 

diff --git a/hw/mips/cps.c b/hw/mips/cps.c
index 649b35a76c5bbdac912ccba096bd4d28e61af31e..0d459c41413dddd69f76945e75856f620433c101 100644 (file)
--- a/hw/mips/cps.c
+++ b/hw/mips/cps.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/mips/cps.h"
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"

diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c
index 3e8ad8cd735d65ed5014b87b601ac9328a9fd1cd..4307f0082bf881d43f5fe74f0b8e411e39a3ce2f 100644 (file)
--- a/hw/misc/a9scu.c
+++ b/hw/misc/a9scu.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/misc/a9scu.h"
+#include "qemu/module.h"
 
 static uint64_t a9_scu_read(void *opaque, hwaddr offset,
                             unsigned size)

diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index 7be8b5f13c37f3004a2b51327679fe353a3040a3..2d7eb3c7e2448a29bb69575bd43f4bea5f1b517f 100644 (file)
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -34,6 +34,7 @@
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
 #include "ui/console.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 
 /* #define DEBUG_SMC */

diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c
index 7042ce11e8d3bc2faf66308889e00613be095491..84275df8856332e540b967403349f18e121f82bc 100644 (file)
--- a/hw/misc/arm11scu.c
+++ b/hw/misc/arm11scu.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/misc/arm11scu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 static uint64_t mpcore_scu_read(void *opaque, hwaddr offset,
                                 unsigned size)

diff --git a/hw/misc/arm_integrator_debug.c b/hw/misc/arm_integrator_debug.c
index 533e6e3208df91c4a1e2bcc4c115f21906e5b293..2646107b9715f6e9988caac68e00193c8c173b1e 100644 (file)
--- a/hw/misc/arm_integrator_debug.c
+++ b/hw/misc/arm_integrator_debug.c
@@ -19,6 +19,7 @@
 #include "hw/sysbus.h"
 #include "hw/misc/arm_integrator_debug.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define INTEGRATOR_DEBUG(obj) \
     OBJECT_CHECK(IntegratorDebugState, (obj), TYPE_INTEGRATOR_DEBUG)

diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c
index 66a0787c479de37078dff13ae7f12df2bccd0436..b88f40ae7e14134469552e90c3b26755da2a290d 100644 (file)
--- a/hw/misc/arm_l2x0.c
+++ b/hw/misc/arm_l2x0.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /* L2C-310 r3p2 */
 #define CACHE_ID 0x410000c8

diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index b20b44ea20d495af2935add481959c880bd7eb39..457dfadfab265c8d4c0efb3a529539285014582c 100644 (file)
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -15,6 +15,7 @@
 #include "hw/arm/primecell.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define LOCK_VALUE 0xa05f
 

diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c
index 7788f6ced6a34c6d566bd2d268bbe88d25d82b2d..05c08f3db54f014d2a09651568cca87001a2350b 100644 (file)
--- a/hw/misc/armsse-cpuid.c
+++ b/hw/misc/armsse-cpuid.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "qapi/error.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c
index 9ebca32e9aa092584c14a993b8c80dcd66e8e3d8..514321a9ec3a75f3fe762a626f7ed3a91cd704eb 100644 (file)
--- a/hw/misc/armsse-mhu.c
+++ b/hw/misc/armsse-mhu.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "qapi/error.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c
index ab1e18ed4b0fcbb942c0dd4fc6287b72fd9c8964..71a0d4b7be7a19337688e19c10f90184435b4404 100644 (file)
--- a/hw/misc/aspeed_scu.c
+++ b/hw/misc/aspeed_scu.c
@@ -17,6 +17,7 @@
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/guest-random.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define TO_REG(offset) ((offset) >> 2)

diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c
index eec77f2435086cf29009cd9f07e321b9607dfc41..b84676d36d85edce07dfd165bec7126301ce44b2 100644 (file)
--- a/hw/misc/aspeed_sdmc.c
+++ b/hw/misc/aspeed_sdmc.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "hw/misc/aspeed_sdmc.h"
 #include "hw/misc/aspeed_scu.h"

diff --git a/hw/misc/auxbus.c b/hw/misc/auxbus.c
index 0e56d9a8a407fe0ccd447273c41b615a00b662e3..f8e7b979712571cdf66565cf4ba2cea372a35183 100644 (file)
--- a/hw/misc/auxbus.c
+++ b/hw/misc/auxbus.c
@@ -29,6 +29,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/misc/auxbus.h"
 #include "hw/i2c/i2c.h"
 #include "monitor/monitor.h"

diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c
index e97cc814af5bbcfe5f4c1f6a3aaefb84c35d0d7b..a87da5ee533c95b932905f3ded0de0342cb83229 100644 (file)
--- a/hw/misc/bcm2835_mbox.c
+++ b/hw/misc/bcm2835_mbox.c
@@ -12,6 +12,7 @@
 #include "qapi/error.h"
 #include "hw/misc/bcm2835_mbox.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define MAIL0_PEEK   0x90
 #define MAIL0_SENDER 0x94

diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index 145427ae0f8462d39e1b74177e723a3a684d6d1c..0bf789cf60c99396980ef758edd4990bac2d1221 100644 (file)
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -9,6 +9,7 @@
 #include "hw/misc/bcm2835_mbox_defs.h"
 #include "sysemu/dma.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /* https://github.com/raspberrypi/firmware/wiki/Mailbox-property-interface */
 

diff --git a/hw/misc/bcm2835_rng.c b/hw/misc/bcm2835_rng.c
index fe59c868f563494566c9e287eae436341db7d9f5..e882c875680517870f3661ae58ddaf234b3c9ccc 100644 (file)
--- a/hw/misc/bcm2835_rng.c
+++ b/hw/misc/bcm2835_rng.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/guest-random.h"
+#include "qemu/module.h"
 #include "hw/misc/bcm2835_rng.h"
 
 static uint32_t get_random_bytes(void)

diff --git a/hw/misc/debugexit.c b/hw/misc/debugexit.c
index bed293247ea518ce3033f084caf0185460af5205..8e4a2fc701e9617e753a9237668b5da43928ffbf 100644 (file)
--- a/hw/misc/debugexit.c
+++ b/hw/misc/debugexit.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
+#include "qemu/module.h"
 
 #define TYPE_ISA_DEBUG_EXIT_DEVICE "isa-debug-exit"
 #define ISA_DEBUG_EXIT_DEVICE(obj) \

diff --git a/hw/misc/eccmemctl.c b/hw/misc/eccmemctl.c
index bb7cc52b5ef05ddb8f70329268fa5f93dd49e518..8386db07df83fe6e183571a1d0ddcd66d92d8838 100644 (file)
--- a/hw/misc/eccmemctl.c
+++ b/hw/misc/eccmemctl.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /* There are 3 versions of this chip used in SMP sun4m systems:

diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index 19e5545e2ce9b62d9bad79a92ae66ba6f062680a..3b6dba2c728afbd0cc1141550d573a7530cd16c2 100644 (file)
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -28,6 +28,7 @@
 #include "hw/pci/msi.h"
 #include "qemu/timer.h"
 #include "qemu/main-loop.h" /* iothread mutex */
+#include "qemu/module.h"
 #include "qapi/visitor.h"
 
 #define TYPE_PCI_EDU_DEVICE "edu"

diff --git a/hw/misc/exynos4210_clk.c b/hw/misc/exynos4210_clk.c
index 81862c0adab46cd08997da28cd24f736146c9701..821d9eab3f0983c22bddacdef48ce0e250b22310 100644 (file)
--- a/hw/misc/exynos4210_clk.c
+++ b/hw/misc/exynos4210_clk.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define TYPE_EXYNOS4210_CLK             "exynos4210.clk"
 #define EXYNOS4210_CLK(obj) \

diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c
index 0d7b64c5b3a36aa55ce27d8f7619241eaf528761..8712774768cd266618872f6c5c2a3ae7385147f1 100644 (file)
--- a/hw/misc/exynos4210_pmu.c
+++ b/hw/misc/exynos4210_pmu.c
@@ -26,6 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 
 #ifndef DEBUG_PMU

diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c
index 0e70ffb404a0eede1c2d9791fff08e8a3e5106bf..b88fe3a26d7ac547fa5b046080ef9358cb9651e8 100644 (file)
--- a/hw/misc/exynos4210_rng.c
+++ b/hw/misc/exynos4210_rng.c
@@ -22,6 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/log.h"
 #include "qemu/guest-random.h"
+#include "qemu/module.h"
 
 #define DEBUG_EXYNOS_RNG 0
 

diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c
index 19e948a52d5cbfc1308d7be3971c06d6e4da5a08..693ea810406339e1dd3f94527d5cef447a312a34 100644 (file)
--- a/hw/misc/imx25_ccm.c
+++ b/hw/misc/imx25_ccm.c
@@ -14,6 +14,7 @@
 #include "qemu/osdep.h"
 #include "hw/misc/imx25_ccm.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef DEBUG_IMX25_CCM
 #define DEBUG_IMX25_CCM 0

diff --git a/hw/misc/imx2_wdt.c b/hw/misc/imx2_wdt.c
index e47e442592248f001c8c31af23e37a2d738efdbd..5576778a3237e33e59e57274fe91815e1a9661e1 100644 (file)
--- a/hw/misc/imx2_wdt.c
+++ b/hw/misc/imx2_wdt.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
+#include "qemu/module.h"
 #include "sysemu/watchdog.h"
 
 #include "hw/misc/imx2_wdt.h"

diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c
index b890c383be177646af50983bb860d4edcab0a69b..38a19aa0d09195517f6a7adacb3ab85e13897025 100644 (file)
--- a/hw/misc/imx31_ccm.c
+++ b/hw/misc/imx31_ccm.c
@@ -14,6 +14,7 @@
 #include "qemu/osdep.h"
 #include "hw/misc/imx31_ccm.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define CKIH_FREQ 26000000 /* 26MHz crystal input */
 

diff --git a/hw/misc/imx6_ccm.c b/hw/misc/imx6_ccm.c
index 4fa94835fe6f9d0562d5cb9cb63319a3f2f3bf73..9478007f4193a780cbc99eb3dbb0d1dfd432ad4e 100644 (file)
--- a/hw/misc/imx6_ccm.c
+++ b/hw/misc/imx6_ccm.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "hw/misc/imx6_ccm.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef DEBUG_IMX6_CCM
 #define DEBUG_IMX6_CCM 0

diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c
index cfb08710fbd67c296e0c184d3c2a86dcf34052b3..878ffcdc71c2425807d63f515de81808022e35ff 100644 (file)
--- a/hw/misc/imx6_src.c
+++ b/hw/misc/imx6_src.c
@@ -13,6 +13,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "arm-powerctl.h"
 #include "qom/cpu.h"
 

diff --git a/hw/misc/imx6ul_ccm.c b/hw/misc/imx6ul_ccm.c
index 90bc3742713c3b814a47a0c7279a89bec39699f8..37b472d12598d0859ba93a7aed612241730e5a10 100644 (file)
--- a/hw/misc/imx6ul_ccm.c
+++ b/hw/misc/imx6ul_ccm.c
@@ -14,6 +14,7 @@
 #include "hw/registerfields.h"
 #include "hw/misc/imx6ul_ccm.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #include "trace.h"
 

diff --git a/hw/misc/imx7_ccm.c b/hw/misc/imx7_ccm.c
index d90c48bfeca8077c96e6b38e6135215d41b36a13..d9bdcf1027af6207965bed28027bcc8812d206fc 100644 (file)
--- a/hw/misc/imx7_ccm.c
+++ b/hw/misc/imx7_ccm.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #include "hw/misc/imx7_ccm.h"
 

diff --git a/hw/misc/imx7_gpr.c b/hw/misc/imx7_gpr.c
index c2a9df29c652be6e20fb5ab2ebafc28741004c1a..09d57d4710cb9f6b3a3f2e091b82297bbd733682 100644 (file)
--- a/hw/misc/imx7_gpr.c
+++ b/hw/misc/imx7_gpr.c
@@ -15,6 +15,7 @@
 #include "qemu/osdep.h"
 #include "hw/misc/imx7_gpr.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 
 #include "trace.h"

diff --git a/hw/misc/imx7_snvs.c b/hw/misc/imx7_snvs.c
index 4df482b28219fef8eee8f148030830ca83e3b548..55b962a4537e135325196cb08c8272dc83141c74 100644 (file)
--- a/hw/misc/imx7_snvs.c
+++ b/hw/misc/imx7_snvs.c
@@ -15,6 +15,7 @@
 #include "qemu/osdep.h"
 #include "hw/misc/imx7_snvs.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 
 static uint64_t imx7_snvs_read(void *opaque, hwaddr offset, unsigned size)

diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c
index 7f239a41d8b84589a7614d252264064aa4f94421..2f81b0ad73d28db26fe2c6ea03eb687b19c1d10b 100644 (file)
--- a/hw/misc/imx_ccm.c
+++ b/hw/misc/imx_ccm.c
@@ -14,6 +14,7 @@
 #include "qemu/osdep.h"
 #include "hw/misc/imx_ccm.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef DEBUG_IMX_CCM
 #define DEBUG_IMX_CCM 0

diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c
index 537601cd53f79c47b30a5b4b9b37cd97aaf42eda..58fd94b14fe6b1260db45a97f3a3789537a04338 100644 (file)
--- a/hw/misc/iotkit-secctl.c
+++ b/hw/misc/iotkit-secctl.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/sysbus.h"

diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c
index 54064a31ef0d18f7765d5a2cdfb2eea885ff4c87..00d4faa6db6b626b5a180a8a7a2c763f0fbfe8f7 100644 (file)
--- a/hw/misc/iotkit-sysctl.c
+++ b/hw/misc/iotkit-sysctl.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "qapi/error.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c
index 026ba94261356b3b49d12bba31cd2785e4a66edf..3e1cf0ec3455b253a6bb0a512d7a763e1b5dfa6b 100644 (file)
--- a/hw/misc/iotkit-sysinfo.c
+++ b/hw/misc/iotkit-sysinfo.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "qapi/error.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index c7b6bbc974e4acc4c990fc05c877724c2599d628..f9cc66aba8a38b566badc0a66406f5ddc425e74a 100644 (file)
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -16,6 +16,7 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
@@ -28,6 +29,7 @@
 #include "migration/blocker.h"
 #include "qemu/error-report.h"
 #include "qemu/event_notifier.h"
+#include "qemu/module.h"
 #include "qom/object_interfaces.h"
 #include "chardev/char-fe.h"
 #include "sysemu/hostmem.h"

diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index 3febacdd1e701918ed6e656f2c4f3606c970c192..5fd904b79d640ea29ded4f6800d5a4aa16cab196 100644 (file)
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/ppc/mac.h"
@@ -32,6 +33,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /* Bits in B data register: all active low */

diff --git a/hw/misc/macio/gpio.c b/hw/misc/macio/gpio.c
index 9317df759c7882aed8809a1f0be4fff51d9a8e50..31811ab5133ddbba8d0e508525826f6abd1fd444 100644 (file)
--- a/hw/misc/macio/gpio.c
+++ b/hw/misc/macio/gpio.c
@@ -30,6 +30,7 @@
 #include "hw/misc/macio/gpio.h"
 #include "hw/nmi.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 

diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
index e5917d8f2e8cae0eed58f35ee53087c6b3dccd8d..548625a5f0069770ef43b2c7d72d3063eb974c9c 100644 (file)
--- a/hw/misc/macio/mac_dbdma.c
+++ b/hw/misc/macio/mac_dbdma.c
@@ -36,10 +36,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/ppc/mac_dbdma.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/log.h"
 #include "sysemu/dma.h"
 

diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index b726c73022cd8d63f0a70d6d3befc9ff5119bce9..82492096f81ae22244ac38f1eb925aa41e67a592 100644 (file)
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -22,8 +22,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/ppc/mac.h"
 #include "hw/misc/macio/cuda.h"

diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 6e6d96c8c5ff78bab7aab7d3a3571c42ada03897..7201cf4f9a5a55706d6dc39dec26b88516f9ae5c 100644 (file)
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -39,6 +39,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 

diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c
index ac6d35a81d4b7e38b4cb55ba7b78cb7289a96aeb..d373ece0c9581a8a59e22896aea05fa48ec5b2a3 100644 (file)
--- a/hw/misc/max111x.c
+++ b/hw/misc/max111x.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
+#include "qemu/module.h"
 
 typedef struct {
     SSISlave parent_obj;

diff --git a/hw/misc/milkymist-hpdmc.c b/hw/misc/milkymist-hpdmc.c
index 44dc0698ec8523a5add58ff77c4dd5c1056806c0..701c79e81caf012d8bb4628e523ecb40fd1afb80 100644 (file)
--- a/hw/misc/milkymist-hpdmc.c
+++ b/hw/misc/milkymist-hpdmc.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 enum {
     R_SYSTEM = 0,

diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c
index 4a03c7ee63758943d45cc693f921ea2ced5260dc..1c27f1a4bc129307c98fa5f913e66efd3de9c120 100644 (file)
--- a/hw/misc/milkymist-pfpu.c
+++ b/hw/misc/milkymist-pfpu.c
@@ -27,6 +27,7 @@
 #include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include <math.h>
 

diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
index d019d41a3cd9c42073e6df3de4f569970c358b63..edec164605922e617e70aff396b6d1f341008cb2 100644 (file)
--- a/hw/misc/mips_cmgcr.c
+++ b/hw/misc/mips_cmgcr.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c
index 712d8423a714fe25c2e84aec0ad2f7b869818ded..446b1ad39707c0830b6e3e12db7be8e8d993e8e1 100644 (file)
--- a/hw/misc/mips_cpc.c
+++ b/hw/misc/mips_cpc.c
@@ -21,6 +21,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 
 #include "hw/misc/mips_cpc.h"

diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c
index 3afdbe69c6bd351cee07d3fff1fc2c510de36414..e8ba4a3cd086439a2f720ee2165ad2821b43bc60 100644 (file)
--- a/hw/misc/mips_itu.c
+++ b/hw/misc/mips_itu.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "cpu.h"
 #include "exec/exec-all.h"

diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c
index 14cff26c61d654e5f05632df3c58d10bbb022a3e..e72ed69d5112349e6c9e3ae6e4db70bbef4751ad 100644 (file)
--- a/hw/misc/mos6522.c
+++ b/hw/misc/mos6522.c
@@ -23,6 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/input/adb.h"
@@ -31,6 +32,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /* XXX: implement all timer modes */

diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c
index 5cf10ebd66a9913e154a13c166c5baad2ad334b3..b97ad42d7569923aaf9cb02b66fbe7222132d914 100644 (file)
--- a/hw/misc/mps2-fpgaio.c
+++ b/hw/misc/mps2-fpgaio.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/sysbus.h"

diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
index 6a9d251f1854a9293be4db82a116f3df1bcfd1b6..1fdf5d22bd78914d0383f23a576f8db5377c95a7 100644 (file)
--- a/hw/misc/mps2-scc.c
+++ b/hw/misc/mps2-scc.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"

diff --git a/hw/misc/msf2-sysreg.c b/hw/misc/msf2-sysreg.c
index 6eb501104b9777510a5a650cb07f7b06d0e5e470..21a286382169204c73313b6a7dda7270cd3753ec 100644 (file)
--- a/hw/misc/msf2-sysreg.c
+++ b/hw/misc/msf2-sysreg.c
@@ -15,6 +15,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/misc/msf2-sysreg.h"
 #include "qemu/error-report.h"
 #include "trace.h"

diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c
index a10f0496fec31d5ac0eec4bc0a514e855c5ee398..fd183037243be6c7c19fe6515b346117bab9da2f 100644 (file)
--- a/hw/misc/mst_fpga.c
+++ b/hw/misc/mst_fpga.c
@@ -10,9 +10,11 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 
 /* Mainstone FPGA for extern irqs */
 #define FPGA_GPIO_PIN  0

diff --git a/hw/misc/nrf51_rng.c b/hw/misc/nrf51_rng.c
index 3400e90a9b21f01b9cbc9e174a2d2d7fd7d9df44..96ef4330ebe3c33bd576fcc8d5b1c43eda7b8464 100644 (file)
--- a/hw/misc/nrf51_rng.c
+++ b/hw/misc/nrf51_rng.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/arm/nrf51.h"
 #include "hw/misc/nrf51_rng.h"

diff --git a/hw/misc/pc-testdev.c b/hw/misc/pc-testdev.c
index 0aee04f23154f09c9c4025afdaaddb6636e27213..1f9abd52b84ff25d18f1dff3f74cbeca33a380fc 100644 (file)
--- a/hw/misc/pc-testdev.c
+++ b/hw/misc/pc-testdev.c
@@ -38,6 +38,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/qdev.h"
+#include "qemu/module.h"
 #include "hw/isa/isa.h"
 
 #define IOMEM_LEN    0x10000

diff --git a/hw/misc/pca9552.c b/hw/misc/pca9552.c
index 7325d3f28786280472c570901ca1d1349ed4a908..3422397f896bf622715e92771eaadd04c78ab450 100644 (file)
--- a/hw/misc/pca9552.c
+++ b/hw/misc/pca9552.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/misc/pca9552.h"
 #include "hw/misc/pca9552_regs.h"

diff --git a/hw/misc/pci-testdev.c b/hw/misc/pci-testdev.c
index 1282d151cb6aa8c354762407612dc7bd4f3908a7..d4d89df4cf53499503e4bba1001f70124acf9e1a 100644 (file)
--- a/hw/misc/pci-testdev.c
+++ b/hw/misc/pci-testdev.c
@@ -17,10 +17,12 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "qemu/event_notifier.h"
+#include "qemu/module.h"
 #include "sysemu/kvm.h"
 
 typedef struct PCITestDevHdr {

diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c
index afe191fbe1f3184ad05085b49e90212ec5e0af68..b538b4afbb166cb1fdba981355b9a9720f14bc93 100644 (file)
--- a/hw/misc/puv3_pm.c
+++ b/hw/misc/puv3_pm.c
@@ -8,12 +8,14 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 
 #undef DEBUG_PUV3
 #include "hw/unicore32/puv3.h"
+#include "qemu/module.h"
 
 #define TYPE_PUV3_PM "puv3_pm"
 #define PUV3_PM(obj) OBJECT_CHECK(PUV3PMState, (obj), TYPE_PUV3_PM)

diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 9d8961ba0cbd40ea1142e55a4f4a2129196c760d..1da24c621eb2bed847b22ae9a99d0562725afd62 100644 (file)
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -15,6 +15,7 @@
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #include "hw/nvram/fw_cfg.h"
 #include "hw/misc/pvpanic.h"

diff --git a/hw/misc/sga.c b/hw/misc/sga.c
index 4a22a52a605bd83c7b872822fdd220b4e805c0c5..da04924f5f0078865ea7a13643eda615173fdfe4 100644 (file)
--- a/hw/misc/sga.c
+++ b/hw/misc/sga.c
@@ -24,9 +24,11 @@
  * sgabios code originally available at code.google.com/p/sgabios
  *
  */
+
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
 #include "hw/loader.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 
 #define SGABIOS_FILENAME "sgabios.bin"

diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c
index 0b33cdcb61270aa0a1106bdc3b6b06d33ecad370..9c2cf0464612fe3a0b3c8f13e80bab3a7202d32d 100644 (file)
--- a/hw/misc/slavio_misc.c
+++ b/hw/misc/slavio_misc.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /*

diff --git a/hw/misc/stm32f2xx_syscfg.c b/hw/misc/stm32f2xx_syscfg.c
index 7f101958621b9c53992db6f8e40a99e2ceccf0f0..aa59b43549845a680b5a180188dab45f34768407 100644 (file)
--- a/hw/misc/stm32f2xx_syscfg.c
+++ b/hw/misc/stm32f2xx_syscfg.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/misc/stm32f2xx_syscfg.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef STM_SYSCFG_ERR_DEBUG
 #define STM_SYSCFG_ERR_DEBUG 0

diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
index 0c32f6f8b67589169394aac769cc5beb0ad39c6c..19def5c20f093f966525b178eea025d85ff62221 100644 (file)
--- a/hw/misc/tmp105.c
+++ b/hw/misc/tmp105.c
@@ -24,6 +24,7 @@
 #include "tmp105.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
+#include "qemu/module.h"
 
 static void tmp105_interrupt_update(TMP105State *s)
 {

diff --git a/hw/misc/tmp421.c b/hw/misc/tmp421.c
index ce6d40ac9c5b05d143049ba09016558c5496f487..69ee5db4b72b2c859c0f304171badec7d3ebb6f6 100644 (file)
--- a/hw/misc/tmp421.c
+++ b/hw/misc/tmp421.c
@@ -29,6 +29,7 @@
 #include "hw/i2c/i2c.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
+#include "qemu/module.h"
 
 /* Manufacturer / Device ID's */
 #define TMP421_MANUFACTURER_ID          0x55

diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c
index 9a84be75ed661c4fd19a3ea828b0119f9eca0202..45a3e31c3d5cdbdd815067e9bcc0763d4066f418 100644 (file)
--- a/hw/misc/tz-mpc.c
+++ b/hw/misc/tz-mpc.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/sysbus.h"

diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c
index 9e352044ea5e20eebc08d28940f58467addc96ad..52b96ba70d8b169428032dae80fed1d84cc77ae0 100644 (file)
--- a/hw/misc/tz-msc.c
+++ b/hw/misc/tz-msc.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/sysbus.h"

diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c
index 2e04837bea989f855e225833e5cf4e3a050fe509..2a14a26f2911ed3925c88d80eb63e5142f9e3225 100644 (file)
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/sysbus.h"

diff --git a/hw/misc/unimp.c b/hw/misc/unimp.c
index 1c0ba2f0a75221fa8b935f7406c09a84c99c4da3..7f8e42cc2ccafa7ec05bbb81b24a79ccc3ffbfba 100644 (file)
--- a/hw/misc/unimp.c
+++ b/hw/misc/unimp.c
@@ -16,6 +16,7 @@
 #include "hw/sysbus.h"
 #include "hw/misc/unimp.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 static uint64_t unimp_read(void *opaque, hwaddr offset, unsigned size)

diff --git a/hw/misc/vmcoreinfo.c b/hw/misc/vmcoreinfo.c
index 304c6287c76508dd2e6c17f30d0bf9ed050125a6..987d6f52af3586e64e23156edf3653b5ffa7563f 100644 (file)
--- a/hw/misc/vmcoreinfo.c
+++ b/hw/misc/vmcoreinfo.c
@@ -9,8 +9,10 @@
  * See the COPYING file in the top-level directory.
  *
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/nvram/fw_cfg.h"
 #include "hw/misc/vmcoreinfo.h"
 

diff --git a/hw/misc/zynq-xadc.c b/hw/misc/zynq-xadc.c
index 14906103c9af3d40c97119e461b523240818e988..f1e48601dcd2fa90ff9c586aa544027a04d20644 100644 (file)
--- a/hw/misc/zynq-xadc.c
+++ b/hw/misc/zynq-xadc.c
@@ -19,6 +19,7 @@
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 enum {
     CFG                = 0x000 / 4,

diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index d6bdd027ef5529b3a4df86dd2fa19406a82be200..6b51ae5ff177b25cf76c67e245c6a5b8fc7f821c 100644 (file)
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -20,6 +20,7 @@
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef ZYNQ_SLCR_ERR_DEBUG
 #define ZYNQ_SLCR_ERR_DEBUG 0

diff --git a/hw/net/allwinner_emac.c b/hw/net/allwinner_emac.c
index 50e8361e52159d0a91e71bb5427961dc38d7f687..eecda528008c8d885626d598fd35195bd138ead1 100644 (file)
--- a/hw/net/allwinner_emac.c
+++ b/hw/net/allwinner_emac.c
@@ -16,12 +16,14 @@
  * GNU General Public License for more details.
  *
  */
+
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "qemu/fifo8.h"
 #include "hw/net/allwinner_emac.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include <zlib.h>
 
 static uint8_t padding[60];

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index 7f63411430fcc5cced3412f88abc9a22978564ac..d41208588460e02e8f24c62a880d6711890a7352 100644 (file)
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -28,6 +28,7 @@
 #include "hw/net/cadence_gem.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "sysemu/dma.h"
 #include "net/checksum.h"
 

diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c
index 5f82f4359a61b580ff0f3518a709e7bf7c0d75a1..df639f8fa0b1957218dc3499ad5172374885cdb7 100644 (file)
--- a/hw/net/can/can_kvaser_pci.c
+++ b/hw/net/can/can_kvaser_pci.c
@@ -31,6 +31,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/event_notifier.h"
+#include "qemu/module.h"
 #include "qemu/thread.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"

diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c
index fd20b889554d59e3311e5daf21c929fd9aa23601..7af0993d7adfd07afeed07b6e0195822f82a6493 100644 (file)
--- a/hw/net/can/can_mioe3680_pci.c
+++ b/hw/net/can/can_mioe3680_pci.c
@@ -27,6 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/event_notifier.h"
+#include "qemu/module.h"
 #include "qemu/thread.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"

diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c
index 23f7ff45a31a829b2d357d25834ebd00d8fade26..3f7312af07559028c6aeccac79c273319d5a2f11 100644 (file)
--- a/hw/net/can/can_pcm3680_pci.c
+++ b/hw/net/can/can_pcm3680_pci.c
@@ -27,6 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/event_notifier.h"
+#include "qemu/module.h"
 #include "qemu/thread.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"

diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 98cb4e58c7baaa9857a2372c99ab52f8a5ede039..bdb0b3b2c2ad17e0c4b6e1111ba5d79576986b38 100644 (file)
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -21,6 +21,7 @@
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include <zlib.h>
 

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 121452d5082e3ac3b2b182c308a54bf6654201b2..1dc14663324a22661d98a62377b7a2fd3d41e95a 100644 (file)
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -33,6 +33,7 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/range.h"
 
 #include "e1000x_common.h"

diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 510ddb38976e57872b8add68276cb7eb87000ea8..581f7d03d5cc933f3e63a669d6003676bbc59c36 100644 (file)
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -37,6 +37,7 @@
 #include "qemu/units.h"
 #include "net/net.h"
 #include "net/tap.h"
+#include "qemu/module.h"
 #include "qemu/range.h"
 #include "sysemu/sysemu.h"
 #include "hw/pci/msi.h"

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index e761daf55181b39bb1a303270db5aa00ff14e808..6607c9142d364eb451453c35fca71ed4bf3fd3ab 100644 (file)
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -50,6 +50,7 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 #include "qemu/bitops.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 /* QEMU sends frames smaller than 60 bytes to ethernet nics.

diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c
index 36855804dba0cd4dea91d8be34e2b35307c0680a..4cfbf1135a60b354278b1c356b1a40264b08c898 100644 (file)
--- a/hw/net/etraxfs_eth.c
+++ b/hw/net/etraxfs_eth.c
@@ -28,6 +28,7 @@
 #include "net/net.h"
 #include "hw/cris/etraxfs.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define D(x)

diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index 0b66274ce3ba685460e7f154c0fd280b83218013..2a8b99a2e41dbdbb9d02899a3ac42c6ca95a20ec 100644 (file)
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -33,6 +33,7 @@
 #include "etsec.h"
 #include "registers.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /* #define HEX_DUMP */
 /* #define DEBUG_REGISTER */

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
index 790430346b5171058f06ae5c0065adae7d86024d..eb760472e54cb0ec614482d0f6a530eb7f2aa76f 100644 (file)
--- a/hw/net/ftgmac100.c
+++ b/hw/net/ftgmac100.c
@@ -15,6 +15,7 @@
 #include "hw/net/ftgmac100.h"
 #include "sysemu/dma.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "net/checksum.h"
 #include "net/eth.h"
 #include "hw/net/mii.h"

diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
index 6e297c5480957fbfcdda16a5a3eadf0dcb3b9b57..404154ebbf72334268e8ed7ea55834a565ca867e 100644 (file)
--- a/hw/net/imx_fec.c
+++ b/hw/net/imx_fec.c
@@ -25,6 +25,7 @@
 #include "hw/net/imx_fec.h"
 #include "sysemu/dma.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "net/checksum.h"
 #include "net/eth.h"
 

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index b29e3fee49fd4d12fac4299b7ac9b4f8c4a9baa0..f6120be21948c76641aac12a01131101bcbeb452 100644 (file)
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -18,6 +18,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/ptimer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 /* For crc32 */
 #include <zlib.h>
 

diff --git a/hw/net/lance.c b/hw/net/lance.c
index f987b2fd180f1b72af72326afb15d9d4d7ba47a8..2978c01d58c5a9e55e9a3adef99a2b945ecc1817 100644 (file)
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -36,6 +36,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/sparc/sparc32_dma.h"
 #include "hw/net/lance.h"

diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 0091e4ecddc23b2db650e97f15e6acf907e66639..78468fad6b9d52e6d99eedbcf13a15fbd300ca01 100644 (file)
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -5,9 +5,11 @@
  *
  * This code is licensed under the GPL
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "net/net.h"
+#include "qemu/module.h"
 #include "hw/m68k/mcf.h"
 #include "hw/m68k/mcf_fec.h"
 #include "hw/net/mii.h"

diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
index 85c9fc0b65dd204ef0d138e05619e4454e251d42..41ef7a44565718d3c6b6204d01930c57211314d1 100644 (file)
--- a/hw/net/milkymist-minimac2.c
+++ b/hw/net/milkymist-minimac2.c
@@ -24,13 +24,13 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h" /* FIXME: why does this use TARGET_PAGE_ALIGN? */
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"
 #include "net/net.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 
 #include <zlib.h>

diff --git a/hw/net/mipsnet.c b/hw/net/mipsnet.c
index 5ec13105df6ef747214cbba147e185cb0e043f2f..c5fbd8431fd6f3d56eb3bf5943b6864191bcc07e 100644 (file)
--- a/hw/net/mipsnet.c
+++ b/hw/net/mipsnet.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "net/net.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "hw/sysbus.h"
 

diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index c7fdeb0f6caa5acab6f661470d0c8a850a1e4670..3490e54c5a2b2456690f2f82d35aafae23a27957 100644 (file)
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
 #include "hw/net/ne2000-isa.h"
@@ -29,6 +30,7 @@
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
+#include "qemu/module.h"
 
 #define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE2000)
 

diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index ca792d96f1ba4e73b8aa07fa75e9900084999bb4..1cf4b573412a1e73d25207e9eaa9cc486f65baba 100644 (file)
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "net/eth.h"
+#include "qemu/module.h"
 #include "ne2000.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"

diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index d6f54f8d8208579705390260a2005e4df83ccffc..a5abb8df46c4440ab6879f6a6e3ef54d406993fc 100644 (file)
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -36,6 +36,7 @@
 #include "hw/net/mii.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
+#include "qemu/module.h"
 #include "net/eth.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"

diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index 7c7385578301d187b5a8c11b4a92d26cdaecca3a..600d09ce92a71b8772c69db5502d94fea7231343 100644 (file)
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -30,6 +30,7 @@
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "net/net.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "sysemu/dma.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 5266f9b7dd60e8203c51631eb774c5f15646aa74..bd54612f2aec986790bad825f637a9c8d9d0985d 100644 (file)
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -24,6 +24,7 @@
 #include "qapi/error.h"
 #include "qapi/qapi-commands-rocker.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/bitops.h"
 
 #include "rocker.h"

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 2342a095e34e64488dc74eb31770900cc68be993..09273171e53f858e136d7db02d1218be1ee35aba 100644 (file)
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -49,12 +49,14 @@
  */
 
 /* For crc32 */
+
 #include "qemu/osdep.h"
 #include <zlib.h>
 
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "sysemu/dma.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "net/net.h"
 #include "net/eth.h"

diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index d19ea0750d30e5bd497f5af96391ea29bddd2563..4a612eebe95b7c05c7bf974ee256c4f264a2cc91 100644 (file)
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -12,6 +12,7 @@
 #include "net/net.h"
 #include "hw/net/smc91c111.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 /* For crc32 */
 #include <zlib.h>
 

diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index 63ba3929e9b68004f19620414af86dd68070271f..f162d490251c571004fa0eb466e90420a9a97891 100644 (file)
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -24,11 +24,12 @@
  * THE SOFTWARE.
  *
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "net/net.h"
 #include "hw/qdev.h"
 #include "hw/ppc/spapr.h"

diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index b3375ebb459cd28f35732fd9170f9e0c9f943d4a..2f645bfb716562dc3b1d8b093c33835ccb1be3de 100644 (file)
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -6,10 +6,12 @@
  *
  * This code is licensed under the GPL.
  */
+
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include <zlib.h>
 
 //#define DEBUG_STELLARIS_ENET 1

diff --git a/hw/net/sungem.c b/hw/net/sungem.c
index 60f1e479f378efeb7355e60a8fb548dc1dc55a6c..89bcf749d1b4ac462daa10d05c1dcdb0d9b5b996 100644 (file)
--- a/hw/net/sungem.c
+++ b/hw/net/sungem.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "net/net.h"
 #include "net/eth.h"
 #include "net/checksum.h"

diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c
index 7558fca8f9499e4ef7827da7ebfe736441e1765b..1ebaee3c821c159683929e8aef42db837db877ca 100644 (file)
--- a/hw/net/sunhme.c
+++ b/hw/net/sunhme.c
@@ -27,6 +27,7 @@
 #include "hw/pci/pci.h"
 #include "hw/net/mii.h"
 #include "net/net.h"
+#include "qemu/module.h"
 #include "net/checksum.h"
 #include "net/eth.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index ffe0872fff5bdf428e08d10c1553d85823fb6f0a..c3f5fccfd18d19a444049c8fd98a3d3269efe51b 100644 (file)
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "hw/virtio/virtio.h"
 #include "net/net.h"
 #include "net/checksum.h"

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 4665dc95ad02952982f1cd8dd7f99cc9c159431d..10d01d0058c6241d9a00900d3c3b511561e9734f 100644 (file)
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -21,8 +21,8 @@
 #include "net/tap.h"
 #include "net/checksum.h"
 #include "sysemu/sysemu.h"
-#include "qemu-common.h"
 #include "qemu/bswap.h"
+#include "qemu/module.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/msi.h"
 #include "migration/register.h"

diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index 63f5a62ebf1b633fe164c9ff5a2ad4565eb40bf0..f49df95b0786bbbae0fc75a69154ca5719812e87 100644 (file)
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -27,6 +27,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "net/net.h"
 
 #ifdef DEBUG_XGMAC

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index cc880a3d08326c4900755a7fc769f763cd5f14fe..feeaca680eb7219c02ca7694dea5204ded4331cd 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "net/net.h"
 #include "net/checksum.h"
 

diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c
index 35de353b7c44bbd7518b9e68b2f7433e2703d72f..8f3a8f8597c2caa05c9bacdab0a04d9cce28cccd 100644 (file)
--- a/hw/net/xilinx_ethlite.c
+++ b/hw/net/xilinx_ethlite.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h" /* FIXME should not use tswap* */
 #include "hw/sysbus.h"
 #include "hw/hw.h"

diff --git a/hw/nvram/ds1225y.c b/hw/nvram/ds1225y.c
index b6ef463db0a629927f52c96e141f6a7c59228d4e..fd49283f413e2530aeac10314ddc83921953cefe 100644 (file)
--- a/hw/nvram/ds1225y.c
+++ b/hw/nvram/ds1225y.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 typedef struct {
     MemoryRegion iomem;

diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
index d1456dafbd8ad6c1f651330c543d499416e37d96..f75a485738d3ce298d8c8d7adda339d52e788ac1 100644 (file)
--- a/hw/nvram/eeprom_at24c.c
+++ b/hw/nvram/eeprom_at24c.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/nvram/mac_nvram.c b/hw/nvram/mac_nvram.c
index aef80e64df0f7bba2519ad3a9a29f9bb7df95046..a60426c4692eae7f55bffd28fa6c8077904dd9bc 100644 (file)
--- a/hw/nvram/mac_nvram.c
+++ b/hw/nvram/mac_nvram.c
@@ -22,11 +22,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/nvram/chrp_nvram.h"
 #include "hw/ppc/mac.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include <zlib.h>
 
 /* debug NVR */

diff --git a/hw/nvram/nrf51_nvm.c b/hw/nvram/nrf51_nvm.c
index 7d94cef1db32023f630ff7be6d2f09c9cba7e666..eca0cb35b5204a53adc6a979d7de62030f2fb470 100644 (file)
--- a/hw/nvram/nrf51_nvm.c
+++ b/hw/nvram/nrf51_nvm.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "exec/address-spaces.h"
 #include "hw/arm/nrf51.h"
 #include "hw/nvram/nrf51_nvm.h"

diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c
index c98c7576e6f08324eb546b1dbb238d087e7b1e89..09efd886bfb187118c50951c46331533bcf1e0b3 100644 (file)
--- a/hw/nvram/spapr_nvram.c
+++ b/hw/nvram/spapr_nvram.c
@@ -23,9 +23,9 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include <libfdt.h>
 

diff --git a/hw/pci-bridge/dec.c b/hw/pci-bridge/dec.c
index ca402537304a04f371f0a41bd902b71b0a5175d4..3ae2f788a4ec0cc01326235f2e9e563538fa96ad 100644 (file)
--- a/hw/pci-bridge/dec.c
+++ b/hw/pci-bridge/dec.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "dec.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c
index 26bda73eaed1c48fd435cfaa68582ce123d27e92..44acda7cb960d2f53130bb7ca4f2344b6532a52e 100644 (file)
--- a/hw/pci-bridge/gen_pcie_root_port.c
+++ b/hw/pci-bridge/gen_pcie_root_port.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pcie_port.h"
 

diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c
index 6d8b0f54a743530e55c9d9a01e09897ba341ad9d..db77a3541b67285659547caf6350b0a35c69afcb 100644 (file)
--- a/hw/pci-bridge/i82801b11.c
+++ b/hw/pci-bridge/i82801b11.c
@@ -43,6 +43,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "qemu/module.h"
 #include "hw/i386/ich9.h"
 
 /*****************************************************************************/

diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index 81f2de6f07d4c927eabf2a3c71ac542f9ea9b40b..310af04af9d9018e396bf62ecc85071dbc84eafa 100644 (file)
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -25,6 +25,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"
 #include "hw/pci/pcie_port.h"
+#include "qemu/module.h"
 
 #define PCI_DEVICE_ID_IOH_EPORT         0x3420  /* D0:F0 express mode */
 #define PCI_DEVICE_ID_IOH_REV           0x2

diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index c56ed1f52f429793c3a6e896a11534a454333d8b..5fe96d02b3e012082d51b92a12827d42d4ea61fe 100644 (file)
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -21,6 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/pci/msi.h"

diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
index ca66bc721a43ebcf1f3c612325bb905b10023ce8..aecf3d7ddf49ffca9e47d46270bd8271a497186e 100644 (file)
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -18,6 +18,7 @@
 #include "hw/pci/pci_bridge.h"
 #include "qemu/range.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/numa.h"
 
 #define TYPE_PXB_BUS "pxb-bus"

diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c
index 9a4fba413a7dff730979e5f58115293a8fb4ed41..d0bfa0189a625c8ef7f2d347cf7da55b580ec554 100644 (file)
--- a/hw/pci-bridge/pcie_pci_bridge.c
+++ b/hw/pci-bridge/pcie_pci_bridge.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c
index be3f4d5e03f5b8331072c90ffcc7abf2579319d7..92f253c9241e6636a70f739f6d703eadd149f166 100644 (file)
--- a/hw/pci-bridge/pcie_root_port.c
+++ b/hw/pci-bridge/pcie_root_port.c
@@ -14,6 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/pci/pcie_port.h"
 
 static void rp_aer_vector_update(PCIDevice *d)

diff --git a/hw/pci-bridge/simba.c b/hw/pci-bridge/simba.c
index 7cf0d6e04779b63a3762a1100013f8f062905764..ba55ab193939be9bd41ec30616ec4ffc67463d2e 100644 (file)
--- a/hw/pci-bridge/simba.c
+++ b/hw/pci-bridge/simba.c
@@ -28,6 +28,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_bus.h"
+#include "qemu/module.h"
 #include "hw/pci-bridge/simba.h"
 
 /*

diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c
index ab2a51e15d11637f0391cad46336f02e55d0b15c..264e37d6a6eaf1bc5f8221047cf088d7a68c6826 100644 (file)
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -25,6 +25,7 @@
 #include "hw/pci/pcie.h"
 #include "hw/pci/pcie_port.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #define PCI_DEVICE_ID_TI_XIO3130D       0x8233  /* downstream port */
 #define XIO3130_REVISION                0x1

diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c
index 1d41a49ab09f6ce16031bbeb44db6f4a44287bec..b8cb31355f2598837e6073b65557bec5d9812c3c 100644 (file)
--- a/hw/pci-bridge/xio3130_upstream.c
+++ b/hw/pci-bridge/xio3130_upstream.c
@@ -24,6 +24,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"
 #include "hw/pci/pcie_port.h"
+#include "qemu/module.h"
 
 #define PCI_DEVICE_ID_TI_XIO3130U       0x8232  /* upstream port */
 #define XIO3130_REVISION                0x2

diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c
index 64ad21d295a80cc184669afc9f5637da82a6d6fa..0fdfff57848ac7b6111917c82602076decb1daff 100644 (file)
--- a/hw/pci-host/designware.c
+++ b/hw/pci-host/designware.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_host.h"

diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index 1bafffcc34fe4beb7d22cd858dd0185de26d7e8e..629d1a4624f68ad3af03215a737fa30e715aa8d6 100644 (file)
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -28,10 +28,12 @@
  * http://www.kernel.org/doc/Documentation/devicetree/bindings/pci/host-generic-pci.txt
  * http://www.firmware.org/1275/practice/imap/imap0_9d.pdf
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/pci-host/gpex.h"
+#include "qemu/module.h"
 
 /****************************************************************************
  * GPEX host

diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c
index 5a151e93e953ba51b50721882d3841cfd121894d..ed3b3c361f1d8ea5e3a773b8a92644bee9d99446 100644 (file)
--- a/hw/pci-host/grackle.c
+++ b/hw/pci-host/grackle.c
@@ -29,6 +29,7 @@
 #include "hw/pci/pci.h"
 #include "hw/intc/heathrow_pic.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define GRACKLE_PCI_HOST_BRIDGE(obj) \

diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index b8f8c112e662dd4eebc33b324420914260538852..21eaa30a205f7cc8843cbe92ac8099bf3b5b481e 100644 (file)
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -20,6 +20,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "qemu/bswap.h"
+#include "qemu/module.h"
 #include "hw/pci-host/ppce500.h"
 
 #ifdef DEBUG_PCI

diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 960939f5ed3e54b52cdc96742f31fee62adee3a1..172b0bc4352c16a172396933bbbb57cb738443a3 100644 (file)
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -27,11 +27,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci-host/q35.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
+#include "qemu/module.h"
 
 /****************************************************************************
  * Q35 host

diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index e33bd46967bb2f5fe6424f4f6d2cc273694d02e2..2cec1116af6ebe70a9bf059524bd2776aa2e533c 100644 (file)
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -35,6 +35,7 @@
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /*

diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c
index 1378c5c7fb40062704dc86a72325917e4b1ff168..680fefd066c567ac7aa37b416bc26dcd597febe4 100644 (file)
--- a/hw/pci-host/uninorth.c
+++ b/hw/pci-host/uninorth.c
@@ -21,9 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/ppc/mac.h"
+#include "qemu/module.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci-host/uninorth.h"

diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 7b19078c801f9aa46fd0f03ec110366e5d53b886..791b321ea0e280e0ce8fb0344c4df30f778bf80f 100644 (file)
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -13,6 +13,7 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /* Old and buggy versions of QEMU used the wrong mapping from
  * PCI IRQs to system interrupt lines. Unfortunately the Linux

diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c
index ceb00e23e6c72773f689dc555717edd77fb256cc..192b697453d1ee00b8d0dae766def9fa3f2fe496 100644 (file)
--- a/hw/pci-host/xilinx-pcie.c
+++ b/hw/pci-host/xilinx-pcie.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 8d954885c0a11521e769fc1d488939bf1a6614f8..715b9a4fe6162d87700c251f5e3e0774b1a0fc30 100644 (file)
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -32,6 +32,7 @@
 #include "qemu/osdep.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_bus.h"
+#include "qemu/module.h"
 #include "qemu/range.h"
 #include "qapi/error.h"
 

diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
index 5f3497256c52c1935aece84b13e53981731275bc..c5f92449342253adb2e3d202fbd5f07d618f6ce9 100644 (file)
--- a/hw/pci/pci_host.c
+++ b/hw/pci/pci_host.c
@@ -22,6 +22,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_host.h"
+#include "qemu/module.h"
 #include "hw/pci/pci_bus.h"
 #include "trace.h"
 

diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c
index 1ee4945a6de214cd8dd39da54c646e106dcf6826..d6768b8eb6c7ae55a6b8b9872b516d7a685db0e5 100644 (file)
--- a/hw/pci/pcie_host.c
+++ b/hw/pci/pcie_host.c
@@ -23,6 +23,7 @@
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pcie_host.h"
+#include "qemu/module.h"
 #include "exec/address-spaces.h"
 
 /* a helper function to get a PCIDevice for a given mmconfig address */

diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
index a30291ef54d35e395149874e9e8a047a3c8d958c..c9c3ba540addc4ba546bfef5c11c07d9e9a56b45 100644 (file)
--- a/hw/pci/pcie_port.c
+++ b/hw/pci/pcie_port.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pcie_port.h"
+#include "qemu/module.h"
 #include "hw/hotplug.h"
 
 void pcie_port_init_reg(PCIDevice *d)

diff --git a/hw/pcmcia/pcmcia.c b/hw/pcmcia/pcmcia.c
index 195672186a6e8d80731d63768e0553b5ae4b5a74..c16b12db01acca49363349d5e3ac5dff7e3d5806 100644 (file)
--- a/hw/pcmcia/pcmcia.c
+++ b/hw/pcmcia/pcmcia.c
@@ -5,7 +5,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/pcmcia.h"
 

diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c
index 20c9c753d20f04fca767fe83d834086a7cf9f81e..8993b784bb8853110a143b4fd1d82100d054e32f 100644 (file)
--- a/hw/pcmcia/pxa2xx.c
+++ b/hw/pcmcia/pxa2xx.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "hw/pcmcia.h"
 #include "hw/arm/pxa.h"
 

diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
index ce1254b5d471362c8a872e30a6c49b3de395a9c7..2b7cc1406007e3e6a4a81c782d127647b623056f 100644 (file)
--- a/hw/ppc/mpc8544_guts.c
+++ b/hw/ppc/mpc8544_guts.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
index 5feeed6bc463e59b3709b5937ec449ccb4a06320..c6411ecc1d60f88a25aa823e769eeb9f05fee0e9 100644 (file)
--- a/hw/ppc/pnv_core.c
+++ b/hw/ppc/pnv_core.c
@@ -16,10 +16,12 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "target/ppc/cpu.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/pnv.h"

diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c
index 641e2046db926a43c4f1b7c6a51c1cd3bac57f9f..a9f150c3cab0be18ad8b2ce9a07972964755ff7f 100644 (file)
--- a/hw/ppc/pnv_lpc.c
+++ b/hw/ppc/pnv_lpc.c
@@ -22,6 +22,7 @@
 #include "target/ppc/cpu.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/isa/isa.h"
 
 #include "hw/ppc/pnv.h"

diff --git a/hw/ppc/pnv_occ.c b/hw/ppc/pnv_occ.c
index fdd9296e1bc7387eb9dd15fa8b58346bcf8c0a37..636f91f311d4fac944899809970c6922103af248 100644 (file)
--- a/hw/ppc/pnv_occ.c
+++ b/hw/ppc/pnv_occ.c
@@ -22,6 +22,7 @@
 #include "target/ppc/cpu.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #include "hw/ppc/pnv.h"
 #include "hw/ppc/pnv_xscom.h"

diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index 5345c8389e57d53b09454a0877f01e58738473ca..d7b6f5d75bf9a919cd88fb3cee1ec5148eb72795 100644 (file)
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -21,6 +21,7 @@
 #include "hw/hw.h"
 #include "target/ppc/cpu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "monitor/monitor.h"
 

diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
index f53a6d7a945771c8374532ef7175dea970a5f547..4e52885c9ef68ae311bab556af50c1551929c8e7 100644 (file)
--- a/hw/ppc/pnv_xscom.c
+++ b/hw/ppc/pnv_xscom.c
@@ -16,9 +16,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "sysemu/hw_accel.h"
 #include "target/ppc/cpu.h"
 #include "hw/sysbus.h"

diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c
index 42ef76b6f58afead24c603369e5b73c9c16dc875..ca54631f9deac945e87d57e49ee5fd75dad7982a 100644 (file)
--- a/hw/ppc/ppc440_pcix.c
+++ b/hw/ppc/ppc440_pcix.c
@@ -22,6 +22,7 @@
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc4xx.h"

diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 9130eb314c3fb2f70c1af6797b7f236478ef6176..5c1a53d6e7acb94cb99f769893c49fc02d4b8f56 100644 (file)
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -10,10 +10,10 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "exec/address-spaces.h"

diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 86981be7102480dae0f5181f35550269c245bf50..e7cf8d50a51b19d3d7355c3d1eecddfef949fd90 100644 (file)
--- a/hw/ppc/ppc4xx_pci.c
+++ b/hw/ppc/ppc4xx_pci.c
@@ -23,6 +23,7 @@
 #include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/ppc4xx.h"
+#include "qemu/module.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "exec/address-spaces.h"

diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c
index c45fc858de746d65ac40e62686fcbe6ac3778990..0060fcb43f21c11bec2fec16f8dd3b0ff72a57f1 100644 (file)
--- a/hw/ppc/ppce500_spin.c
+++ b/hw/ppc/ppce500_spin.c
@@ -28,6 +28,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"

diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c
index 50893ec5295ba0535f2e5b8d4df6415a35348c49..df7603b986f4d398820313876c1a3a7592dc61b4 100644 (file)
--- a/hw/ppc/prep_systemio.c
+++ b/hw/ppc/prep_systemio.c
@@ -26,6 +26,7 @@
 #include "hw/isa/isa.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h" /* for error_report() */
+#include "qemu/module.h"
 #include "sysemu/sysemu.h" /* for vm_stop() */
 #include "cpu.h"
 #include "trace.h"

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 0a050ad3d85f8fa91f9ab7db088cc512183c8979..6808d4cda83f26d6fa8c04e803976c43de1f5fbb 100644 (file)
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -3,6 +3,7 @@
 #include "sysemu/hw_accel.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "cpu.h"
 #include "exec/exec-all.h"

diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index 5aff4d5a0538d80e7e53aa41aa803281a62930c0..bd3d0256a65dd1b3bbe5773c938bc711ed575d0c 100644 (file)
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -16,10 +16,12 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "hw/hw.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "sysemu/kvm.h"
 #include "hw/qdev.h"
 #include "kvm_ppc.h"

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 9cf2c41b8ca9e0133a52fa746a0627466efe941a..e594b781f93936138e809f2072651eb313913f7d 100644 (file)
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -22,9 +22,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
@@ -39,6 +39,7 @@
 #include <libfdt.h>
 #include "trace.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/qmp/qerror.h"
 #include "hw/ppc/fdt.h"
 #include "hw/pci/pci_bridge.h"

diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c
index 40609875906071528d845c9b23d9168f4de6c0a8..0e1c7ebcf8960304c104d07d7d125469e4bdaf6c 100644 (file)
--- a/hw/ppc/spapr_rng.c
+++ b/hw/ppc/spapr_rng.c
@@ -19,9 +19,9 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/device_tree.h"
 #include "sysemu/rng.h"

diff --git a/hw/ppc/spapr_rtas_ddw.c b/hw/ppc/spapr_rtas_ddw.c
index f6538189f4fc9df53e1b7395fa78d96082953c95..3501b0581991bef1dc19cd6add0d4bd202213e16 100644 (file)
--- a/hw/ppc/spapr_rtas_ddw.c
+++ b/hw/ppc/spapr_rtas_ddw.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/ppc/spapr.h"
 #include "hw/pci-host/spapr.h"
 #include "trace.h"

diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
index d732a3ea9585f69fa8ff56d8879454b4ce39e481..b178e05666fc1fd283ef09cbec21cd5a83f76a79 100644 (file)
--- a/hw/ppc/spapr_rtc.c
+++ b/hw/ppc/spapr_rtc.c
@@ -33,6 +33,7 @@
 #include "qapi/error.h"
 #include "qapi/qapi-events-target.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 
 void spapr_rtc_read(SpaprRtcState *rtc, struct tm *tm, uint32_t *ns)
 {

diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c
index 769f7990f864759d243c2e72f3df3f0e56497f5d..adcf79cd6302504d6073109a8cb04c50f10a6e43 100644 (file)
--- a/hw/rdma/vmw/pvrdma_main.c
+++ b/hw/rdma/vmw/pvrdma_main.c
@@ -15,6 +15,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_ids.h"

diff --git a/hw/riscv/riscv_hart.c b/hw/riscv/riscv_hart.c
index e34a26a0ef25c6f1897ff8b19472dfcf8f27f157..ca69a1bcd87303fe45a66ea24c382d3604e05c1e 100644 (file)
--- a/hw/riscv/riscv_hart.c
+++ b/hw/riscv/riscv_hart.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "target/riscv/cpu.h"
 #include "hw/riscv/riscv_hart.h"

diff --git a/hw/riscv/sifive_clint.c b/hw/riscv/sifive_clint.c
index d4c159e9373624a7f4f74f07a615f7780dbf8e59..591d70deb3d777a8f62735a2a04e6e893ba68e7f 100644 (file)
--- a/hw/riscv/sifive_clint.c
+++ b/hw/riscv/sifive_clint.c
@@ -21,6 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "target/riscv/cpu.h"
 #include "hw/riscv/sifive_clint.h"

diff --git a/hw/riscv/sifive_plic.c b/hw/riscv/sifive_plic.c
index 07a032d93d2e6502f9635bc28c3a8f489924efb9..70a441359935c25b90a4e5e69b75c17446b48d04 100644 (file)
--- a/hw/riscv/sifive_plic.c
+++ b/hw/riscv/sifive_plic.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"

diff --git a/hw/riscv/sifive_prci.c b/hw/riscv/sifive_prci.c
index 0910ea32c1a51fc8ea3e24f035408826e1e43a3e..fa136b5a9fe98ad8495042ea2baad1d433edd515 100644 (file)
--- a/hw/riscv/sifive_prci.c
+++ b/hw/riscv/sifive_prci.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "target/riscv/cpu.h"
 #include "hw/riscv/sifive_prci.h"
 

diff --git a/hw/riscv/sifive_test.c b/hw/riscv/sifive_test.c
index 8abd2cd525d673a0808ac0af328c4a5a746a847b..24a04d7b3697968c573655cf9306b91de2938a97 100644 (file)
--- a/hw/riscv/sifive_test.c
+++ b/hw/riscv/sifive_test.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "target/riscv/cpu.h"
 #include "hw/riscv/sifive_test.h"
 

diff --git a/hw/s390x/ap-bridge.c b/hw/s390x/ap-bridge.c
index 75ad0a66b9e21f20113f04fc8d7c9eb2381cd5f7..9284de4eec3892d7aad5016d1b90b772cc4d61d2 100644 (file)
--- a/hw/s390x/ap-bridge.c
+++ b/hw/s390x/ap-bridge.c
@@ -7,10 +7,12 @@
  * your option) any later version. See the COPYING file in the top-level
  * directory.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "qemu/bitops.h"
+#include "qemu/module.h"
 #include "hw/s390x/ap-bridge.h"
 #include "cpu.h"
 

diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c
index 7cd73df4aaa6711ff66736b3da6288044b9012f1..24f17bb6ca63dfd441dd42034924f5935ed61e5a 100644 (file)
--- a/hw/s390x/ccw-device.c
+++ b/hw/s390x/ccw-device.c
@@ -8,8 +8,10 @@
  * your option) any later version. See the COPYING file in the top-level
  * directory.
  */
+
 #include "qemu/osdep.h"
 #include "ccw-device.h"
+#include "qemu/module.h"
 
 static void ccw_device_refill_ids(CcwDevice *dev)
 {

diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
index e04d51b1912d6bc6abb24e9a06758726a56d57ad..4e9ff481e81b8a4cf5d90114393c1c036b6af403 100644 (file)
--- a/hw/s390x/css-bridge.c
+++ b/hw/s390x/css-bridge.c
@@ -9,11 +9,13 @@
  * your option) any later version. See the COPYING file in the top-level
  * directory.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hotplug.h"
 #include "hw/sysbus.h"
 #include "qemu/bitops.h"
+#include "qemu/module.h"
 #include "hw/s390x/css.h"
 #include "ccw-device.h"
 #include "hw/s390x/css-bridge.h"

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index e574223a226bd1916f927cb1f510a47ce19b3cec..61f3b7471478f8937d2308a608dd26841c92ff46 100644 (file)
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 
 #include "hw/s390x/sclp.h"

diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c
index f5f025d1b6ca29309660ad333623209756a4dda4..8403f0e3e950e387845130672d68c601322eeafe 100644 (file)
--- a/hw/s390x/s390-ccw.c
+++ b/hw/s390x/s390-ccw.c
@@ -14,6 +14,7 @@
 #include "qemu/osdep.h"
 #include <libgen.h>
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "hw/s390x/css.h"
 #include "hw/s390x/css-bridge.h"

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 2d0a28d54418a05bfe80c1fdfdbfb1ec83ed22f7..2c6e084e2c2636b55980799b583766a0eab0a8de 100644 (file)
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -14,7 +14,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "s390-pci-bus.h"
 #include "s390-pci-inst.h"
@@ -22,6 +21,7 @@
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/msi.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #ifndef DEBUG_S390PCI_BUS
 #define DEBUG_S390PCI_BUS  0

diff --git a/hw/s390x/s390-skeys-kvm.c b/hw/s390x/s390-skeys-kvm.c
index dc54ed8b11e7749d19815fcc2954245811820595..1c4d805ad8f81c7fb733dadbc8aa253c561a36f2 100644 (file)
--- a/hw/s390x/s390-skeys-kvm.c
+++ b/hw/s390x/s390-skeys-kvm.c
@@ -13,6 +13,7 @@
 #include "hw/s390x/storage-keys.h"
 #include "sysemu/kvm.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 static int kvm_s390_skeys_enabled(S390SKeysState *ss)
 {

diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c
index 50c021b9c23d6c3b57c65362c8081dd7f56ab043..a4aab7df512572e6ad7efe0fb5c7dd628091ff3e 100644 (file)
--- a/hw/s390x/sclpcpu.c
+++ b/hw/s390x/sclpcpu.c
@@ -12,9 +12,11 @@
  * option) any later version.  See the COPYING file in the top-level directory.
  *
  */
+
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "hw/s390x/sclp.h"
+#include "qemu/module.h"
 #include "hw/s390x/event-facility.h"
 #include "cpu.h"
 #include "sysemu/cpus.h"

diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
index 1c8f5c9393f33a493149b7dbd219d9ee428153c1..4f73471537c9289ccf69cec1013aab72ce01f0fd 100644 (file)
--- a/hw/s390x/sclpquiesce.c
+++ b/hw/s390x/sclpquiesce.c
@@ -11,10 +11,12 @@
  * option) any later version.  See the COPYING file in the top-level directory.
  *
  */
+
 #include "qemu/osdep.h"
 #include "hw/qdev.h"
 #include "sysemu/sysemu.h"
 #include "hw/s390x/sclp.h"
+#include "qemu/module.h"
 #include "hw/s390x/event-facility.h"
 
 typedef struct SignalQuiesce {

diff --git a/hw/s390x/tod-kvm.c b/hw/s390x/tod-kvm.c
index 2456bf7b24e299c5ec9e99ab9935c1f5a6a8029d..bebe4744af42965e90810757b39844c0fcf7a370 100644 (file)
--- a/hw/s390x/tod-kvm.c
+++ b/hw/s390x/tod-kvm.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "hw/s390x/tod.h"
 #include "kvm_s390x.h"

diff --git a/hw/s390x/tod-qemu.c b/hw/s390x/tod-qemu.c
index 59c015c69d0f3021e0d1b89a6178bb5351126ac3..58b66d2d98989cf0552eb209e7007991e165cded 100644 (file)
--- a/hw/s390x/tod-qemu.c
+++ b/hw/s390x/tod-qemu.c
@@ -13,6 +13,7 @@
 #include "hw/s390x/tod.h"
 #include "qemu/timer.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "tcg_s390x.h"
 

diff --git a/hw/s390x/tod.c b/hw/s390x/tod.c
index 1c63f411e6ed07a0a84968a1eab8c22d8e3c2363..a9fca8eb0b4ff0565f1090d24f844cb34f919bad 100644 (file)
--- a/hw/s390x/tod.c
+++ b/hw/s390x/tod.c
@@ -12,6 +12,7 @@
 #include "hw/s390x/tod.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/kvm.h"
 #include "migration/register.h"
 

diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c
index cddc5cf6524c4f5083d014f8e749b119e75fb74d..076f733390edbeb94b01b09e08d6b20838032560 100644 (file)
--- a/hw/s390x/vhost-vsock-ccw.c
+++ b/hw/s390x/vhost-vsock-ccw.c
@@ -9,6 +9,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static Property vhost_vsock_ccw_properties[] = {

diff --git a/hw/s390x/virtio-ccw-9p.c b/hw/s390x/virtio-ccw-9p.c
index d6be172596582239917b547ffb0be3e068762d4a..67b2c537cce2bc731af9338b430f855e58153af4 100644 (file)
--- a/hw/s390x/virtio-ccw-9p.c
+++ b/hw/s390x/virtio-ccw-9p.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static void virtio_ccw_9p_realize(VirtioCcwDevice *ccw_dev, Error **errp)

diff --git a/hw/s390x/virtio-ccw-balloon.c b/hw/s390x/virtio-ccw-balloon.c
index 28d171ac0ca5420b5e65779c41ed7cfe0ebff8d7..35e43e89fb6db9c9cc5905fe3cc08c2d2ddac8c1 100644 (file)
--- a/hw/s390x/virtio-ccw-balloon.c
+++ b/hw/s390x/virtio-ccw-balloon.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static void virtio_ccw_balloon_realize(VirtioCcwDevice *ccw_dev, Error **errp)

diff --git a/hw/s390x/virtio-ccw-blk.c b/hw/s390x/virtio-ccw-blk.c
index 1f3d09a75a3bb5e39ea34a727fd34bb63abcdf43..83636cb6d7c98a44d548a6a4b0410dec4f1735a7 100644 (file)
--- a/hw/s390x/virtio-ccw-blk.c
+++ b/hw/s390x/virtio-ccw-blk.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static void virtio_ccw_blk_realize(VirtioCcwDevice *ccw_dev, Error **errp)

diff --git a/hw/s390x/virtio-ccw-crypto.c b/hw/s390x/virtio-ccw-crypto.c
index aab6a958f2913e9237514a2dac40d2fe50ebb731..4569fe0649238542f0d8af948e67f8fe340cd955 100644 (file)
--- a/hw/s390x/virtio-ccw-crypto.c
+++ b/hw/s390x/virtio-ccw-crypto.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp)

diff --git a/hw/s390x/virtio-ccw-gpu.c b/hw/s390x/virtio-ccw-gpu.c
index 71869b7fbd2c39b86126e64db0453eab3a916177..10ee4b86eb5124e9646d2f1ed205ac20a0389f0c 100644 (file)
--- a/hw/s390x/virtio-ccw-gpu.c
+++ b/hw/s390x/virtio-ccw-gpu.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static void virtio_ccw_gpu_realize(VirtioCcwDevice *ccw_dev, Error **errp)

diff --git a/hw/s390x/virtio-ccw-input.c b/hw/s390x/virtio-ccw-input.c
index 79c87cb3f2f4de036e6fbe55a78008dc4955bcbe..075bb094eec6be113a9244f0c3011385a64d651d 100644 (file)
--- a/hw/s390x/virtio-ccw-input.c
+++ b/hw/s390x/virtio-ccw-input.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static void virtio_ccw_input_realize(VirtioCcwDevice *ccw_dev, Error **errp)

diff --git a/hw/s390x/virtio-ccw-net.c b/hw/s390x/virtio-ccw-net.c
index 0c0410c643ac9ed6e7f2038ce54a56f36d80b474..8ff184265e01c9aa8c18a20e1d520a4abb5101d9 100644 (file)
--- a/hw/s390x/virtio-ccw-net.c
+++ b/hw/s390x/virtio-ccw-net.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static void virtio_ccw_net_realize(VirtioCcwDevice *ccw_dev, Error **errp)

diff --git a/hw/s390x/virtio-ccw-rng.c b/hw/s390x/virtio-ccw-rng.c
index 3f6abccef85958f1073c0b41a6b12b2d1c9ac719..dc60f084a5d8bafa630ae3551a961ed742f0a818 100644 (file)
--- a/hw/s390x/virtio-ccw-rng.c
+++ b/hw/s390x/virtio-ccw-rng.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp)

diff --git a/hw/s390x/virtio-ccw-scsi.c b/hw/s390x/virtio-ccw-scsi.c
index c9a804fa2522e360c6880370d80a15c1b64b4128..26fa086ef08ef49509b8f4814980f1e93250e3a0 100644 (file)
--- a/hw/s390x/virtio-ccw-scsi.c
+++ b/hw/s390x/virtio-ccw-scsi.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-ccw.h"
 
 static void virtio_ccw_scsi_realize(VirtioCcwDevice *ccw_dev, Error **errp)

diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c
index 3851fc9c9bce81c831f4bbcfec49a368acaf9bd4..8cf5a529a5805d25de92c8d62b6d5fbfee4196f3 100644 (file)
--- a/hw/s390x/virtio-ccw-serial.c
+++ b/hw/s390x/virtio-ccw-serial.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
+#include "qemu/module.h"
 #include "hw/virtio/virtio-serial.h"
 #include "virtio-ccw.h"
 

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index c2b78c8e9b1ef2a7e8db5de7ea6798a0df76f5e6..43d3a1b029cefce3217ca56e6667367766c5784a 100644 (file)
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -21,6 +21,7 @@
 #include "hw/sysbus.h"
 #include "qemu/bitops.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/virtio/virtio-access.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/s390x/adapter.h"

diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c
index 6b0bbb9b7f50d0798f093b6e954c46529aa9e5dc..342f500f823d13946f2fa6b2891f18030e28e4e7 100644 (file)
--- a/hw/scsi/esp-pci.c
+++ b/hw/scsi/esp-pci.c
@@ -30,6 +30,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define TYPE_AM53C974_DEVICE "am53c974"
 

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index ca8b36c0c5f44039bd1b5c27130f8c239d108a6e..7508d035cad1102a30e814496221d825e7ca97c3 100644 (file)
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -28,6 +28,7 @@
 #include "hw/scsi/esp.h"
 #include "trace.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 /*
  * On Sparc32, this is the ESP (NCR53C90) part of chip STP2000 (Master I/O),

diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index a8b7a199f960760b394c78ad39877e1e70766c00..10468c1ec17d82cec50da465b185e2df653dde9b 100644 (file)
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -20,6 +20,7 @@
 #include "hw/scsi/scsi.h"
 #include "sysemu/dma.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 static const char *names[] = {

diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index 5ad762de23319d8ab76aaa5eeb952692b96f0dc4..06f618dbf78d70ebc948ece1c9e4b5e66e1a9dd0 100644 (file)
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -26,6 +26,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"
 #include "trace.h"

diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
index e800683e91e9c24c5afed435a17e96426a2e8df7..3f94d5ab55145e04310a17a35cf6049f2be96636 100644 (file)
--- a/hw/scsi/mptsas.c
+++ b/hw/scsi/mptsas.c
@@ -28,6 +28,7 @@
 #include "sysemu/dma.h"
 #include "hw/pci/msi.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"
 #include "trace.h"

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index c480553083f772586be19fbb6079ad95a940645b..196136a307ea31771542cc5f888b3e9c9a13c950 100644 (file)
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -2,6 +2,7 @@
 #include "hw/hw.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 7b89ac798b532a8822582dd713170c49a5f9eb7d..ed7295bfd7ddb1e9e2eddf41aea995eea9a36f40 100644 (file)
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -23,6 +23,7 @@
 #include "qemu/units.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/scsi/scsi.h"
 #include "hw/scsi/emulation.h"
 #include "scsi/constants.h"

diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index e8a8706a4f3d0d325d62ec205ed3e32859a9fcd7..f07891b3f6548db82bc886d4e0c030de7529d467 100644 (file)
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -15,6 +15,7 @@
 #include "qapi/error.h"
 #include "qemu/ctype.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/scsi/scsi.h"
 #include "hw/scsi/emulation.h"
 #include "sysemu/block-backend.h"

diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index 26dfc0340f8b08ad30e15d4d6c55035b172dfeed..0e491c911d8babe81d2ba1c92fed4c13a2244022 100644 (file)
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -31,8 +31,9 @@
  *  - Add indirect descriptors support
  *  - Maybe do autosense (PAPR seems to mandate it, linux doesn't care)
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/scsi/scsi.h"

diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c
index b7fbab65dd17456c7ca50da4fc094963a7ae60ab..8ec49d7fef2ff3608d37dae78991685a0eaa0e13 100644 (file)
--- a/hw/scsi/vhost-scsi-common.c
+++ b/hw/scsi/vhost-scsi-common.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-scsi-common.h"
 #include "hw/virtio/virtio-scsi.h"

diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 6b01accf61ad869dcc829d7312cc7c4386eeb06a..4090f99ee44aaac472ee860f27d77a1d92f7e094 100644 (file)
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -19,6 +19,7 @@
 #include <sys/ioctl.h>
 #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"

diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 12d21bbc613cd075439bec38cb4e53d1e88cb75f..61ce365fe96379f97cf42484e73a9998b2187030 100644 (file)
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -19,6 +19,7 @@
 #include "hw/virtio/virtio-scsi.h"
 #include "qemu/error-report.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "sysemu/block-backend.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"

diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index c39e33fa35994d3b0c34dbc9131e943a4c3b7f27..14641df1c822e6dbab7ada26b543e349af306cc4 100644 (file)
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -27,6 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/scsi/scsi.h"
 #include "scsi/constants.h"
 #include "hw/pci/msi.h"

diff --git a/hw/sd/bcm2835_sdhost.c b/hw/sd/bcm2835_sdhost.c
index 1b760b2a7c1fc94ee09aa2783190befe3aef6fdc..2778fb0de4a5bc3c67f59058f3389f92199a3baf 100644 (file)
--- a/hw/sd/bcm2835_sdhost.c
+++ b/hw/sd/bcm2835_sdhost.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "sysemu/blockdev.h"
 #include "hw/sd/bcm2835_sdhost.h"
 #include "trace.h"

diff --git a/hw/sd/core.c b/hw/sd/core.c
index 107e6d71ddbb5c375bdcf1b6f000dabf7d86327c..abec48bccb80a92cf3c8e6dee3975a8558af284f 100644 (file)
--- a/hw/sd/core.c
+++ b/hw/sd/core.c
@@ -22,6 +22,7 @@
 #include "qemu/osdep.h"
 #include "hw/qdev-core.h"
 #include "hw/sd/sd.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 static inline const char *sdbus_name(SDBus *sdbus)

diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index dd1ba649d9c0897f9a6fc577ece8f83dee0e237e..b8d2347d468fd23ba6a4bd4bd9a0f40212d49961 100644 (file)
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -23,6 +23,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
index 3ad7e925c58b8484fccc741eed537039dab3f8c5..81b406dbf0987a2f27c6927c964f15662122574d 100644 (file)
--- a/hw/sd/pl181.c
+++ b/hw/sd/pl181.c
@@ -12,6 +12,7 @@
 #include "hw/sysbus.h"
 #include "hw/sd/sd.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 //#define DEBUG_PL181 1

diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index 82f8ec0d501c9c2e0fa6292b510107cb6e5eaab7..81ff5cea86d1aa23a317ee80e299c14cb6641910 100644 (file)
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -20,6 +20,7 @@
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define TYPE_PXA2XX_MMCI "pxa2xx-mmci"

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index aaab15f3868a5d7582cc2604d66e7db0b4274f93..60500ec8fe0e76554d7ef64fcbf2c808813f3722 100644 (file)
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -43,6 +43,7 @@
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "sdmmc-internal.h"
 #include "trace.h"
 

diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c
index f884661862a3d32b2c891380e500811afa84abe0..9370181993f116f1b76162bd49df7be64b109ba0 100644 (file)
--- a/hw/sd/sdhci-pci.c
+++ b/hw/sd/sdhci-pci.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "hw/hw.h"
 #include "hw/sd/sdhci.h"
 #include "sdhci-internal.h"

diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 17ad5465a76bff7537337bba104771769f47f3d4..7b80b1d93f51583a8cd314f0ab7573ea3422a868 100644 (file)
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -33,6 +33,7 @@
 #include "hw/sd/sdhci.h"
 #include "sdhci-internal.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define TYPE_SDHCI_BUS "sdhci-bus"

diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index 25e1009277edf3c0d4ab419a131c4517ebd1e298..9bd6511ec86ceb47330dd360a7893a73e16a3e0d 100644 (file)
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -15,6 +15,7 @@
 #include "hw/ssi/ssi.h"
 #include "hw/sd/sd.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 //#define DEBUG_SSI_SD 1
 

diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c
index 379d0685ed71b1e7db4ccd4f9b4e7fb3209409a3..b15f264e99d8b0c675e37fb96a08803a3cd7c8dd 100644 (file)
--- a/hw/sh4/sh_pci.c
+++ b/hw/sh4/sh_pci.c
@@ -21,12 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/sh4/sh.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_host.h"
 #include "qemu/bswap.h"
+#include "qemu/module.h"
 #include "exec/address-spaces.h"
 
 #define TYPE_SH_PCI_HOST_BRIDGE "sh_pci"

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 47be9071fa4fbf20d34b2482e80a8ffa21b78994..a36448fc8de2dbd7d7502d0bb0de541d6a0d94a3 100644 (file)
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -20,6 +20,7 @@
 #include "qapi/error.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "sysemu/sysemu.h"
 #include "qemu/uuid.h"

diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c
index 7ca1e3fce41ff4e31f13d4955de3e2735867099e..45a61ecf87b5772a337a31083ba729e6f70918be 100644 (file)
--- a/hw/sparc/sun4m_iommu.c
+++ b/hw/sparc/sun4m_iommu.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/sparc/sun4m_iommu.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "exec/address-spaces.h"
 #include "trace.h"
 

diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c
index 1ef7645ba5f2edaba6b1ae21cec74784d7223ec9..9178277f82460441a66a16857c5f08f840541784 100644 (file)
--- a/hw/sparc64/sun4u_iommu.c
+++ b/hw/sparc64/sun4u_iommu.c
@@ -29,6 +29,7 @@
 #include "hw/sparc/sun4u_iommu.h"
 #include "exec/address-spaces.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 

diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index f1e66870d71feaa088e8f67fda5e2b9b20f5c924..9eda0d720be6276da2f3d7579d800cf4b297d29c 100644 (file)
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 
 #include "hw/ssi/aspeed_smc.h"

diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c
index 02c38c9e479cb575903181d8f7a1fbcc271e369f..5cec9b5d05d7c78d6ed853a5deb8f5a9cfb1c97b 100644 (file)
--- a/hw/ssi/imx_spi.c
+++ b/hw/ssi/imx_spi.c
@@ -12,6 +12,7 @@
 #include "hw/ssi/imx_spi.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef DEBUG_IMX_SPI
 #define DEBUG_IMX_SPI 0

diff --git a/hw/ssi/mss-spi.c b/hw/ssi/mss-spi.c
index 185e1a3920375cee9c9f5e06cf6778ba5b1ea306..918b1f3e8216923343edd71e14fbfba23a7d2003 100644 (file)
--- a/hw/ssi/mss-spi.c
+++ b/hw/ssi/mss-spi.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/ssi/mss-spi.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef MSS_SPI_ERR_DEBUG
 #define MSS_SPI_ERR_DEBUG   0

diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c
index e58247554ccd1cace561e4d1ef5e84bb75660489..fec73cae2650286daa0d4da8884f80b9894af267 100644 (file)
--- a/hw/ssi/pl022.c
+++ b/hw/ssi/pl022.c
@@ -12,6 +12,7 @@
 #include "hw/ssi/pl022.h"
 #include "hw/ssi/ssi.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 //#define DEBUG_PL022 1
 

diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c
index 7eaaf565fd67e2bf2b0dffef981bcfe0e3082877..cda7c96a64d1bbe9562d1f2791bf2f585ebe140e 100644 (file)
--- a/hw/ssi/ssi.c
+++ b/hw/ssi/ssi.c
@@ -14,6 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/ssi/ssi.h"
+#include "qemu/module.h"
 
 struct SSIBus {
     BusState parent_obj;

diff --git a/hw/ssi/stm32f2xx_spi.c b/hw/ssi/stm32f2xx_spi.c
index 930c616de3e65aab8921f468e02b37ef9dc520af..4249101386707a79999f548f471ceaf8f597f302 100644 (file)
--- a/hw/ssi/stm32f2xx_spi.c
+++ b/hw/ssi/stm32f2xx_spi.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/ssi/stm32f2xx_spi.h"
 
 #ifndef STM_SPI_ERR_DEBUG

diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c
index 3dae303d5b5a4092e2221a50cb5a6973cc913fd2..1379cb164bd393761a0daea8ea29c06ba45eab28 100644 (file)
--- a/hw/ssi/xilinx_spi.c
+++ b/hw/ssi/xilinx_spi.c
@@ -28,6 +28,7 @@
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/fifo8.h"
 
 #include "hw/ssi/ssi.h"

diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c
index c615058cc1b5e4fe53e2a082931064aced8a455e..8115bb6d468106a52e1a9ca715466941d82400c2 100644 (file)
--- a/hw/ssi/xilinx_spips.c
+++ b/hw/ssi/xilinx_spips.c
@@ -27,6 +27,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/ptimer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/bitops.h"
 #include "hw/ssi/xilinx_spips.h"
 #include "qapi/error.h"

diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index 96d534d8a81c47319e30d8badecf8db87b6618c6..09e2a7b7bf2415cb3edede34db11b1bdca5ecb3d 100644 (file)
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -26,6 +26,7 @@
 #include "qemu/timer.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qom/cpu.h"
 
 #ifndef A9_GTIMER_ERR_DEBUG

diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c
index 22ceabe1d48295371e987b770c3b4104322f7985..763e1090ecbb98de4baae71db8a2c5e02b5a2b84 100644 (file)
--- a/hw/timer/allwinner-a10-pit.c
+++ b/hw/timer/allwinner-a10-pit.c
@@ -20,6 +20,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/timer/allwinner-a10-pit.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 static void a10_pit_update_irq(AwA10PITState *s)
 {

diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c
index c9a0fc5dcaa43be45c0ebc7975faf0ab80901c39..5c1d9e4074181fc670994ab2277c7b978b75bdf4 100644 (file)
--- a/hw/timer/altera_timer.c
+++ b/hw/timer/altera_timer.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 
 #include "hw/sysbus.h"

diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index daf6c487977467f0b300d13383a3c100829283e4..93044aacfdf2162ebeb983860235deed792217e4 100644 (file)
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -24,6 +24,7 @@
 #include "hw/timer/arm_mptimer.h"
 #include "qapi/error.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qom/cpu.h"
 
 #define PTIMER_POLICY                       \

diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index 98fddd7ac10e035d2c99068b6b3e3facdfe65ab2..f0a753404d4bab100cce31ea6f014d917c9381d2 100644 (file)
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -10,10 +10,10 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
-#include "qemu-common.h"
 #include "hw/qdev.h"
 #include "hw/ptimer.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/log.h"
 
 /* Common timer implementation.  */

diff --git a/hw/timer/armv7m_systick.c b/hw/timer/armv7m_systick.c
index df8d2804b35d0557ba848196d882ee824f6239c1..a17317ce2fe2c21647475961906641f227f14adc 100644 (file)
--- a/hw/timer/armv7m_systick.c
+++ b/hw/timer/armv7m_systick.c
@@ -11,10 +11,10 @@
 
 #include "qemu/osdep.h"
 #include "hw/timer/armv7m_systick.h"
-#include "qemu-common.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 /* qemu timers run at 1GHz.   We want something closer to 1MHz.  */

diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c
index 5c786e512815645e2c47433027177e9bfc531102..2c3a4d0fe770b222b009c0746de7458ef0b8a6d3 100644 (file)
--- a/hw/timer/aspeed_timer.c
+++ b/hw/timer/aspeed_timer.c
@@ -13,10 +13,10 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/timer/aspeed_timer.h"
-#include "qemu-common.h"
 #include "qemu/bitops.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define TIMER_NR_REGS 4

diff --git a/hw/timer/cadence_ttc.c b/hw/timer/cadence_ttc.c
index 10056407ab8d75cf55dc78b02d60a8ac9c2d0d9f..115d935f84b6fce255451cb76ab32af3804ae510 100644 (file)
--- a/hw/timer/cadence_ttc.c
+++ b/hw/timer/cadence_ttc.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 
 #ifdef CADENCE_TTC_ERR_DEBUG

diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c
index 30245990f34fbb05ee254c49650f82d7b99d8dc2..383f6e12b1ee78405a78aae173d3f213f5e364c1 100644 (file)
--- a/hw/timer/cmsdk-apb-dualtimer.c
+++ b/hw/timer/cmsdk-apb-dualtimer.c
@@ -21,6 +21,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"
 #include "hw/timer/cmsdk-apb-dualtimer.h"

diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c
index 801d1dba7410849dd675b4eaa52664d295c6f84d..2e7318b81f9586bf4088e2a1ed19292fe601529f 100644 (file)
--- a/hw/timer/cmsdk-apb-timer.c
+++ b/hw/timer/cmsdk-apb-timer.c
@@ -30,6 +30,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "trace.h"
 #include "hw/sysbus.h"

diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c
index 4d73077207b4e145eb50ac62bead3bf53f8e36d1..c818ed1d98033cc3fe331245765aa7c4ac8d314f 100644 (file)
--- a/hw/timer/digic-timer.c
+++ b/hw/timer/digic-timer.c
@@ -30,6 +30,7 @@
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/log.h"
 
 #include "hw/timer/digic-timer.h"

diff --git a/hw/timer/ds1338.c b/hw/timer/ds1338.c
index 03da75486b44ace455398abefbf39bcf328c234e..30d2d21408a16842c247938dd96fa79fcde113b7 100644 (file)
--- a/hw/timer/ds1338.c
+++ b/hw/timer/ds1338.c
@@ -14,6 +14,7 @@
 #include "qemu-common.h"
 #include "hw/i2c/i2c.h"
 #include "qemu/bcd.h"
+#include "qemu/module.h"
 
 /* Size of NVRAM including both the user-accessible area and the
  * secondary register area.

diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c
index 2280914b1d732c334b4eeaa2bccef4daf71fee41..53834e197faaa24c2e06b4570f64c8c0a427f0f0 100644 (file)
--- a/hw/timer/etraxfs_timer.c
+++ b/hw/timer/etraxfs_timer.c
@@ -21,9 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 

diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index e4ef4cfd3625f0a26b8605b2816a25e00efae779..874c7b8522abed3d637a7a0841ce758c6404adc5 100644 (file)
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -57,7 +57,7 @@
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "qemu/main-loop.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "hw/ptimer.h"
 
 #include "hw/arm/exynos4210.h"

diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
index 87f63f057e14dd4c5dcbe17c1995dcbbe68bd1cf..9bc03277852dc452a02d95c02f35194a3d3a5dd2 100644 (file)
--- a/hw/timer/exynos4210_pwm.c
+++ b/hw/timer/exynos4210_pwm.c
@@ -24,8 +24,8 @@
 #include "qemu/log.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
-#include "qemu-common.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "hw/ptimer.h"
 
 #include "hw/arm/exynos4210.h"

diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c
index 4607833e3e6f4f3a79d06f99018c71f57cc20048..0d65f6f3e3a5f0e95fc1d15c3af40ac8f95eefc5 100644 (file)
--- a/hw/timer/exynos4210_rtc.c
+++ b/hw/timer/exynos4210_rtc.c
@@ -27,9 +27,9 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
-#include "qemu-common.h"
 #include "qemu/bcd.h"
 #include "hw/ptimer.h"
 

diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index 4b7088fc84b6832f4f2a5254f97e0e2343e593ed..e45a49075be6b6afecc6f049db33b0e9bde3b580 100644 (file)
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -28,6 +28,7 @@
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 
 #include "trace.h"
 

diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index 20f834e7da712b24ac81f361cdc4e3c4d7b71ae7..0972c4724e04ba2bd5ef4783c4b075e71c21051d 100644 (file)
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -21,8 +21,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/timer/i8254.h"
 #include "hw/timer/i8254_internal.h"

diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
index 6190b6fc5d75c63d6993955973f0670d07c8c452..76ca6ec4446998f62d384a90981434d37c57d61f 100644 (file)
--- a/hw/timer/i8254_common.c
+++ b/hw/timer/i8254_common.c
@@ -22,9 +22,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/isa/isa.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/timer/i8254.h"
 #include "hw/timer/i8254_internal.h"

diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
index 8677b753b1f7c75bda86c31992ade2e929166207..7a883160f455236de20a776a5e2ee1aecc05683a 100644 (file)
--- a/hw/timer/imx_epit.c
+++ b/hw/timer/imx_epit.c
@@ -16,6 +16,7 @@
 #include "hw/timer/imx_epit.h"
 #include "hw/misc/imx_ccm.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/log.h"
 
 #ifndef DEBUG_IMX_EPIT

diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c
index 65e4ee6bcf950aadebeb78d1b69be9c7e2d0c91d..3086c037749fec2d39a718bd2245492de29d50dc 100644 (file)
--- a/hw/timer/imx_gpt.c
+++ b/hw/timer/imx_gpt.c
@@ -15,6 +15,7 @@
 #include "qemu/osdep.h"
 #include "hw/timer/imx_gpt.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/log.h"
 
 #ifndef DEBUG_IMX_GPT

diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c
index 2a07b59524e38a0c0d78e654a0d7b51b3e7247f5..6ce876c6ae8e5eb6bf6c5f84b1fa9be0c9927162 100644 (file)
--- a/hw/timer/lm32_timer.c
+++ b/hw/timer/lm32_timer.c
@@ -29,6 +29,7 @@
 #include "hw/ptimer.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 
 #define DEFAULT_FREQUENCY (50*1000000)
 

diff --git a/hw/timer/m41t80.c b/hw/timer/m41t80.c
index c45b9297d8b6cd9c27983392503c7037c9d9ed9e..5b9192c28d776e14db5b5218b0f5ce4dcd98451e 100644 (file)
--- a/hw/timer/m41t80.c
+++ b/hw/timer/m41t80.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qemu/bcd.h"
 #include "hw/i2c/i2c.h"

diff --git a/hw/timer/m48t59-isa.c b/hw/timer/m48t59-isa.c
index ea1ba703d7973b2a549e1218f3d847f8e5bf8c0c..cbc5e61dddce6ea20c4c2b30fd4c76afb89219a8 100644 (file)
--- a/hw/timer/m48t59-isa.c
+++ b/hw/timer/m48t59-isa.c
@@ -22,10 +22,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
 #include "hw/timer/m48t59.h"
 #include "m48t59-internal.h"
+#include "qemu/module.h"
 
 #define TYPE_M48TXX_ISA "isa-m48txx"
 #define M48TXX_ISA_GET_CLASS(obj) \

diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index ca3ed445de7824136f9b4e777d4ee045d6a10395..5d26e9aef09e1a2e43367d15ac855c8bbdbefa6b 100644 (file)
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/timer/m48t59.h"
@@ -30,6 +31,7 @@
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "qemu/bcd.h"
+#include "qemu/module.h"
 
 #include "m48t59-internal.h"
 

diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 513f105e62f72769ea82870d6201ecc67706ac82..b61b4ddeaf86fb3531d01705841dc75bb15819bd 100644 (file)
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include "qemu/bcd.h"
 #include "hw/hw.h"
 #include "qemu/timer.h"

diff --git a/hw/timer/milkymist-sysctl.c b/hw/timer/milkymist-sysctl.c
index 93bc6e17909036b01282ad8cc435917bf73f45b9..a9d250877c86ac9b808382899af1feb47d085f78 100644 (file)
--- a/hw/timer/milkymist-sysctl.c
+++ b/hw/timer/milkymist-sysctl.c
@@ -29,6 +29,7 @@
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 enum {
     CTRL_ENABLE      = (1<<0),

diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c
index 4f814572e2a05057fd6429b8d73252fe0c0c24de..6add47af99231568163b2b5580b4c6910d998838 100644 (file)
--- a/hw/timer/mss-timer.c
+++ b/hw/timer/mss-timer.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/log.h"
 #include "hw/timer/mss-timer.h"
 

diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c
index 0c90662896e0c75b776fc51fcdf6cb308f5e667c..29fb81a7444b36cc063890d06e090b44192db709 100644 (file)
--- a/hw/timer/nrf51_timer.c
+++ b/hw/timer/nrf51_timer.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/arm/nrf51.h"
 #include "hw/timer/nrf51_timer.h"
 #include "trace.h"

diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c
index 274ad47a33a887b84f46000e7cfd71cdfa227f2e..abac73ab4220e622fa9c9747fec65c7fbdd590df 100644 (file)
--- a/hw/timer/pl031.c
+++ b/hw/timer/pl031.c
@@ -18,6 +18,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "trace.h"
 
 #define RTC_DR      0x00    /* Data read register */

diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c
index 3be58c7fdd7835cb38156fdfba62983f65780f13..4a8ae37ffd55da39fd886926e401dd5759ff0501 100644 (file)
--- a/hw/timer/puv3_ost.c
+++ b/hw/timer/puv3_ost.c
@@ -8,10 +8,12 @@
  * published by the Free Software Foundation, or any later version.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/ptimer.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 
 #undef DEBUG_PUV3
 #include "hw/unicore32/puv3.h"

diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index a489bf5159be3baf13dcdb158098293d478b1500..8c1ef43cd519586ee3e09f00f14c2e5324a99c61 100644 (file)
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -14,6 +14,7 @@
 #include "hw/arm/pxa.h"
 #include "hw/sysbus.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #define OSMR0  0x00
 #define OSMR1  0x04

diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
index 4694b653a74ab84c2f26a8f35ee3b2de01011904..005fd599e8451d450e47bf41ad6d2daa06f73d13 100644 (file)
--- a/hw/timer/slavio_timer.c
+++ b/hw/timer/slavio_timer.c
@@ -28,6 +28,7 @@
 #include "hw/sysbus.h"
 #include "trace.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 
 /*
  * Registers of hardware timer in sun4m.

diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c
index ae744d16425283391ffe29191bb04bef01380eb4..4c49dc49959461b5638b67a8e1524c619e017a34 100644 (file)
--- a/hw/timer/stm32f2xx_timer.c
+++ b/hw/timer/stm32f2xx_timer.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/timer/stm32f2xx_timer.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 #ifndef STM_TIMER_ERR_DEBUG
 #define STM_TIMER_ERR_DEBUG 0

diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c
index b93cbd6a81f895ea43fc2c2b3b15ff90f2f51c53..ba62adc82625e36340bc1415f6cd6cdec29ef59a 100644 (file)
--- a/hw/timer/sun4v-rtc.c
+++ b/hw/timer/sun4v-rtc.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/timer/sun4v-rtc.h"
 #include "trace.h"

diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
index c83d803dd85462160b5f44bd2fcf8008a17e9eea..7785b96c0bdbe8f8d6bd45032b13b96e5c38341e 100644 (file)
--- a/hw/timer/twl92230.c
+++ b/hw/timer/twl92230.c
@@ -26,6 +26,7 @@
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
 #include "qemu/bcd.h"
+#include "qemu/module.h"
 
 #define VERBOSE 1
 

diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index 59439c05be52afb343f6b02edc34a51d023db375..16bcd0393bace3c8c3fac216500eba12373be7d5 100644 (file)
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -27,6 +27,7 @@
 #include "hw/ptimer.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 
 #define D(x)
 

diff --git a/hw/timer/xlnx-zynqmp-rtc.c b/hw/timer/xlnx-zynqmp-rtc.c
index c98dc3d94e43da16786620956b4f03f16ade41f5..be078ae72a9b4053d020a955d603d49e6033a79e 100644 (file)
--- a/hw/timer/xlnx-zynqmp-rtc.c
+++ b/hw/timer/xlnx-zynqmp-rtc.c
@@ -29,6 +29,7 @@
 #include "hw/register.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "hw/ptimer.h"
 #include "qemu/cutils.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
index 3087acc4ab7ea6a788483f2518c3f73fd55de003..5e2db9e0c42dcc457afc75808b7e7d3d330ab6b1 100644 (file)
--- a/hw/tpm/tpm_crb.c
+++ b/hw/tpm/tpm_crb.c
@@ -16,7 +16,7 @@
 
 #include "qemu/osdep.h"
 
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
index 70f4b10284f051624ded9eeb570677b85c550fa3..1288cbcb8da0702de9cd283f1af17d84b5fc6b78 100644 (file)
--- a/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@ -28,6 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "io/channel-socket.h"
 #include "sysemu/tpm_backend.h"

diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 479317ee508b2d5a67e92de1fd03c7860490232b..e87bd126c6a7f3b6b946f2328970ae137cfe170d 100644 (file)
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -23,8 +23,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "sysemu/tpm_backend.h"
 #include "tpm_int.h"

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index fd183e8deb08a6769443a977766a163d03a4373d..174618ac30461f28b037c5b4bbb7c754b47f837f 100644 (file)
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/isa/isa.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #include "hw/acpi/tpm.h"
 #include "hw/pci/pci_ids.h"

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 9a74dc956010d07ab2b988d152a43eca5628f654..a28e9e3b33594b3654987859ed4b4fdf6f629baf 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -4,6 +4,7 @@
 #include "hw/qdev.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "trace.h"

diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 963373ba95ed9a469196132803dcba1b10b22484..e20f8ed293336362881b9432a296457991466f79 100644 (file)
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -31,6 +31,7 @@
 
 #include "qemu/thread.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "ccid.h"
 #include "qapi/error.h"
 

diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 0a6c6572280dd5a640ec63a4ac6c65edf0abda0c..081bcfd70aed707cb28ed4e728a93e6b9b785516 100644 (file)
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -13,6 +13,7 @@
 #include <libcacard.h>
 #include "chardev/char-fe.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "ccid.h"
 #include "qapi/error.h"

diff --git a/hw/usb/chipidea.c b/hw/usb/chipidea.c
index 60d67f88b8561ce1844998285d6653db0e7e667b..3dcd22ccba8757344b9768ec8277e6a73717634d 100644 (file)
--- a/hw/usb/chipidea.c
+++ b/hw/usb/chipidea.c
@@ -13,6 +13,7 @@
 #include "hw/usb/hcd-ehci.h"
 #include "hw/usb/chipidea.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 enum {
     CHIPIDEA_USBx_DCIVERSION   = 0x000,

diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index c46d5eeb79a397d9156d170c4c9a8d16abf87422..718ab53cbb89478963955ad91ceb3ad104146459 100644 (file)
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -30,7 +30,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "hw/usb.h"
 #include "desc.h"
 #include "hw/hw.h"

diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index c539a1afc6d0734b7a20fb0a48e31bb786fc8646..670ba322900ae5f3aac60ac1f6d3be7405a11709 100644 (file)
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -19,8 +19,8 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/usb.h"
 #include "desc.h"
 #include "sysemu/bt.h"

diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index f9ea3033a1b4b2dd67ff73cef1ac6012887570f0..62793eaf260e403c4a4206de9d747b9616c7b810 100644 (file)
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -22,12 +22,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/usb.h"
 #include "desc.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/input/hid.h"
 

diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 2b64d6ef0349fa92ae370a1a280b18300290bb74..89f55dd25c9503fa294d4270513c967435134d97 100644 (file)
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -21,14 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/timer.h"
 #include "trace.h"
 #include "hw/usb.h"
 #include "desc.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #define MAX_PORTS 8
 

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index f31fc76c01caa1258d7d89cfebfbc8d4105a5309..bac085fff414ca594679ec450682175f5be62fc6 100644 (file)
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -18,8 +18,8 @@
 #include <sys/statvfs.h>
 
 
-#include "qemu-common.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/filemonitor.h"
 #include "trace.h"
 #include "hw/usb.h"

diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index ffab3fabeee2a317872954ce37f3c58209907b75..889069dd5a2e8c6a6494bceeef4547a51481cf10 100644 (file)
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -25,7 +25,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "hw/usb.h"
 #include "desc.h"
 #include "net/net.h"
@@ -34,6 +33,7 @@
 #include "qemu/config-file.h"
 #include "sysemu/sysemu.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/cutils.h"
 
 /*#define TRAFFIC_DEBUG*/

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 03c3bcd24071ad9959e0d8f28427476817e1b30f..b82f8541030898fae143340bcd3dd0f8311cd783 100644 (file)
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -10,9 +10,9 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/usb.h"
 #include "desc.h"
 #include "chardev/char-serial.h"

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 6b0137bb7699ec0796e27f86d30145c42a5c3fe8..8d7e516fe7344f1d960c6a5384885ef6668c9b94 100644 (file)
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -39,6 +39,7 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/usb.h"
 #include "desc.h"
 

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 0e4e93ef16734ed61b1bc150203ae67010a7f7bf..9ffb88ea5b8e28fdd6e4a785209907841b2b0f39 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -9,8 +9,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "hw/usb.h"

diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index be566cad0260653ad9f22283e45a56e8091b60d2..abd8070d0c71fac1d05fc79ec885f89d69d76555 100644 (file)
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -10,11 +10,11 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "trace.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 #include "hw/usb.h"
 #include "desc.h"

diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
index ac0bc83b5299ff6df091f9a74e37f991740db095..8c43db93359ea9daf017d4f52f32d82c9550bd05 100644 (file)
--- a/hw/usb/dev-wacom.c
+++ b/hw/usb/dev-wacom.c
@@ -25,10 +25,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/usb.h"
+#include "qemu/module.h"
 #include "desc.h"
 
 /* Interface requests */

diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c
index 38b24b160add21a9913426f0735995f4033c0c4d..03d3a390671db04cb438ed3f5f2b851c58a6b273 100644 (file)
--- a/hw/usb/hcd-ehci-pci.c
+++ b/hw/usb/hcd-ehci-pci.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/usb/hcd-ehci.h"
+#include "qemu/module.h"
 #include "qemu/range.h"
 
 typedef struct EHCIPCIInfo {

diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c
index 9f7f128f19461b13880c0dfe9dcc5869bf2f356f..cd1f3c70a4856a2f42cd5f6774db5e9ec1df1585 100644 (file)
--- a/hw/usb/hcd-ehci-sysbus.c
+++ b/hw/usb/hcd-ehci-sysbus.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/usb/hcd-ehci.h"
+#include "qemu/module.h"
 
 static const VMStateDescription vmstate_ehci_sysbus = {
     .name        = "ehci-sysbus",

diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index aaba09058896542613ce07b37d3c2b5ff24ee446..4f6fdbc0a7dfc0ab1a219a9c26d120caef5ddb9a 100644 (file)
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -28,6 +28,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"
 #include "hw/sysbus.h"

diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index 09df29ff9c168b58fc44a582fcb5ba1d8ae4a351..98bd5cf49d5657da866168bf14ed59f19061a337 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -25,6 +25,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/usb.h"
@@ -36,6 +37,7 @@
 #include "sysemu/dma.h"
 #include "trace.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 
 #define FRAME_TIMER_FREQ 1000
 

diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c
index 75715a048a2ce92cff917c30ce682998e08495d7..e099382b24a5ea9f41c15ff2e85a181f442497b4 100644 (file)
--- a/hw/usb/hcd-xhci-nec.c
+++ b/hw/usb/hcd-xhci-nec.c
@@ -22,6 +22,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/usb.h"
+#include "qemu/module.h"
 #include "hw/pci/pci.h"
 
 #include "hcd-xhci.h"

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 2e9a839f2bf94fbfb50e58f36193a4389a0bcfa8..5894a186633414970fe748dbd9f4a72870599a15 100644 (file)
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -18,9 +18,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/timer.h"
+#include "qemu/module.h"
 #include "qemu/queue.h"
 #include "hw/usb.h"
 #include "hw/pci/pci.h"

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 4f765d7f9a2f5eae47212844d25874acaad9c787..83ebc5162026c740e269b96c5cfb2c1a0b26cf98 100644 (file)
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -40,9 +40,9 @@
 #include <libusb.h>
 
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
 

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 7cb6b120d4f00d2e6e1db9cde02bf669d83c6f98..084b8f216180947314ad1042c1d91324160feaa0 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -28,12 +28,12 @@
 #include "qemu/osdep.h"
 #include "qemu/units.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "chardev/char-fe.h"
 
 #include <usbredirparser.h>

diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c
index f76b59afe8638b24b9a060164e521c786e0d932c..a61b0f6354932d072f350bdaac67dc2bf38c11a2 100644 (file)
--- a/hw/usb/tusb6010.c
+++ b/hw/usb/tusb6010.c
@@ -18,8 +18,9 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"
 #include "hw/arm/omap.h"

diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c
index 1b06c0f3ea9ddfc9010864c693a190ef3b906b6b..eedd48cfc1d859957e81853b95f0a9f8c9e501cb 100644 (file)
--- a/hw/vfio/amd-xgbe.c
+++ b/hw/vfio/amd-xgbe.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/vfio/vfio-amd-xgbe.h"
+#include "qemu/module.h"
 
 static void amd_xgbe_realize(DeviceState *dev, Error **errp)
 {

diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index 564751650fc15e94e80cb0a8a71c334131150b32..a995b86cd488d620faa4c4192050a74aabf9eae2 100644 (file)
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -19,6 +19,7 @@
 #include "hw/vfio/vfio-common.h"
 #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"

diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c
index 6cc608b6cabd43a54ee5d35299d5a4c7444f4ba1..59233e8d7e09eb5eeae29cd3dff63f2569882760 100644 (file)
--- a/hw/vfio/calxeda-xgmac.c
+++ b/hw/vfio/calxeda-xgmac.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/vfio/vfio-calxeda-xgmac.h"
+#include "qemu/module.h"
 
 static void calxeda_xgmac_realize(DeviceState *dev, Error **errp)
 {

diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index d9e39552e23782e59811d989feca68ca21a125ab..03a2becb3ec98095b8068627b017ac4abc6eb6a3 100644 (file)
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -25,6 +25,7 @@
 #include "hw/s390x/ccw-device.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 
 struct VFIOCCWDevice {
     S390CCWDevice cdev;

diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index 29b2697fe12cecfdb5b60fc5e788e7afb589ae93..b35a640030ca7dbb09784dc1ec4daef742b026c7 100644 (file)
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -14,6 +14,7 @@
 #include "qemu/units.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/range.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 2a4091d216e208ee5b8c9dba01c72ead97405d7b..4a04f795162bca682cb9b9d9a8eba9846bddbe1b 100644 (file)
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -26,6 +26,7 @@
 #include "hw/pci/msix.h"
 #include "hw/pci/pci_bridge.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/range.h"
 #include "qemu/units.h"

diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index d52d6552e089a9706b6ee0aaf12e5f3f715f9e01..ad29725955740bd91fd0e608c70bfdee02f50945 100644 (file)
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -21,6 +21,7 @@
 
 #include "hw/vfio/vfio-platform.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/range.h"
 #include "sysemu/sysemu.h"
 #include "exec/memory.h"

diff --git a/hw/virtio/vhost-scsi-pci.c b/hw/virtio/vhost-scsi-pci.c
index 523f7cb3ce060ec0671c6813793f31ba21aa4a5a..95a1f324397bd2500cb4c0320132a1dfa634c446 100644 (file)
--- a/hw/virtio/vhost-scsi-pci.c
+++ b/hw/virtio/vhost-scsi-pci.c
@@ -19,6 +19,7 @@
 #include "standard-headers/linux/virtio_pci.h"
 #include "hw/virtio/vhost-scsi.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "virtio-pci.h"
 
 typedef struct VHostSCSIPCI VHostSCSIPCI;

diff --git a/hw/virtio/vhost-user-blk-pci.c b/hw/virtio/vhost-user-blk-pci.c
index ca66c217a727dba2813bb169b4f02bdd9030bc8d..ed81614d43bacebbaf33ca0e240aab1a928db601 100644 (file)
--- a/hw/virtio/vhost-user-blk-pci.c
+++ b/hw/virtio/vhost-user-blk-pci.c
@@ -24,6 +24,7 @@
 #include "hw/pci/pci.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "virtio-pci.h"
 
 typedef struct VHostUserBlkPCI VHostUserBlkPCI;

diff --git a/hw/virtio/vhost-user-scsi-pci.c b/hw/virtio/vhost-user-scsi-pci.c
index 46f7193cc7a350f9b250e0e9d0646ea13a26c9f9..daeea77ce13a9cd9980ae51af40d2c9d72d90639 100644 (file)
--- a/hw/virtio/vhost-user-scsi-pci.c
+++ b/hw/virtio/vhost-user-scsi-pci.c
@@ -24,6 +24,7 @@
 #include "hw/pci/pci.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/loader.h"

diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c
index 6f43ca35fbaac8f0c5747dd2cabd397d0821b69d..c06c9a83b9637697f216b9136ccb6b897ea54912 100644 (file)
--- a/hw/virtio/vhost-vsock-pci.c
+++ b/hw/virtio/vhost-vsock-pci.c
@@ -15,6 +15,7 @@
 
 #include "virtio-pci.h"
 #include "hw/virtio/vhost-vsock.h"
+#include "qemu/module.h"
 
 typedef struct VHostVSockPCI VHostVSockPCI;
 

diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c
index aa5af927e1d1f949aab979b26f6f7a1db6b0ad35..0371493197fd529a086b9ceaf2e182c95dd463df 100644 (file)
--- a/hw/virtio/vhost-vsock.c
+++ b/hw/virtio/vhost-vsock.c
@@ -20,6 +20,7 @@
 #include "qemu/error-report.h"
 #include "hw/virtio/vhost-vsock.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "monitor/monitor.h"
 
 enum {

diff --git a/hw/virtio/virtio-9p-pci.c b/hw/virtio/virtio-9p-pci.c
index 7bf11309662f3be5d112c6be4ffae19d8c1a53ca..29c3712febea4223fb54e41fec60595a79406778 100644 (file)
--- a/hw/virtio/virtio-9p-pci.c
+++ b/hw/virtio/virtio-9p-pci.c
@@ -17,6 +17,7 @@
 
 #include "virtio-pci.h"
 #include "hw/9pfs/virtio-9p.h"
+#include "qemu/module.h"
 
 /*
  * virtio-9p-pci: This extends VirtioPCIProxy.

diff --git a/hw/virtio/virtio-balloon-pci.c b/hw/virtio/virtio-balloon-pci.c
index 2a213bbb386f8011f1eb7099e7ef834635fe6fae..7393435a984f4de0e0b853cd2497065e8e2c8d32 100644 (file)
--- a/hw/virtio/virtio-balloon-pci.c
+++ b/hw/virtio/virtio-balloon-pci.c
@@ -17,6 +17,7 @@
 #include "virtio-pci.h"
 #include "hw/virtio/virtio-balloon.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 typedef struct VirtIOBalloonPCI VirtIOBalloonPCI;
 

diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 2112874055fb580ca63adec5ce3fee9e061d64d5..11fad86d64c3a754a6842539909aaeb2f71692d2 100644 (file)
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -15,8 +15,8 @@
 
 #include "qemu/osdep.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
-#include "qemu-common.h"
 #include "hw/virtio/virtio.h"
 #include "hw/mem/pc-dimm.h"
 #include "sysemu/balloon.h"

diff --git a/hw/virtio/virtio-blk-pci.c b/hw/virtio/virtio-blk-pci.c
index 60c9185c39f861ee1efad043b3af43bd23e0758c..d790b07a999c341c1c527dc59189aefba9f7ef54 100644 (file)
--- a/hw/virtio/virtio-blk-pci.c
+++ b/hw/virtio/virtio-blk-pci.c
@@ -20,6 +20,7 @@
 #include "hw/virtio/virtio-blk.h"
 #include "virtio-pci.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 typedef struct VirtIOBlkPCI VirtIOBlkPCI;
 

diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index f9bc9ea46d72794bc9970103d4f056cb406753fc..1d29a631f3a61482538e84c3f67609225ca908ed 100644 (file)
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "hw/qdev.h"
 #include "hw/virtio/virtio-bus.h"

diff --git a/hw/virtio/virtio-crypto-pci.c b/hw/virtio/virtio-crypto-pci.c
index 13807e538b7dbb05e4d85bfd41c8a52f7a6c1880..c8a2317a10bf263045e76744c31c0130656737e5 100644 (file)
--- a/hw/virtio/virtio-crypto-pci.c
+++ b/hw/virtio/virtio-crypto-pci.c
@@ -11,6 +11,7 @@
  * top-level directory.
  *
  */
+
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "hw/virtio/virtio.h"
@@ -18,6 +19,7 @@
 #include "hw/virtio/virtio-pci.h"
 #include "hw/virtio/virtio-crypto.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 typedef struct VirtIOCryptoPCI VirtIOCryptoPCI;
 

diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
index 9a9fa495d2d92bdbad9551da0838bd8dc7c5fad7..45187d334400686f49f777bb007ba1e235c3b40b 100644 (file)
--- a/hw/virtio/virtio-crypto.c
+++ b/hw/virtio/virtio-crypto.c
@@ -10,8 +10,10 @@
  * (at your option) any later version.  See the COPYING file in the
  * top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "hw/qdev.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"

diff --git a/hw/virtio/virtio-input-host-pci.c b/hw/virtio/virtio-input-host-pci.c
index 124c4f344742dd87bca66133a6ec46df1aec53b8..a82eb5d914f948c6c0b2b4121dbe14bd1d1d05b1 100644 (file)
--- a/hw/virtio/virtio-input-host-pci.c
+++ b/hw/virtio/virtio-input-host-pci.c
@@ -10,6 +10,7 @@
 
 #include "virtio-pci.h"
 #include "hw/virtio/virtio-input.h"
+#include "qemu/module.h"
 
 typedef struct VirtIOInputHostPCI VirtIOInputHostPCI;
 

diff --git a/hw/virtio/virtio-input-pci.c b/hw/virtio/virtio-input-pci.c
index 28477729a312787058acc121a644facc76724c5c..1c40292abc5a6a185f3cc7cec423951ef0e4a6c7 100644 (file)
--- a/hw/virtio/virtio-input-pci.c
+++ b/hw/virtio/virtio-input-pci.c
@@ -10,6 +10,7 @@
 
 #include "virtio-pci.h"
 #include "hw/virtio/virtio-input.h"
+#include "qemu/module.h"
 
 typedef struct VirtIOInputPCI VirtIOInputPCI;
 typedef struct VirtIOInputHIDPCI VirtIOInputHIDPCI;

diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 96c762f0bf883509c4d7725b457921d5d5ef808a..97b7f35496ae15455f2f9265b5e5922e05d3f8eb 100644 (file)
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -24,6 +24,7 @@
 #include "hw/sysbus.h"
 #include "hw/virtio/virtio.h"
 #include "qemu/host-utils.h"
+#include "qemu/module.h"
 #include "sysemu/kvm.h"
 #include "hw/virtio/virtio-bus.h"
 #include "qemu/error-report.h"

diff --git a/hw/virtio/virtio-net-pci.c b/hw/virtio/virtio-net-pci.c
index db07ab9e217f5337eb9cda64fbf1b512d54d0fa8..5df36f26bf0848e6f4290b7691f81f2d34e0b2ee 100644 (file)
--- a/hw/virtio/virtio-net-pci.c
+++ b/hw/virtio/virtio-net-pci.c
@@ -20,6 +20,7 @@
 #include "hw/virtio/virtio-net.h"
 #include "virtio-pci.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 typedef struct VirtIONetPCI VirtIONetPCI;
 

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 9056cdfa3c2ac9f6ffe2b6a0878aa7a0c2460b68..e6d5467e5417c7236010ec05cf0f8b4b8fd5983f 100644 (file)
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -23,6 +23,7 @@
 #include "hw/pci/pci_bus.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/loader.h"

diff --git a/hw/virtio/virtio-rng-pci.c b/hw/virtio/virtio-rng-pci.c
index 6cc6374289cfc0239296758d8685c6d8b88fcc5a..8aaf54b781d6545d0597912f29f4977c9870572a 100644 (file)
--- a/hw/virtio/virtio-rng-pci.c
+++ b/hw/virtio/virtio-rng-pci.c
@@ -14,6 +14,7 @@
 #include "virtio-pci.h"
 #include "hw/virtio/virtio-rng.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 typedef struct VirtIORngPCI VirtIORngPCI;
 

diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 30493a258622a431817c35a49bbb2098a4a7da84..db6d1d945497705526e1867fa56ed991a3fdc8d5 100644 (file)
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "hw/qdev.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-rng.h"

diff --git a/hw/virtio/virtio-scsi-pci.c b/hw/virtio/virtio-scsi-pci.c
index 2830849729621f448b7e211f028aa6ef3ae947ee..f68f689aee8dbbe31b981607759ecc6e71504cbd 100644 (file)
--- a/hw/virtio/virtio-scsi-pci.c
+++ b/hw/virtio/virtio-scsi-pci.c
@@ -16,6 +16,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/virtio/virtio-scsi.h"
+#include "qemu/module.h"
 #include "virtio-pci.h"
 
 typedef struct VirtIOSCSIPCI VirtIOSCSIPCI;

diff --git a/hw/virtio/virtio-serial-pci.c b/hw/virtio/virtio-serial-pci.c
index 971b2eb8d804e541d517cc11925f99e8ac7a66f3..ac74b44daef4cd2d31cffbdfe2a7c693dcf56cd8 100644 (file)
--- a/hw/virtio/virtio-serial-pci.c
+++ b/hw/virtio/virtio-serial-pci.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/virtio/virtio-serial.h"
+#include "qemu/module.h"
 #include "virtio-pci.h"
 
 typedef struct VirtIOSerialPCI VirtIOSerialPCI;

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 07f4a64b48ff51aa350f6dd39372e7a39c8d82fd..e1e90fcfd6aaeb6514d89da4b406d7abaed2812a 100644 (file)
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -13,11 +13,11 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "trace.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/virtio/virtio.h"
 #include "qemu/atomic.h"
 #include "hw/virtio/virtio-bus.h"

diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c
index 9c865bce678ead8dd7c043cb73f1e331bdffd904..54ac393020d0cae3ff656ac0be8be837bfae8bab 100644 (file)
--- a/hw/watchdog/cmsdk-apb-watchdog.c
+++ b/hw/watchdog/cmsdk-apb-watchdog.c
@@ -25,6 +25,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "sysemu/watchdog.h"
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"

diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
index 95f6ad186d72a67449dc44679cbe921fa1d506b1..4a8409f0daf5a30103bf83429f19366dac31b1cf 100644 (file)
--- a/hw/watchdog/wdt_aspeed.c
+++ b/hw/watchdog/wdt_aspeed.c
@@ -11,6 +11,7 @@
 
 #include "qapi/error.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "sysemu/watchdog.h"
 #include "hw/misc/aspeed_scu.h"

diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c
index 1475743527a21c2eb48dcb081441f6d9008ef177..29e5b5dcf6a419dde808a3837773b59cac4f1e98 100644 (file)
--- a/hw/watchdog/wdt_diag288.c
+++ b/hw/watchdog/wdt_diag288.c
@@ -17,6 +17,7 @@
 #include "qemu/timer.h"
 #include "hw/watchdog/wdt_diag288.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 
 static WatchdogTimerModel model = {
     .wdt_name = TYPE_WDT_DIAG288,

diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c
index f2d1e86526f2ccb368e2dfc0bfc383a1432c398c..6780f01adde9d3ad708b156d90b14bc887648a52 100644 (file)
--- a/hw/watchdog/wdt_i6300esb.c
+++ b/hw/watchdog/wdt_i6300esb.c
@@ -21,7 +21,7 @@
 
 #include "qemu/osdep.h"
 
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "sysemu/watchdog.h"
 #include "hw/hw.h"

diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index d045032bf4f5ad92b55d7a1842f94c39b8222a3c..e0e5beb99d6a100a1670fbe8a994238ac6f8fee7 100644 (file)
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "sysemu/watchdog.h"
 #include "hw/hw.h"

diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c
index 49a725e8c7ec83db247e7182a345cc92e7504522..a4416d0bcf82002c4a68ecca0312d8c766262408 100644 (file)
--- a/hw/xen/xen-bus.c
+++ b/hw/xen/xen-bus.c
@@ -7,6 +7,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/uuid.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"

diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
index 0e9e58f04d07eac8827d78585a51944b45bd59a3..32503cfc1cd1d10528df07833addabc7fa3f1408 100644 (file)
--- a/hw/xen/xen-common.c
+++ b/hw/xen/xen-common.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "hw/xen/xen-legacy-backend.h"
 #include "chardev/char.h"
 #include "sysemu/accel.h"

diff --git a/include/hw/boards.h b/include/hw/boards.h
index 6ff02bf3e4727c0666e4e440898b8f9e6594a76f..b7362af3f1d2f5538ae97c3762f1fafb55da12ea 100644 (file)
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -6,6 +6,7 @@
 #include "sysemu/blockdev.h"
 #include "sysemu/accel.h"
 #include "hw/qdev.h"
+#include "qemu/module.h"
 #include "qom/object.h"
 #include "qom/cpu.h"
 

diff --git a/include/hw/hw.h b/include/hw/hw.h
index ab4950c31219d9bc370aa2a3b7055de0236cf53a..b1b79964b5134e241aa493ce2fd712453a9129c5 100644 (file)
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -12,7 +12,6 @@
 #include "hw/irq.h"
 #include "migration/vmstate.h"
 #include "migration/qemu-file-types.h"
-#include "qemu/module.h"
 #include "sysemu/reset.h"
 
 void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 5d5636241e346c919962b1e34df8730a86cd7e4d..a7d0b8716604c4901e3f62d323de8a2db333bacd 100644 (file)
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -1,7 +1,6 @@
 #ifndef HW_PC_H
 #define HW_PC_H
 
-#include "qemu-common.h"
 #include "exec/memory.h"
 #include "hw/boards.h"
 #include "hw/isa/isa.h"
@@ -12,6 +11,7 @@
 
 #include "qemu/range.h"
 #include "qemu/bitmap.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "hw/pci/pci.h"
 #include "hw/mem/pc-dimm.h"

diff --git a/include/qemu-common.h b/include/qemu-common.h
index 9b01f6e7cb6a3dd9247b7f610a6ad4205ef6cf72..e15adc20dc0267b7732a9691a9096f9d40b1d479 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -113,8 +113,6 @@ void os_setup_early_signal_handling(void);
 char *os_find_datadir(void);
 int os_parse_cmd_args(int index, const char *optarg);
 
-#include "qemu/module.h"
-
 /*
  * Hexdump a buffer to a file. An optional string prefix is added to every line
  */

diff --git a/include/qom/object.h b/include/qom/object.h
index 288cdddf441d44212e9a38a51b5336673161a3d9..7bb82a7f5650e324d32f789246d8df221e2291c5 100644 (file)
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -16,6 +16,7 @@
 
 #include "qapi/qapi-builtin-types.h"
 #include "qemu/queue.h"
+#include "qemu/module.h"
 
 struct TypeImpl;
 typedef struct TypeImpl *Type;

diff --git a/io/channel-buffer.c b/io/channel-buffer.c
index 43d795976d9eabc51437206c257feb168caca96e..5402e0cced39522a05ecde7fa9c104a876aaf2a6 100644 (file)
--- a/io/channel-buffer.c
+++ b/io/channel-buffer.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "io/channel-buffer.h"
 #include "io/channel-watch.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "trace.h"
 

diff --git a/io/channel-command.c b/io/channel-command.c
index 3e7eb17eff54567166b4173ed10a1e2f65405289..368dd62b7eda2849d96b5fccee938e15bd540b1f 100644 (file)
--- a/io/channel-command.c
+++ b/io/channel-command.c
@@ -22,6 +22,7 @@
 #include "io/channel-command.h"
 #include "io/channel-watch.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "trace.h"
 

diff --git a/io/channel-file.c b/io/channel-file.c
index db948abc3e5d4c883ea4078cd37346a22866bb78..dac21f6012ae2c9b15f908502dafd8d15dd29f25 100644 (file)
--- a/io/channel-file.c
+++ b/io/channel-file.c
@@ -22,6 +22,7 @@
 #include "io/channel-file.h"
 #include "io/channel-watch.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "trace.h"
 

diff --git a/io/channel-socket.c b/io/channel-socket.c
index bc5f80e780ebc8fea2205b1fd68e04e75ed57752..d898cfcd471d19798aac4c7ac269f37d9c752d63 100644 (file)
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qapi-visit-sockets.h"
+#include "qemu/module.h"
 #include "io/channel-socket.h"
 #include "io/channel-watch.h"
 #include "trace.h"

diff --git a/io/channel-tls.c b/io/channel-tls.c
index c98ead21b01ea23cbfa0a99a3cff4c01141158e6..7ec8ceff2f01744080126985c101621a1aa50e01 100644 (file)
--- a/io/channel-tls.c
+++ b/io/channel-tls.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "io/channel-tls.h"
 #include "trace.h"
 

diff --git a/io/channel-websock.c b/io/channel-websock.c
index 77d30f0e4aa496a407e2c3c24a72f20e645a265b..fc36d44ebae7c7b6920d357cf979b3df60806bce 100644 (file)
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -25,6 +25,7 @@
 #include "crypto/hash.h"
 #include "trace.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 
 /* Max amount to allow in rawinput/encoutput buffers */
 #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192

diff --git a/io/channel.c b/io/channel.c
index 2a26c2a2c0b948be6ab015cd833efd048913c731..e4376eb0bc405eadf7ff5785373ac4aed765e805 100644 (file)
--- a/io/channel.c
+++ b/io/channel.c
@@ -22,6 +22,7 @@
 #include "io/channel.h"
 #include "qapi/error.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/iov.h"
 
 bool qio_channel_has_feature(QIOChannel *ioc,

diff --git a/io/dns-resolver.c b/io/dns-resolver.c
index 187f725665b2dd5d5de3f416ddb8acb4fd68d745..6ebe2a5650b19b7c442f2730b2415c17dee08b0a 100644 (file)
--- a/io/dns-resolver.c
+++ b/io/dns-resolver.c
@@ -25,6 +25,7 @@
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 
 #ifndef AI_NUMERICSERV
 # define AI_NUMERICSERV 0

diff --git a/io/net-listener.c b/io/net-listener.c
index 3317aa6e5f2643be4d37d1b100a9b9fa7b343c98..d8cfe52673532c9c041ce2e1abbe41ed8fca0c21 100644 (file)
--- a/io/net-listener.c
+++ b/io/net-listener.c
@@ -22,6 +22,7 @@
 #include "io/net-listener.h"
 #include "io/dns-resolver.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 QIONetListener *qio_net_listener_new(void)
 {

diff --git a/linux-user/main.c b/linux-user/main.c
index a2b4a9f3e29f669284e653d53fdefbde5d36e94f..98f33820b1fb608d55e61062e6363c0fd0184cde 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -31,6 +31,7 @@
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "qemu/help_option.h"
+#include "qemu/module.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "tcg.h"

diff --git a/migration/rdma.c b/migration/rdma.c
index c1bcece53bcbba8d99b04562ed75495fa0b00ef5..74cb2aa9f916d7264fc4c35b9629c82af694d0da 100644 (file)
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -13,9 +13,9 @@
  * later.  See the COPYING file in the top-level directory.
  *
  */
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/cutils.h"
 #include "rdma.h"
 #include "migration.h"
@@ -24,6 +24,7 @@
 #include "qemu-file-channel.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "qemu/bitmap.h"
 #include "qemu/coroutine.h"

diff --git a/net/can/can_core.c b/net/can/can_core.c
index 2a83cadfc57c43a419addd2839041c965d0b898e..90f4d8576ac8bc82412bc903f87e70b316075537 100644 (file)
--- a/net/can/can_core.c
+++ b/net/can/can_core.c
@@ -24,8 +24,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "chardev/char.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "net/can_emu.h"

diff --git a/net/can/can_host.c b/net/can/can_host.c
index c79347ababf6f78a7af5798f32cf15874ca45538..1dfaf0ced008f28a281e1103e98ff3da086c9a24 100644 (file)
--- a/net/can/can_host.c
+++ b/net/can/can_host.c
@@ -24,8 +24,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "chardev/char.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "qapi/error.h"
 #include "qom/object_interfaces.h"

diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c
index 39865e28e007245c69c779380f90ee1c32043d70..3dec1086841ea0c62c289d36ab19d8d6f5a5cbf5 100644 (file)
--- a/net/can/can_socketcan.c
+++ b/net/can/can_socketcan.c
@@ -24,8 +24,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "chardev/char.h"
 #include "qemu/sockets.h"

diff --git a/net/dump.c b/net/dump.c
index f16c3545e9deb4d089aeb51c23d956bdbcb443d8..cd34f51759de90897c8f6da0c319a9de1999d491 100644 (file)
--- a/net/dump.c
+++ b/net/dump.c
@@ -25,10 +25,10 @@
 #include "qemu/osdep.h"
 #include "clients.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/iov.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qapi/visitor.h"
 #include "net/filter.h"

diff --git a/net/filter-replay.c b/net/filter-replay.c
index 09e68fd8f5dcd2f91faa1c99005928b008e9a8a3..9dda1939283cfc117076a126f238e681e97d4e55 100644 (file)
--- a/net/filter-replay.c
+++ b/net/filter-replay.c
@@ -11,10 +11,10 @@
 
 #include "qemu/osdep.h"
 #include "clients.h"
-#include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/iov.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qapi/visitor.h"
 #include "net/filter.h"

diff --git a/net/filter.c b/net/filter.c
index 28d1930db7b129427702c81938ea9a00e314b64f..4b932e79f962674d65a62a2e261dd17a40c6da6f 100644 (file)
--- a/net/filter.c
+++ b/net/filter.c
@@ -8,7 +8,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 
@@ -17,6 +16,7 @@
 #include "net/vhost_net.h"
 #include "qom/object_interfaces.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "net/colo.h"
 #include "migration/colo.h"
 

diff --git a/qemu-img.c b/qemu-img.c
index 07b6e2a8088c1f6e15486884c9344d493c28bca8..c221e3cb24253bd9127b66bb39df7b12b9732cf1 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -37,6 +37,7 @@
 #include "qemu/option.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "qom/object_interfaces.h"
 #include "sysemu/sysemu.h"

diff --git a/qemu-io.c b/qemu-io.c
index 8d5d5911cb55359d842f3d9dbb57e9c535859152..968f0e3dbfd9de7da13274795a82678d0f14464d 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -19,6 +19,7 @@
 #include "qemu-io.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/readline.h"

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 25ce71e1600359143d869cc2b9e81d53c1f2d9aa..410373a3218260eec241d754a9f573927b343da6 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -21,13 +21,13 @@
 #include <libgen.h>
 #include <pthread.h>
 
-#include "qemu-common.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
 #include "block/nbd.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/error-report.h"
 #include "qemu/config-file.h"

diff --git a/qga/main.c b/qga/main.c
index c0d77c79c45991c3c47c56fe9fd5a863d6f64e11..b54b55589d95c34cccec4647601c3c355efc909c 100644 (file)
--- a/qga/main.c
+++ b/qga/main.c
@@ -23,7 +23,6 @@
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qstring.h"
 #include "guest-agent-core.h"
-#include "qemu/module.h"
 #include "qga-qapi-commands.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/error.h"

diff --git a/qtest.c b/qtest.c
index f2e2f277780ba3cbcd20387f89d796ebcb55c443..15e27e911fafafeea111b63ce6a3a442170988c5 100644 (file)
--- a/qtest.c
+++ b/qtest.c
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "cpu.h"
 #include "sysemu/qtest.h"
 #include "hw/qdev.h"
@@ -27,6 +26,7 @@
 #include "qemu/config-file.h"
 #include "qemu/option.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/cutils.h"
 #ifdef TARGET_PPC64
 #include "hw/ppc/spapr_rtas.h"

diff --git a/replication.h b/replication.h
index 4c8354de23ca2c9c1255ecd881f62de1a384fed7..d49fc22cb9fbb8c5506b3b27fe1bfab53128f9ab 100644 (file)
--- a/replication.h
+++ b/replication.h
@@ -16,6 +16,7 @@
 #define REPLICATION_H
 
 #include "qapi/qapi-types-block-core.h"
+#include "qemu/module.h"
 #include "qemu/queue.h"
 
 typedef struct ReplicationOps ReplicationOps;

diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index 6d66bf6aa38065e5448421bd905d88544fa7798f..b929e07be440f70a5384f185179e840a4de97ba0 100644 (file)
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -249,8 +249,6 @@ class QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
         visit = self._module_basename('qapi-visit', name)
         self._genc.add(mcgen('''
 #include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/module.h"
 #include "qapi/visitor.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qobject-output-visitor.h"

diff --git a/scsi/pr-manager-helper.c b/scsi/pr-manager-helper.c
index 438380fced66a0c13e8cff304df0317896d9ffae..ca27c93283d20d1c2befbf7c5c3e63890442ac47 100644 (file)
--- a/scsi/pr-manager-helper.c
+++ b/scsi/pr-manager-helper.c
@@ -18,6 +18,7 @@
 #include "io/channel-socket.h"
 #include "pr-helper.h"
 #include "qapi/qapi-events-block.h"
+#include "qemu/module.h"
 
 #include <scsi/sg.h>
 

diff --git a/scsi/pr-manager.c b/scsi/pr-manager.c
index d9f4e8c3adbcf2333d1912148423907b80b1aefb..ee43663576ed32c3d27649157e83e6ea290ad92e 100644 (file)
--- a/scsi/pr-manager.c
+++ b/scsi/pr-manager.c
@@ -18,6 +18,7 @@
 #include "scsi/pr-manager.h"
 #include "trace.h"
 #include "qapi/qapi-types-block.h"
+#include "qemu/module.h"
 #include "qapi/qapi-commands-block.h"
 
 #define PR_MANAGER_PATH     "/objects"

diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index 2541fbbd1b9d88e83cc8d3328bc1a05693c5f8e0..72acdc75274adbf698dbbe0699b4273f87e48a39 100644 (file)
--- a/scsi/qemu-pr-helper.c
+++ b/scsi/qemu-pr-helper.c
@@ -37,9 +37,9 @@
 #endif
 
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/cutils.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "qemu/error-report.h"
 #include "qemu/config-file.h"
 #include "qemu/bswap.h"

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index c2dff10f82057d7583bb24e425381d3b539868fd..d0e144a4a1e99f50f2648dd7cf9518fd137b638d 100644 (file)
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "target/arm/idau.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "cpu.h"

diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index b8bd1e88a5f40454434efe34c3bba2e4425dd030..1901997a0645f2a7770736d355e53f30a66e26d9 100644 (file)
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"
 #endif

diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
index ae494abad1c12af3e5aa81e417b48ee7503fc7ef..368cb71e6d5040cfaaeda615dff7c96afa86c307 100644 (file)
--- a/target/hppa/cpu.c
+++ b/target/hppa/cpu.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/qemu-print.h"
 #include "cpu.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "exec/exec-all.h"
 #include "fpu/softfloat.h"
 

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index a4bc04ed1dc33309a0af9b9ceaafe190647bee2b..a108b65d9fed14a740d3efb7e2f938fed84a8597 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -32,6 +32,7 @@
 #include "sev_i386.h"
 
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qapi/error.h"

diff --git a/target/i386/sev.c b/target/i386/sev.c
index cd77f6b5d477d42e1ae7ffe36b527c8766c132ec..6dbdc3cdf10f78d9c1a30a9feedee0f0a51f644d 100644 (file)
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -21,6 +21,7 @@
 #include "qapi/error.h"
 #include "qom/object_interfaces.h"
 #include "qemu/base64.h"
+#include "qemu/module.h"
 #include "sysemu/kvm.h"
 #include "sev_i386.h"
 #include "sysemu/sysemu.h"

diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c
index 5c537526c09c77d8b189510d40523a8ce5cb810f..0bec54b2f8a6c6c6459ba477ebb6d175a1504d9c 100644 (file)
--- a/target/microblaze/cpu.c
+++ b/target/microblaze/cpu.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "exec/exec-all.h"

diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 73232b80ad9691c9d8d0c91b5283214e95400801..39eafafc5cde5076f2d82aa118ad759d1ed8d0e0 100644 (file)
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -23,7 +23,7 @@
 #include "cpu.h"
 #include "internal.h"
 #include "kvm_mips.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "sysemu/kvm.h"
 #include "exec/exec-all.h"
 

diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c
index b00223e0c7ad441e21be2dbfd44bcc5e86c1d773..ca9c7a6df5d19b35d1cc353888e1102a701bd7d1 100644 (file)
--- a/target/nios2/cpu.c
+++ b/target/nios2/cpu.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "cpu.h"
 #include "exec/log.h"

diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
index 9d7050b5fa1e092e089ac830af7d620c7a33ee15..086548e9b965d915a7f71704379e2ca317641a37 100644 (file)
--- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
@@ -21,6 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "qemu/module.h"
 #include "cpu-models.h"
 
 #if defined(CONFIG_USER_ONLY)

diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c
index 970171b11690aafc80ec31227a295083b94d1d88..03cb6d05217840d3141c5750ee479b3449226f8d 100644 (file)
--- a/target/ppc/translate_init.inc.c
+++ b/target/ppc/translate_init.inc.c
@@ -29,6 +29,7 @@
 #include "mmu-hash32.h"
 #include "mmu-hash64.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/qemu-print.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qnull.h"

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index c80743a923746ad250e544dbd403dee27b5b6d4c..f2d93644d507fcac095307d895b31a12b186e68f 100644 (file)
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -28,6 +28,7 @@
 #include "sysemu/kvm.h"
 #include "qemu/timer.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "trace.h"
 #include "qapi/visitor.h"
 #include "qapi/qapi-visit-misc.h"

diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 3fce8114deeda3d6ab984c0a31794c19896ab478..19ebde14dbed8ff495e3348a5a64e03e3625cca2 100644 (file)
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -19,6 +19,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/qemu-print.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qobject-input-visitor.h"

diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index ad2c362c6ac9faad858e9aa8a352a5a69619f122..ee60a5536a01ef9244931f26819e007d6cbd2cac 100644 (file)
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
+#include "qemu/module.h"
 #include "qemu/qemu-print.h"
 #include "exec/exec-all.h"
 #include "hw/qdev-properties.h"

diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c
index 3567a2b6647f452cd7cded6d6e9525584ff98f9e..69971247f214ddc0fb2444c330833f54be3e2eaa 100644 (file)
--- a/target/tilegx/cpu.c
+++ b/target/tilegx/cpu.c
@@ -21,7 +21,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "hw/qdev-properties.h"
 #include "linux-user/syscall_defs.h"
 #include "qemu/qemu-print.h"

diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index f3ec66e2422b5736b65d252dbecfe502016a74d1..76db1741a796893407e4b95ae87811c2e9d1270e 100644 (file)
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -31,7 +31,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "migration/vmstate.h"
 
 

diff --git a/tests/ac97-test.c b/tests/ac97-test.c
index 532fb1cc98a7c000bca25f7c51f4168619182a6b..b084e31bff5ffd05caf58a8be29d85a9db619d7b 100644 (file)
--- a/tests/ac97-test.c
+++ b/tests/ac97-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/e1000-test.c b/tests/e1000-test.c
index 9e6791616962f6b903ed8ad85deaf33349ba8ffb..c387984ef6d69dbf0361b83f19e96f00e5896775 100644 (file)
--- a/tests/e1000-test.c
+++ b/tests/e1000-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/e1000e-test.c b/tests/e1000e-test.c
index 6a946c048462ace81c283859da8a0d89737062ae..781fcbfd89703968c1ee3b5d31ea261049ec658d 100644 (file)
--- a/tests/e1000e-test.c
+++ b/tests/e1000e-test.c
@@ -30,6 +30,7 @@
 #include "libqos/pci-pc.h"
 #include "qemu/sockets.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/bitops.h"
 #include "libqos/malloc.h"
 #include "libqos/e1000e.h"

diff --git a/tests/eepro100-test.c b/tests/eepro100-test.c
index 90b5c1afd91760e132e4999a0b506cfc5d586a03..8dbffff0b81b1632a876ad1dcfa7d4623dfa4f4a 100644 (file)
--- a/tests/eepro100-test.c
+++ b/tests/eepro100-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/es1370-test.c b/tests/es1370-test.c
index d845cd06f85952932740b428a4e2897c18bf601d..adccdac1be57ef6df00cfa18d13df28e7f399db4 100644 (file)
--- a/tests/es1370-test.c
+++ b/tests/es1370-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/ipoctal232-test.c b/tests/ipoctal232-test.c
index 42d53718b80185a0814c5a87358a1c8cb11e42bd..53a8c9b13ce582764e56a4fa85edafe4fc32d760 100644 (file)
--- a/tests/ipoctal232-test.c
+++ b/tests/ipoctal232-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 
 typedef struct QIpoctal232 QIpoctal232;

diff --git a/tests/libqos/aarch64-xlnx-zcu102-machine.c b/tests/libqos/aarch64-xlnx-zcu102-machine.c
index 6fff040b372c522cd38d7847b2850aea52028c93..1d5de5af0010f58775c271e0f016ef4d312d90db 100644 (file)
--- a/tests/libqos/aarch64-xlnx-zcu102-machine.c
+++ b/tests/libqos/aarch64-xlnx-zcu102-machine.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/malloc.h"
 #include "libqos/qgraph.h"
 #include "sdhci.h"

diff --git a/tests/libqos/arm-raspi2-machine.c b/tests/libqos/arm-raspi2-machine.c
index 3aff670f7618e6394968069a9aa81d298a441c44..12a7cb7e4ba7ec6e65a6fe9b39126e3e21e5c1b6 100644 (file)
--- a/tests/libqos/arm-raspi2-machine.c
+++ b/tests/libqos/arm-raspi2-machine.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/malloc.h"
 #include "libqos/qgraph.h"
 #include "sdhci.h"

diff --git a/tests/libqos/arm-sabrelite-machine.c b/tests/libqos/arm-sabrelite-machine.c
index c4128d8686aec003094fa728c3db7d9c186eff0b..e6df43795a7cd0aadb0f64b5a120c71fb2c3b9da 100644 (file)
--- a/tests/libqos/arm-sabrelite-machine.c
+++ b/tests/libqos/arm-sabrelite-machine.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/malloc.h"
 #include "libqos/qgraph.h"
 #include "sdhci.h"

diff --git a/tests/libqos/arm-smdkc210-machine.c b/tests/libqos/arm-smdkc210-machine.c
index 1fb9dfc0cb566be9196b8aec8354c32404a46ef8..215b628a7dab8422614132ae4fd1f0c867a808cd 100644 (file)
--- a/tests/libqos/arm-smdkc210-machine.c
+++ b/tests/libqos/arm-smdkc210-machine.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/malloc.h"
 #include "libqos/qgraph.h"
 #include "sdhci.h"

diff --git a/tests/libqos/arm-virt-machine.c b/tests/libqos/arm-virt-machine.c
index 2abc431ecf6e8988e647fcafa8d74204b8dd568b..96ffe3ee5c42471571f7acd003c55753a48296d9 100644 (file)
--- a/tests/libqos/arm-virt-machine.c
+++ b/tests/libqos/arm-virt-machine.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/malloc.h"
 #include "libqos/qgraph.h"
 #include "libqos/virtio-mmio.h"

diff --git a/tests/libqos/arm-xilinx-zynq-a9-machine.c b/tests/libqos/arm-xilinx-zynq-a9-machine.c
index 4e199fcd48dc4d9721b4c733c7f9c706d74d48bd..5bc95f2e73a98e8f069f928dd0fc87b0d014e691 100644 (file)
--- a/tests/libqos/arm-xilinx-zynq-a9-machine.c
+++ b/tests/libqos/arm-xilinx-zynq-a9-machine.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/malloc.h"
 #include "libqos/qgraph.h"
 #include "sdhci.h"

diff --git a/tests/libqos/e1000e.c b/tests/libqos/e1000e.c
index 54d38988998a977ce40f6e9b26cfd7eac5244722..1d0592974eee0d4d80ddfc46fb6c3a1fee723a1a 100644 (file)
--- a/tests/libqos/e1000e.c
+++ b/tests/libqos/e1000e.c
@@ -18,10 +18,10 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
-#include "qemu-common.h"
 #include "libqos/pci-pc.h"
 #include "qemu/sockets.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qemu/bitops.h"
 #include "libqos/malloc.h"
 #include "libqos/qgraph.h"

diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c
index 634fedd0490542a4a6962d53e81fe8003a8e7f1e..0bc591d1daff7115b9ae485c16a0eb2a580e3db0 100644 (file)
--- a/tests/libqos/pci-pc.c
+++ b/tests/libqos/pci-pc.c
@@ -16,7 +16,7 @@
 #include "qapi/qmp/qdict.h"
 #include "hw/pci/pci_regs.h"
 
-#include "qemu-common.h"
+#include "qemu/module.h"
 
 #define ACPI_PCIHP_ADDR         0xae00
 #define PCI_EJ_BASE             0x0008

diff --git a/tests/libqos/pci-spapr.c b/tests/libqos/pci-spapr.c
index 58ba27ae6d8ce61739128f5760362de5a70341d4..d6f8c01cb7b01fc9f4a396979240f9108a3687ac 100644 (file)
--- a/tests/libqos/pci-spapr.c
+++ b/tests/libqos/pci-spapr.c
@@ -13,8 +13,8 @@
 
 #include "hw/pci/pci_regs.h"
 
-#include "qemu-common.h"
 #include "qemu/host-utils.h"
+#include "qemu/module.h"
 
 /*
  * PCI devices are always little-endian

diff --git a/tests/libqos/ppc64_pseries-machine.c b/tests/libqos/ppc64_pseries-machine.c
index 2f3640010d1271a59284689b6c10b1455e4b931e..867f27a3c81279ac593372a7abece2cea18b7120 100644 (file)
--- a/tests/libqos/ppc64_pseries-machine.c
+++ b/tests/libqos/ppc64_pseries-machine.c
@@ -16,10 +16,11 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
- #include "qemu/osdep.h"
+#include "qemu/osdep.h"
 #include "libqtest.h"
 #include "libqos/qgraph.h"
 #include "pci-spapr.h"
+#include "qemu/module.h"
 #include "libqos/malloc-spapr.h"
 
 typedef struct QSPAPR_pci_host QSPAPR_pci_host;

diff --git a/tests/libqos/sdhci.c b/tests/libqos/sdhci.c
index 22c33de4531c545a3bccb4a64e5045b82f294ddb..309794bc52036e83ee56eecb0c8b979ac918e7b2 100644 (file)
--- a/tests/libqos/sdhci.c
+++ b/tests/libqos/sdhci.c
@@ -20,6 +20,7 @@
 #include "libqtest.h"
 #include "libqos/qgraph.h"
 #include "pci.h"
+#include "qemu/module.h"
 #include "sdhci.h"
 #include "hw/pci/pci.h"
 

diff --git a/tests/libqos/tpci200.c b/tests/libqos/tpci200.c
index 98dc53293397634ddbce62a091a24ec50d08e998..ae590a456ec60e24857091d6ef1d537e6ea40e95 100644 (file)
--- a/tests/libqos/tpci200.c
+++ b/tests/libqos/tpci200.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/libqos/virtio-9p.c b/tests/libqos/virtio-9p.c
index a378b56fa9f71abdeff6d88b13385073b67852b6..8c9efce3e19415bfdd2847949ce479ae3cb13ebc 100644 (file)
--- a/tests/libqos/virtio-9p.c
+++ b/tests/libqos/virtio-9p.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "libqos/virtio-9p.h"
 #include "libqos/qgraph.h"

diff --git a/tests/libqos/virtio-balloon.c b/tests/libqos/virtio-balloon.c
index 7e6e9e9de56660efe015d8105efbf75b62064fb6..42a4c5831eada619f3c010288ed757be56a48ae0 100644 (file)
--- a/tests/libqos/virtio-balloon.c
+++ b/tests/libqos/virtio-balloon.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/virtio-balloon.h"
 

diff --git a/tests/libqos/virtio-blk.c b/tests/libqos/virtio-blk.c
index c17bdf4217c6504bbbfc7a0847312509f1733246..726e93c5c1e7ae226f593827a31fb0a4d6c07b53 100644 (file)
--- a/tests/libqos/virtio-blk.c
+++ b/tests/libqos/virtio-blk.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "standard-headers/linux/virtio_blk.h"
 #include "libqos/qgraph.h"
 #include "libqos/virtio-blk.h"

diff --git a/tests/libqos/virtio-mmio.c b/tests/libqos/virtio-mmio.c
index 213a5f9de0063e09b347cf3d5e7b71edf98a84c6..5f37b51129c73a79fb4833e1716f0d5d3b4ae871 100644 (file)
--- a/tests/libqos/virtio-mmio.c
+++ b/tests/libqos/virtio-mmio.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/virtio.h"
 #include "libqos/virtio-mmio.h"
 #include "libqos/malloc.h"

diff --git a/tests/libqos/virtio-net.c b/tests/libqos/virtio-net.c
index 61c56170e9e844745685f187b9aa95a69baa672d..66405b646e966fe7ac623f8212ac79af11a95eb5 100644 (file)
--- a/tests/libqos/virtio-net.c
+++ b/tests/libqos/virtio-net.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/virtio-net.h"
 #include "hw/virtio/virtio-net.h"

diff --git a/tests/libqos/virtio-rng.c b/tests/libqos/virtio-rng.c
index a1d2c7671c6f8abbf814eaa5cab83c7df8496c05..b86349e2fd1b7b0898134af9cf5998e574a95967 100644 (file)
--- a/tests/libqos/virtio-rng.c
+++ b/tests/libqos/virtio-rng.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/virtio-rng.h"
 

diff --git a/tests/libqos/virtio-scsi.c b/tests/libqos/virtio-scsi.c
index 482684d0bc0cded3ed629faf3ba61417fba49e28..94842ec3fa6fc3f30991ee30f4eeff694de1e486 100644 (file)
--- a/tests/libqos/virtio-scsi.c
+++ b/tests/libqos/virtio-scsi.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "libqos/qgraph.h"
 #include "libqos/virtio-scsi.h"

diff --git a/tests/libqos/virtio-serial.c b/tests/libqos/virtio-serial.c
index 91cedefb8d8229901cf1659c8287279ea8572a87..3e5b8b82c743235c92f1798e0ed56cddf882546c 100644 (file)
--- a/tests/libqos/virtio-serial.c
+++ b/tests/libqos/virtio-serial.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/virtio-serial.h"
 

diff --git a/tests/libqos/x86_64_pc-machine.c b/tests/libqos/x86_64_pc-machine.c
index 8bd0360ba9de88f79d5d63392118ad19ca290184..6dfa705217e6085d31d034bc7fcedab1345def42 100644 (file)
--- a/tests/libqos/x86_64_pc-machine.c
+++ b/tests/libqos/x86_64_pc-machine.c
@@ -20,6 +20,7 @@
 #include "libqtest.h"
 #include "libqos/qgraph.h"
 #include "pci-pc.h"
+#include "qemu/module.h"
 #include "malloc-pc.h"
 
 typedef struct QX86PCMachine QX86PCMachine;

diff --git a/tests/megasas-test.c b/tests/megasas-test.c
index 1111d331d33f03bf4fe98cf17092fa2d4dddb151..c3e4ab659554d42c4416eec62b4a02a899ab369f 100644 (file)
--- a/tests/megasas-test.c
+++ b/tests/megasas-test.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "libqtest.h"
 #include "qemu/bswap.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/migration-test.c b/tests/migration-test.c
index e0407576cb10808254c953ca6041d35e7cf17401..0cd014dbe5171d962b5a881fd8f3f2247cd6e7da 100644 (file)
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -15,6 +15,7 @@
 #include "libqtest.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/range.h"
 #include "qemu/sockets.h"

diff --git a/tests/ne2000-test.c b/tests/ne2000-test.c
index 097c2eec6c510f52965857d42692e97fc7b11d59..3fc0e555d5e25de99ff5c9635c8c336ace19b398 100644 (file)
--- a/tests/ne2000-test.c
+++ b/tests/ne2000-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/nvme-test.c b/tests/nvme-test.c
index b48d3a24b93531440c5ae07eaf20c179b9603464..505299324b3fd6bc0f6c731028f87d5be8746cbb 100644 (file)
--- a/tests/nvme-test.c
+++ b/tests/nvme-test.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/module.h"
 #include "qemu/units.h"
 #include "libqtest.h"
 #include "libqos/qgraph.h"

diff --git a/tests/pci-test.c b/tests/pci-test.c
index ff8098509386862635ca8ddd2c94435928fc15d8..4b2092b94973abcc3dd704ab5bdd55c1810eb9c4 100644 (file)
--- a/tests/pci-test.c
+++ b/tests/pci-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/pcnet-test.c b/tests/pcnet-test.c
index 484448cc64e5b692cf6d051a721372eedd847c53..900944fa7e34c220418bca663240be5fde61b3ba 100644 (file)
--- a/tests/pcnet-test.c
+++ b/tests/pcnet-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/qos-test.c b/tests/qos-test.c
index 01b2a22c0860d2cdd083114c77361a1d3c1b4063..3c0071b3b707a0561167da0550afd5f4408cff6b 100644 (file)
--- a/tests/qos-test.c
+++ b/tests/qos-test.c
@@ -22,6 +22,7 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qstring.h"
+#include "qemu/module.h"
 #include "qapi/qmp/qlist.h"
 #include "libqos/malloc.h"
 #include "libqos/qgraph.h"

diff --git a/tests/sdhci-test.c b/tests/sdhci-test.c
index 2f177e569f32dc10a23de835cec0e74162813a4d..6275e7626c215638d7647bb2088f59b93a908c3c 100644 (file)
--- a/tests/sdhci-test.c
+++ b/tests/sdhci-test.c
@@ -7,9 +7,11 @@
  * See the COPYING file in the top-level directory.
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
+
 #include "qemu/osdep.h"
 #include "hw/registerfields.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/pci-pc.h"
 #include "hw/pci/pci.h"
 #include "libqos/qgraph.h"

diff --git a/tests/spapr-phb-test.c b/tests/spapr-phb-test.c
index 39b576671015fbb8a5bd3120fbee0e2c043e3597..093dc22f2f41d707ffcdbe3af6a8c897669ea0b6 100644 (file)
--- a/tests/spapr-phb-test.c
+++ b/tests/spapr-phb-test.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 
 /* Tests only initialization so far. TODO: Replace with functional tests,

diff --git a/tests/test-authz-list.c b/tests/test-authz-list.c
index 24347a6ac3bdb65737c0586c3a0b56578ad13bca..d80e6a6d4dcc9fc2266385c8ae459f5bfb080c62 100644 (file)
--- a/tests/test-authz-list.c
+++ b/tests/test-authz-list.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 
 #include "authz/list.h"
+#include "qemu/module.h"
 
 static void test_authz_default_deny(void)
 {

diff --git a/tests/test-authz-listfile.c b/tests/test-authz-listfile.c
index 1e452fef6dd41e86ff8cece9f8e77967a2a8dec1..26166b691b71964c4a45731e3593e7910642efc9 100644 (file)
--- a/tests/test-authz-listfile.c
+++ b/tests/test-authz-listfile.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
+#include "qemu/module.h"
 #include "authz/listfile.h"
 
 static char *workdir;

diff --git a/tests/test-authz-pam.c b/tests/test-authz-pam.c
index 93d5ac8bbfa2754375ae66d100ea4957db288b3e..02bb1493e7242ac962a0fc62431981c92f64a966 100644 (file)
--- a/tests/test-authz-pam.c
+++ b/tests/test-authz-pam.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "authz/pamacct.h"
 
 #include <security/pam_appl.h>

diff --git a/tests/test-authz-simple.c b/tests/test-authz-simple.c
index 2cf14fb87e3a46aa466b8a1b2c74eba1e299b591..d21d43e2e9eec2b427181e740953b7adc1abe0a4 100644 (file)
--- a/tests/test-authz-simple.c
+++ b/tests/test-authz-simple.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #include "authz/simple.h"
 

diff --git a/tests/test-char.c b/tests/test-char.c
index 95ccfd3cdb64889e0c91bd8d628573ba6288c7b6..f9440cdcfdb51f98b2f6542e6f21062e2f122444 100644 (file)
--- a/tests/test-char.c
+++ b/tests/test-char.c
@@ -2,6 +2,7 @@
 #include <glib/gstdio.h>
 
 #include "qemu/config-file.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "chardev/char-fe.h"

diff --git a/tests/test-crypto-block.c b/tests/test-crypto-block.c
index d309d044efc6ffc460533daad1772137c1c9f1c0..7c1ab07855415a0c2a884b8519e8fe99440bb83b 100644 (file)
--- a/tests/test-crypto-block.c
+++ b/tests/test-crypto-block.c
@@ -23,6 +23,7 @@
 #include "crypto/init.h"
 #include "crypto/block.h"
 #include "qemu/buffer.h"
+#include "qemu/module.h"
 #include "crypto/secret.h"
 #ifndef _WIN32
 #include <sys/resource.h>

diff --git a/tests/test-crypto-tlscredsx509.c b/tests/test-crypto-tlscredsx509.c
index 940a026c6ee23deda778135e57e7855d40866149..a27efb7540093f2e968d9da16d9243fc5f31b6a1 100644 (file)
--- a/tests/test-crypto-tlscredsx509.c
+++ b/tests/test-crypto-tlscredsx509.c
@@ -23,6 +23,7 @@
 #include "crypto-tls-x509-helpers.h"
 #include "crypto/tlscredsx509.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
 

diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c
index 15212ec276d62ca09650c775448088928a432547..6560d7134f9ce735c13329ecf146c4c22bfe1bba 100644 (file)
--- a/tests/test-crypto-tlssession.c
+++ b/tests/test-crypto-tlssession.c
@@ -27,6 +27,7 @@
 #include "crypto/tlssession.h"
 #include "qom/object_interfaces.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "authz/list.h"
 

diff --git a/tests/test-io-channel-buffer.c b/tests/test-io-channel-buffer.c
index 64722a214bd17b3703580b3e346cbb785b252861..59d6c64b0431c10e853373f1b23ac524d05c44b7 100644 (file)
--- a/tests/test-io-channel-buffer.c
+++ b/tests/test-io-channel-buffer.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "io/channel-buffer.h"
+#include "qemu/module.h"
 #include "io-channel-helpers.h"
 
 

diff --git a/tests/test-io-channel-command.c b/tests/test-io-channel-command.c
index 46ce1ff01cd8ebcf84f796b6ad02ce9012424452..3bc52661210413776d9d0e5b4fb12dd98084262f 100644 (file)
--- a/tests/test-io-channel-command.c
+++ b/tests/test-io-channel-command.c
@@ -22,6 +22,7 @@
 #include "io/channel-command.h"
 #include "io-channel-helpers.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #ifndef WIN32
 static void test_io_channel_command_fifo(bool async)

diff --git a/tests/test-io-channel-file.c b/tests/test-io-channel-file.c
index 2e94f638f2995586d0f9ed56b3d07fb3884d5b8b..bac2b07562c21721c3a1f65390a7a25a1e282730 100644 (file)
--- a/tests/test-io-channel-file.c
+++ b/tests/test-io-channel-file.c
@@ -23,6 +23,7 @@
 #include "io/channel-util.h"
 #include "io-channel-helpers.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #define TEST_FILE "tests/test-io-channel-file.txt"
 #define TEST_MASK 0600

diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
index c253ae30f57a69d6f877064fc83ba5cb83079fd7..d2053c464cbac273a1315a8fccc888d38ed7652f 100644 (file)
--- a/tests/test-io-channel-socket.c
+++ b/tests/test-io-channel-socket.c
@@ -24,6 +24,7 @@
 #include "io-channel-helpers.h"
 #include "socket-helpers.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 
 static void test_io_channel_set_socket_bufs(QIOChannel *src,

diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c
index 43b707eba786f99ef4d503d6c7a8afafe47053d3..3c9ef6f941fc053dc9e3a02ff0b928cec85de07d 100644 (file)
--- a/tests/test-io-channel-tls.c
+++ b/tests/test-io-channel-tls.c
@@ -30,6 +30,7 @@
 #include "crypto/init.h"
 #include "crypto/tlscredsx509.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 #include "authz/list.h"
 #include "qom/object_interfaces.h"
 

diff --git a/tests/test-io-task.c b/tests/test-io-task.c
index bac1bb4e7a3ffca5b4a58ef30cce09b558f4542d..aa8b653bfac26315c42ff48a5ca66dcaee3578b2 100644 (file)
--- a/tests/test-io-task.c
+++ b/tests/test-io-task.c
@@ -22,6 +22,7 @@
 
 #include "io/task.h"
 #include "qapi/error.h"
+#include "qemu/module.h"
 
 #define TYPE_DUMMY "qemu:dummy"
 

diff --git a/tests/test-qmp-cmds.c b/tests/test-qmp-cmds.c
index 630b1b9bac34f29ec617227064f03be2f906178a..f0b95dcbc388241cde7c0a2ec934dfd81fb548da 100644 (file)
--- a/tests/test-qmp-cmds.c
+++ b/tests/test-qmp-cmds.c
@@ -1,10 +1,8 @@
 #include "qemu/osdep.h"
-#include "qemu-common.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/error.h"
-#include "qemu/module.h"
 #include "qapi/qobject-input-visitor.h"
 #include "tests/test-qapi-types.h"
 #include "tests/test-qapi-visit.h"

diff --git a/tests/test-throttle.c b/tests/test-throttle.c
index 5644cf95ca25056f9ebb07e929247b326bb294b3..a28812260e7f803c45d408cf101c825201441dc7 100644 (file)
--- a/tests/test-throttle.c
+++ b/tests/test-throttle.c
@@ -18,6 +18,7 @@
 #include "qapi/error.h"
 #include "qemu/throttle.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "block/throttle-groups.h"
 #include "sysemu/block-backend.h"
 

diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index fc8ce62471814bb49ec22d8919907124b2146d41..e80c4c6143e4eb65b74c1c27c625a6dab3db417a 100644 (file)
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 
-#include "qemu-common.h"
 #include "../migration/migration.h"
 #include "migration/vmstate.h"
 #include "migration/qemu-file-types.h"
@@ -32,6 +31,7 @@
 #include "../migration/qemu-file-channel.h"
 #include "../migration/savevm.h"
 #include "qemu/coroutine.h"
+#include "qemu/module.h"
 #include "io/channel-file.h"
 
 static char temp_file[] = "/tmp/vmst.test.XXXXXX";

diff --git a/tests/tpm-crb-swtpm-test.c b/tests/tpm-crb-swtpm-test.c
index 8c0a55f3ca61e6e189e029af5c5eac904d040b3a..2c4fb8ae292bafb2aa8f940c9c6834d59d7e7db8 100644 (file)
--- a/tests/tpm-crb-swtpm-test.c
+++ b/tests/tpm-crb-swtpm-test.c
@@ -16,6 +16,7 @@
 #include <glib/gstdio.h>
 
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "tpm-tests.h"
 
 typedef struct TestState {

diff --git a/tests/tpm-crb-test.c b/tests/tpm-crb-test.c
index 6fde579bab1071f1cfd92bd88b49a0694b9790a3..a139caa51df17e48a171c2f7198eec3dcf6cb1cb 100644 (file)
--- a/tests/tpm-crb-test.c
+++ b/tests/tpm-crb-test.c
@@ -16,6 +16,7 @@
 #include "hw/acpi/tpm.h"
 #include "io/channel-socket.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "tpm-emu.h"
 
 #define TPM_CMD "\x80\x01\x00\x00\x00\x0c\x00\x00\x01\x44\x00\x00"

diff --git a/tests/tpm-tis-swtpm-test.c b/tests/tpm-tis-swtpm-test.c
index 7dcd1d3912ded781a35af983be06f24648dc1774..9f58a3a92b2fde019f5d89a94fffac2157e5b1fa 100644 (file)
--- a/tests/tpm-tis-swtpm-test.c
+++ b/tests/tpm-tis-swtpm-test.c
@@ -16,6 +16,7 @@
 #include <glib/gstdio.h>
 
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "tpm-tests.h"
 
 typedef struct TestState {

diff --git a/tests/tpm-tis-test.c b/tests/tpm-tis-test.c
index c8ec14888ffe7ddd04df689b4219a797d6ec54e7..92a7e95aad28a22c7005cbefa36fc0d8bcae830f 100644 (file)
--- a/tests/tpm-tis-test.c
+++ b/tests/tpm-tis-test.c
@@ -18,6 +18,7 @@
 #include "hw/acpi/tpm.h"
 #include "io/channel-socket.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "tpm-emu.h"
 
 #define TIS_REG(LOCTY, REG) \

diff --git a/tests/usb-hcd-ohci-test.c b/tests/usb-hcd-ohci-test.c
index 98af02e8988c752b1111e709534aaee6f0f303e5..c12b892085c824d1c0b034bf34c6c31c74fb59b7 100644 (file)
--- a/tests/usb-hcd-ohci-test.c
+++ b/tests/usb-hcd-ohci-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/usb.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 3817966010bd89df534680edd5aa5e0145c041c8..6ae8a23688a51809d8168809ed6af9da79629efd 100644 (file)
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -19,6 +19,7 @@
 #include "qemu/sockets.h"
 #include "chardev/char-fe.h"
 #include "qemu/memfd.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "libqos/libqos.h"
 #include "libqos/pci-pc.h"

diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c
index 16107ad280a58fd08bc622f72fb32f0377bb86a3..ac49bca99100f32cca50e1795583a1590f259831 100644 (file)
--- a/tests/virtio-9p-test.c
+++ b/tests/virtio-9p-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "hw/9pfs/9p.h"
 #include "hw/9pfs/9p-synth.h"
 #include "libqos/virtio-9p.h"

diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c
index fe1168a90ad0359ac2af4a3efaeefd94e18ba3f1..1b02714bc77bf2d3b6202b0852b876f48279c6f3 100644 (file)
--- a/tests/virtio-blk-test.c
+++ b/tests/virtio-blk-test.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "libqtest.h"
 #include "qemu/bswap.h"
+#include "qemu/module.h"
 #include "standard-headers/linux/virtio_blk.h"
 #include "standard-headers/linux/virtio_pci.h"
 #include "libqos/qgraph.h"

diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c
index 163126cf07e1aa401d7d91f3bff91a889cec1cf5..6a008bb552079cdf453861e5ab8a7dfb5155d106 100644 (file)
--- a/tests/virtio-net-test.c
+++ b/tests/virtio-net-test.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include "libqtest.h"
 #include "qemu/iov.h"
+#include "qemu/module.h"
 #include "qapi/qmp/qdict.h"
 #include "hw/virtio/virtio-net.h"
 #include "libqos/qgraph.h"

diff --git a/tests/virtio-rng-test.c b/tests/virtio-rng-test.c
index fcb22481bd385e7820e9079553137d8598bdc49e..a38a0d175bb156251f577fe7d10e15212cd72613 100644 (file)
--- a/tests/virtio-rng-test.c
+++ b/tests/virtio-rng-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/virtio-rng.h"
 

diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c
index 1e535cb1783c679bcc8dbd1048a2f9cff842deb7..1ad9f75d74f1f78c585c91b5469fd4c1a24bae60 100644 (file)
--- a/tests/virtio-scsi-test.c
+++ b/tests/virtio-scsi-test.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "scsi/constants.h"
 #include "libqos/libqos-pc.h"
 #include "libqos/libqos-spapr.h"

diff --git a/tests/virtio-serial-test.c b/tests/virtio-serial-test.c
index 85f35e09b7a59a1fd368b2fdfcc7277a60b5cf82..066ca61280fcfa79b22b6d8a9022e31476b55c9c 100644 (file)
--- a/tests/virtio-serial-test.c
+++ b/tests/virtio-serial-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/virtio-serial.h"
 
 /* Tests only initialization so far. TODO: Replace with functional tests */

diff --git a/tests/virtio-test.c b/tests/virtio-test.c
index 804e5371dc3c5a9b009de1c04c6141521f6620f3..f7c6afdcf11130a173a042db3a04eecc51d68a9b 100644 (file)
--- a/tests/virtio-test.c
+++ b/tests/virtio-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/tests/vmxnet3-test.c b/tests/vmxnet3-test.c
index 35cdea939b4a39d36426998fc0bbda86d4407cab..a81025252c87989952cea07c1c546d55e25639f0 100644 (file)
--- a/tests/vmxnet3-test.c
+++ b/tests/vmxnet3-test.c
@@ -9,6 +9,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qemu/module.h"
 #include "libqos/qgraph.h"
 #include "libqos/pci.h"
 

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 420b2411c1061a511e3ea0f9356ef9c845391339..89b16e0e440612a18864930d42a04b5b54889464 100644 (file)
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -36,6 +36,7 @@
 #include "qapi/qapi-commands-misc.h"
 #include "sysemu/blockdev.h"
 #include "qemu-version.h"
+#include "qemu/module.h"
 #include <Carbon/Carbon.h>
 #include "qom/cpu.h"
 

diff --git a/ui/console.c b/ui/console.c
index 6d2282d3e9072c89ecb198aca7bd00b04d9facca..eb7e7e0c517a3a62a3e5d52d4e49fcfe1e70f556 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -27,6 +27,7 @@
 #include "hw/qdev-core.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-ui.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/timer.h"
 #include "chardev/char-fe.h"

diff --git a/ui/curses.c b/ui/curses.c
index e9319eb8ae19b62a327bd3d50f6e3676738fca52..a6e260eb964d765cc18839027657f88cc14f18eb 100644 (file)
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 
 #ifndef _WIN32
@@ -33,7 +34,7 @@
 #include <iconv.h>
 
 #include "qapi/error.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 #include "ui/input.h"
 #include "sysemu/sysemu.h"

diff --git a/ui/egl-headless.c b/ui/egl-headless.c
index e67b47aeff8ad03e2864c3ffc17a4c515992e3b8..05b2e7d7b17f50d337c34f1935136de638b77833 100644 (file)
--- a/ui/egl-headless.c
+++ b/ui/egl-headless.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
 #include "ui/egl-helpers.h"

diff --git a/ui/input-linux.c b/ui/input-linux.c
index ba550dd274a1f0c084dc5af98ad2c7df849a3f26..c8d22f99d993ec7f6c1ef082937eb98ab49a2af1 100644 (file)
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -6,8 +6,8 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "qemu-common.h"
 #include "qemu/config-file.h"
+#include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "sysemu/sysemu.h"
 #include "ui/input.h"

diff --git a/ui/sdl2.c b/ui/sdl2.c
index 1277cf28fbcc425bb76ecc3f88c6e096e9ef9b89..b8a31197e87a52380d398e97f92f2f6900427442 100644 (file)
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -24,7 +24,7 @@
 /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "qemu/module.h"
 #include "ui/console.h"
 #include "ui/input.h"
 #include "ui/sdl2.h"

diff --git a/ui/spice-app.c b/ui/spice-app.c
index 30541b10224a11aaea7ae3a90a56600f9daf9d52..40fb2ef57399ab7921158620cdc66958a87b86aa 100644 (file)
--- a/ui/spice-app.c
+++ b/ui/spice-app.c
@@ -21,15 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 
 #include <gio/gio.h>
 
-#include "qemu-common.h"
 #include "ui/console.h"
 #include "qemu/config-file.h"
 #include "qemu/option.h"
 #include "qemu/cutils.h"
+#include "qemu/module.h"
 #include "qapi/error.h"
 #include "io/channel-command.h"
 #include "chardev/spice.h"

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 0632c74e9fcb882a00741ce4a253c7f0e8d3b638..2ffc3335f0f849ad4f45ce35a5832a8f3b18d478 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -22,6 +22,7 @@
 
 #include "ui/qemu-spice.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/thread.h"
 #include "qemu/timer.h"
 #include "qemu/queue.h"

diff --git a/ui/vnc.c b/ui/vnc.c
index d83f4a6ff929c5ecabd8a71f535062c527c0eec5..38f92bfca3d70409b76e86a2a072c00315f3b8b1 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -30,6 +30,7 @@
 #include "trace.h"
 #include "sysemu/sysemu.h"
 #include "qemu/error-report.h"
+#include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "qemu/timer.h"