Skip to content

Commit 0b8fa32

Browse files
author
Markus Armbruster
committed
Include qemu/module.h where needed, drop it from qemu-common.h
Signed-off-by: Markus Armbruster <[email protected]> Message-Id: <[email protected]> [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]
1 parent 856dfd8 commit 0b8fa32

File tree

761 files changed

+875
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

761 files changed

+875
-131
lines changed

‎audio/alsaaudio.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24+
2425
#include "qemu/osdep.h"
2526
#include <alsa/asoundlib.h>
26-
#include "qemu-common.h"
2727
#include "qemu/main-loop.h"
28+
#include "qemu/module.h"
2829
#include "audio.h"
2930
#include "trace.h"
3031

‎audio/audio.c

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24+
2425
#include "qemu/osdep.h"
2526
#include "hw/hw.h"
2627
#include "audio.h"
@@ -31,6 +32,7 @@
3132
#include "qapi/qapi-visit-audio.h"
3233
#include "sysemu/sysemu.h"
3334
#include "qemu/cutils.h"
35+
#include "qemu/module.h"
3436
#include "sysemu/replay.h"
3537
#include "trace.h"
3638

‎audio/coreaudio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <CoreAudio/CoreAudio.h>
2727
#include <pthread.h> /* pthread_X */
2828

29-
#include "qemu-common.h"
29+
#include "qemu/module.h"
3030
#include "audio.h"
3131

3232
#define AUDIO_CAP "coreaudio"

‎audio/dsoundaudio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
*/
2828

2929
#include "qemu/osdep.h"
30-
#include "qemu-common.h"
3130
#include "audio.h"
3231

3332
#define AUDIO_CAP "dsound"
3433
#include "audio_int.h"
3534
#include "qemu/host-utils.h"
35+
#include "qemu/module.h"
3636

3737
#include <windows.h>
3838
#include <mmsystem.h>

‎audio/noaudio.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24+
2425
#include "qemu/osdep.h"
25-
#include "qemu-common.h"
2626
#include "qemu/host-utils.h"
27+
#include "qemu/module.h"
2728
#include "audio.h"
2829
#include "qemu/timer.h"
2930

‎audio/ossaudio.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24+
2425
#include "qemu/osdep.h"
2526
#include <sys/ioctl.h>
2627
#include <sys/soundcard.h>
27-
#include "qemu-common.h"
2828
#include "qemu/main-loop.h"
29+
#include "qemu/module.h"
2930
#include "qemu/host-utils.h"
3031
#include "audio.h"
3132
#include "trace.h"

‎audio/paaudio.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* public domain */
2+
23
#include "qemu/osdep.h"
3-
#include "qemu-common.h"
4+
#include "qemu/module.h"
45
#include "audio.h"
56
#include "qapi/opts-visitor.h"
67

‎audio/sdlaudio.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24+
2425
#include "qemu/osdep.h"
2526
#include <SDL.h>
2627
#include <SDL_thread.h>
27-
#include "qemu-common.h"
28+
#include "qemu/module.h"
2829
#include "audio.h"
2930

3031
#ifndef _WIN32

‎audio/spiceaudio.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "qemu/osdep.h"
2121
#include "hw/hw.h"
2222
#include "qemu/host-utils.h"
23+
#include "qemu/module.h"
2324
#include "qemu/error-report.h"
2425
#include "qemu/timer.h"
2526
#include "ui/qemu-spice.h"

‎audio/wavaudio.c

+2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2222
* THE SOFTWARE.
2323
*/
24+
2425
#include "qemu/osdep.h"
2526
#include "qemu/host-utils.h"
27+
#include "qemu/module.h"
2628
#include "qemu/timer.h"
2729
#include "qapi/opts-visitor.h"
2830
#include "audio.h"

‎authz/base.c

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "qemu/osdep.h"
2222
#include "authz/base.h"
23+
#include "qemu/module.h"
2324
#include "trace.h"
2425

2526
bool qauthz_is_allowed(QAuthZ *authz,

‎authz/list.c

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "trace.h"
2424
#include "qom/object_interfaces.h"
2525
#include "qapi/qapi-visit-authz.h"
26+
#include "qemu/module.h"
2627

2728
static bool qauthz_list_is_allowed(QAuthZ *authz,
2829
const char *identity,

‎authz/listfile.c

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "trace.h"
2424
#include "qemu/error-report.h"
2525
#include "qemu/main-loop.h"
26+
#include "qemu/module.h"
2627
#include "qemu/sockets.h"
2728
#include "qemu/filemonitor.h"
2829
#include "qom/object_interfaces.h"

‎authz/pamacct.c

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "qemu/osdep.h"
2222
#include "authz/pamacct.h"
2323
#include "trace.h"
24+
#include "qemu/module.h"
2425
#include "qom/object_interfaces.h"
2526

2627
#include <security/pam_appl.h>

‎authz/simple.c

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "qemu/osdep.h"
2222
#include "authz/simple.h"
2323
#include "trace.h"
24+
#include "qemu/module.h"
2425
#include "qom/object_interfaces.h"
2526

2627
static bool qauthz_simple_is_allowed(QAuthZ *authz,

‎backends/hostmem-file.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
* This work is licensed under the terms of the GNU GPL, version 2 or later.
1010
* See the COPYING file in the top-level directory.
1111
*/
12+
1213
#include "qemu/osdep.h"
1314
#include "qapi/error.h"
14-
#include "qemu-common.h"
1515
#include "qemu/error-report.h"
16+
#include "qemu/module.h"
1617
#include "sysemu/hostmem.h"
1718
#include "sysemu/sysemu.h"
1819
#include "qom/object_interfaces.h"

‎backends/hostmem-memfd.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
* This work is licensed under the terms of the GNU GPL, version 2 or later.
1010
* See the COPYING file in the top-level directory.
1111
*/
12+
1213
#include "qemu/osdep.h"
13-
#include "qemu-common.h"
1414
#include "sysemu/hostmem.h"
1515
#include "sysemu/sysemu.h"
1616
#include "qom/object_interfaces.h"
1717
#include "qemu/memfd.h"
18+
#include "qemu/module.h"
1819
#include "qapi/error.h"
1920

2021
#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"

‎backends/hostmem-ram.c

+2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
* This work is licensed under the terms of the GNU GPL, version 2 or later.
1010
* See the COPYING file in the top-level directory.
1111
*/
12+
1213
#include "qemu/osdep.h"
1314
#include "sysemu/hostmem.h"
1415
#include "qapi/error.h"
16+
#include "qemu/module.h"
1517
#include "qom/object_interfaces.h"
1618

1719
#define TYPE_MEMORY_BACKEND_RAM "memory-backend-ram"

‎backends/rng-egd.c

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "chardev/char-fe.h"
1616
#include "qapi/error.h"
1717
#include "qapi/qmp/qerror.h"
18+
#include "qemu/module.h"
1819

1920
#define TYPE_RNG_EGD "rng-egd"
2021
#define RNG_EGD(obj) OBJECT_CHECK(RngEgd, (obj), TYPE_RNG_EGD)

‎backends/rng-random.c

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "qapi/error.h"
1717
#include "qapi/qmp/qerror.h"
1818
#include "qemu/main-loop.h"
19+
#include "qemu/module.h"
1920

2021
struct RngRandom
2122
{

‎backends/rng.c

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "sysemu/rng.h"
1515
#include "qapi/error.h"
1616
#include "qapi/qmp/qerror.h"
17+
#include "qemu/module.h"
1718
#include "qom/object_interfaces.h"
1819

1920
void rng_backend_request_entropy(RngBackend *s, size_t size,

‎backends/tpm.c

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "sysemu/tpm.h"
1919
#include "qemu/thread.h"
2020
#include "qemu/main-loop.h"
21+
#include "qemu/module.h"
2122
#include "block/thread-pool.h"
2223
#include "qemu/error-report.h"
2324

‎block/blklogwrites.c

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include "qapi/qmp/qdict.h"
1717
#include "qapi/qmp/qstring.h"
1818
#include "qemu/cutils.h"
19+
#include "qemu/module.h"
1920
#include "qemu/option.h"
2021

2122
/* Disk format stuff - taken from Linux drivers/md/dm-log-writes.c */

‎block/blkreplay.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111

1212
#include "qemu/osdep.h"
13-
#include "qemu-common.h"
13+
#include "qemu/module.h"
1414
#include "block/block_int.h"
1515
#include "sysemu/replay.h"
1616
#include "qapi/error.h"

‎block/blkverify.c

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "qapi/qmp/qdict.h"
1515
#include "qapi/qmp/qstring.h"
1616
#include "qemu/cutils.h"
17+
#include "qemu/module.h"
1718
#include "qemu/option.h"
1819

1920
typedef struct {

‎block/copy-on-read.c

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
#include "qemu/osdep.h"
2424
#include "block/block_int.h"
25+
#include "qemu/module.h"
2526

2627

2728
static int cor_open(BlockDriverState *bs, QDict *options, int flags,

‎block/crypto.c

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "qapi/qapi-visit-crypto.h"
2929
#include "qapi/qobject-input-visitor.h"
3030
#include "qapi/error.h"
31+
#include "qemu/module.h"
3132
#include "qemu/option.h"
3233
#include "crypto.h"
3334

‎block/curl.c

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "qemu/osdep.h"
2626
#include "qapi/error.h"
2727
#include "qemu/error-report.h"
28+
#include "qemu/module.h"
2829
#include "qemu/option.h"
2930
#include "block/block_int.h"
3031
#include "qapi/qmp/qdict.h"

‎block/gluster.c

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "qapi/qmp/qerror.h"
1919
#include "qemu/uri.h"
2020
#include "qemu/error-report.h"
21+
#include "qemu/module.h"
2122
#include "qemu/option.h"
2223
#include "qemu/cutils.h"
2324

‎block/iscsi-opts.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424

2525
#include "qemu/osdep.h"
26-
#include "qemu-common.h"
2726
#include "qemu/config-file.h"
27+
#include "qemu/module.h"
2828
#include "qemu/option.h"
2929

3030
static QemuOptsList qemu_iscsi_opts = {

‎block/iscsi.c

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "block/qdict.h"
3737
#include "scsi/constants.h"
3838
#include "qemu/iov.h"
39+
#include "qemu/module.h"
3940
#include "qemu/option.h"
4041
#include "qemu/uuid.h"
4142
#include "qapi/error.h"

‎block/nfs.c

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "block/qdict.h"
3333
#include "trace.h"
3434
#include "qemu/iov.h"
35+
#include "qemu/module.h"
3536
#include "qemu/option.h"
3637
#include "qemu/uri.h"
3738
#include "qemu/cutils.h"

‎block/null.c

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "qapi/error.h"
1515
#include "qapi/qmp/qdict.h"
1616
#include "qapi/qmp/qstring.h"
17+
#include "qemu/module.h"
1718
#include "qemu/option.h"
1819
#include "block/block_int.h"
1920

‎block/nvme.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "qapi/qmp/qdict.h"
1818
#include "qapi/qmp/qstring.h"
1919
#include "qemu/error-report.h"
20+
#include "qemu/module.h"
2021
#include "qemu/cutils.h"
2122
#include "qemu/option.h"
2223
#include "qemu/vfio-helpers.h"

‎block/qed.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "qapi/error.h"
1818
#include "qemu/timer.h"
1919
#include "qemu/bswap.h"
20+
#include "qemu/module.h"
2021
#include "qemu/option.h"
2122
#include "trace.h"
2223
#include "qed.h"

‎block/quorum.c

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include "qemu/osdep.h"
1717
#include "qemu/cutils.h"
18+
#include "qemu/module.h"
1819
#include "qemu/option.h"
1920
#include "block/block_int.h"
2021
#include "block/qdict.h"

‎block/raw-format.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "qemu/osdep.h"
3030
#include "block/block_int.h"
3131
#include "qapi/error.h"
32+
#include "qemu/module.h"
3233
#include "qemu/option.h"
3334

3435
typedef struct BDRVRawState {

‎block/rbd.c

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <rbd/librbd.h>
1717
#include "qapi/error.h"
1818
#include "qemu/error-report.h"
19+
#include "qemu/module.h"
1920
#include "qemu/option.h"
2021
#include "block/block_int.h"
2122
#include "block/qdict.h"

‎block/replication.c

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*/
1414

1515
#include "qemu/osdep.h"
16+
#include "qemu/module.h"
1617
#include "qemu/option.h"
1718
#include "block/nbd.h"
1819
#include "block/blockjob.h"

‎block/sheepdog.c

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "qapi/qobject-output-visitor.h"
2222
#include "qemu/uri.h"
2323
#include "qemu/error-report.h"
24+
#include "qemu/module.h"
2425
#include "qemu/option.h"
2526
#include "qemu/sockets.h"
2627
#include "block/block_int.h"

‎block/ssh.c

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "block/qdict.h"
3232
#include "qapi/error.h"
3333
#include "qemu/error-report.h"
34+
#include "qemu/module.h"
3435
#include "qemu/option.h"
3536
#include "qemu/ctype.h"
3637
#include "qemu/cutils.h"

‎block/throttle.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "qemu/osdep.h"
2121
#include "block/throttle-groups.h"
22+
#include "qemu/module.h"
2223
#include "qemu/option.h"
2324
#include "qemu/throttle-options.h"
2425
#include "qapi/error.h"

0 commit comments

Comments
 (0)