Skip to content

Commit 1de7afc

Browse files
bonzinibonzini
committed
misc: move include files to include/qemu/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 14cccb6 commit 1de7afc

File tree

496 files changed

+673
-673
lines changed

Some content is hidden

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

496 files changed

+673
-673
lines changed

‎acl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525

2626
#include "qemu-common.h"
27-
#include "acl.h"
27+
#include "qemu/acl.h"
2828

2929
#ifdef CONFIG_FNMATCH
3030
#include <fnmatch.h>

‎aio-posix.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
#include "qemu-common.h"
1717
#include "block/block.h"
18-
#include "qemu-queue.h"
19-
#include "qemu_socket.h"
18+
#include "qemu/queue.h"
19+
#include "qemu/sockets.h"
2020

2121
struct AioHandler
2222
{

‎aio-win32.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
#include "qemu-common.h"
1919
#include "block/block.h"
20-
#include "qemu-queue.h"
21-
#include "qemu_socket.h"
20+
#include "qemu/queue.h"
21+
#include "qemu/sockets.h"
2222

2323
struct AioHandler {
2424
EventNotifier *e;

‎arch_init.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include "config.h"
3232
#include "monitor/monitor.h"
3333
#include "sysemu.h"
34-
#include "bitops.h"
35-
#include "bitmap.h"
34+
#include "qemu/bitops.h"
35+
#include "qemu/bitmap.h"
3636
#include "arch_init.h"
3737
#include "audio/audio.h"
3838
#include "hw/pc.h"
@@ -45,7 +45,7 @@
4545
#include "exec/address-spaces.h"
4646
#include "hw/pcspk.h"
4747
#include "migration/page_cache.h"
48-
#include "qemu-config.h"
48+
#include "qemu/config-file.h"
4949
#include "qmp-commands.h"
5050
#include "trace.h"
5151

‎async.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "qemu-common.h"
2626
#include "block/aio.h"
27-
#include "main-loop.h"
27+
#include "qemu/main-loop.h"
2828

2929
/***********************************************************/
3030
/* bottom halves (can be seen as timers which expire ASAP) */

‎audio/alsaaudio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
#include <alsa/asoundlib.h>
2525
#include "qemu-common.h"
26-
#include "main-loop.h"
26+
#include "qemu/main-loop.h"
2727
#include "audio.h"
2828

2929
#if QEMU_GNUC_PREREQ(4, 3)

‎audio/audio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "hw/hw.h"
2525
#include "audio.h"
2626
#include "monitor/monitor.h"
27-
#include "qemu-timer.h"
27+
#include "qemu/timer.h"
2828
#include "sysemu.h"
2929

3030
#define AUDIO_CAP "audio"

‎audio/audio.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define QEMU_AUDIO_H
2626

2727
#include "config-host.h"
28-
#include "qemu-queue.h"
28+
#include "qemu/queue.h"
2929

3030
typedef void (*audio_callback_fn) (void *opaque, int avail);
3131

‎audio/noaudio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
#include "qemu-common.h"
2525
#include "audio.h"
26-
#include "qemu-timer.h"
26+
#include "qemu/timer.h"
2727

2828
#define AUDIO_CAP "noaudio"
2929
#include "audio_int.h"

‎audio/ossaudio.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
#include <sys/soundcard.h>
3232
#endif
3333
#include "qemu-common.h"
34-
#include "main-loop.h"
35-
#include "host-utils.h"
34+
#include "qemu/main-loop.h"
35+
#include "qemu/host-utils.h"
3636
#include "audio.h"
3737

3838
#define AUDIO_CAP "oss"

‎audio/spiceaudio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
#include "hw/hw.h"
21-
#include "qemu-timer.h"
21+
#include "qemu/timer.h"
2222
#include "ui/qemu-spice.h"
2323

2424
#define AUDIO_CAP "spice"

‎audio/wavaudio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* THE SOFTWARE.
2323
*/
2424
#include "hw/hw.h"
25-
#include "qemu-timer.h"
25+
#include "qemu/timer.h"
2626
#include "audio.h"
2727

2828
#define AUDIO_CAP "wav"

‎backends/rng-random.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "qemu/rng-random.h"
1414
#include "qemu/rng.h"
1515
#include "qapi/qmp/qerror.h"
16-
#include "main-loop.h"
16+
#include "qemu/main-loop.h"
1717

1818
struct RndRandom
1919
{

‎bitmap.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
* Version 2.
1010
*/
1111

12-
#include "bitops.h"
13-
#include "bitmap.h"
12+
#include "qemu/bitops.h"
13+
#include "qemu/bitmap.h"
1414

1515
/*
1616
* bitmaps provide an array of bits, implemented using an an

‎bitops.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* 2 of the License, or (at your option) any later version.
1212
*/
1313

14-
#include "bitops.h"
14+
#include "qemu/bitops.h"
1515

1616
#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
1717

‎block-migration.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "qemu-common.h"
1717
#include "block/block_int.h"
1818
#include "hw/hw.h"
19-
#include "qemu-queue.h"
20-
#include "qemu-timer.h"
19+
#include "qemu/queue.h"
20+
#include "qemu/timer.h"
2121
#include "migration/block.h"
2222
#include "migration/migration.h"
2323
#include "blockdev.h"

‎block.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
#include "monitor/monitor.h"
2828
#include "block/block_int.h"
2929
#include "block/blockjob.h"
30-
#include "module.h"
30+
#include "qemu/module.h"
3131
#include "qapi/qmp/qjson.h"
3232
#include "sysemu.h"
33-
#include "notify.h"
33+
#include "qemu/notify.h"
3434
#include "block/coroutine.h"
3535
#include "qmp-commands.h"
36-
#include "qemu-timer.h"
36+
#include "qemu/timer.h"
3737

3838
#ifdef CONFIG_BSD
3939
#include <sys/types.h>

‎block/blkdebug.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
*/
2424

2525
#include "qemu-common.h"
26-
#include "qemu-config.h"
26+
#include "qemu/config-file.h"
2727
#include "block/block_int.h"
28-
#include "module.h"
28+
#include "qemu/module.h"
2929

3030
typedef struct BDRVBlkdebugState {
3131
int state;

‎block/blkverify.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include <stdarg.h>
11-
#include "qemu_socket.h" /* for EINPROGRESS on Windows */
11+
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
1212
#include "block/block_int.h"
1313

1414
typedef struct {

‎block/bochs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
#include "qemu-common.h"
2626
#include "block/block_int.h"
27-
#include "module.h"
27+
#include "qemu/module.h"
2828

2929
/**************************************************************/
3030

‎block/cloop.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
#include "qemu-common.h"
2525
#include "block/block_int.h"
26-
#include "module.h"
26+
#include "qemu/module.h"
2727
#include <zlib.h>
2828

2929
typedef struct BDRVCloopState {

‎block/cow.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
#include "qemu-common.h"
2525
#include "block/block_int.h"
26-
#include "module.h"
26+
#include "qemu/module.h"
2727

2828
/**************************************************************/
2929
/* COW block driver using file system holes */

‎block/dmg.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
#include "qemu-common.h"
2525
#include "block/block_int.h"
26-
#include "bswap.h"
27-
#include "module.h"
26+
#include "qemu/bswap.h"
27+
#include "qemu/module.h"
2828
#include <zlib.h>
2929

3030
typedef struct BDRVDMGState {

‎block/gluster.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
#include <glusterfs/api/glfs.h>
1919
#include "block/block_int.h"
20-
#include "qemu_socket.h"
21-
#include "uri.h"
20+
#include "qemu/sockets.h"
21+
#include "qemu/uri.h"
2222

2323
typedef struct GlusterAIOCB {
2424
BlockDriverAIOCB common;

‎block/iscsi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include <poll.h>
2828
#include <arpa/inet.h>
2929
#include "qemu-common.h"
30-
#include "qemu-config.h"
31-
#include "qemu-error.h"
30+
#include "qemu/config-file.h"
31+
#include "qemu/error-report.h"
3232
#include "block/block_int.h"
3333
#include "trace.h"
3434
#include "hw/scsi-defs.h"

‎block/linux-aio.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
*/
1010
#include "qemu-common.h"
1111
#include "block/aio.h"
12-
#include "qemu-queue.h"
12+
#include "qemu/queue.h"
1313
#include "block/raw-aio.h"
14-
#include "event_notifier.h"
14+
#include "qemu/event_notifier.h"
1515

1616
#include <libaio.h>
1717

‎block/nbd.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828

2929
#include "qemu-common.h"
3030
#include "block/nbd.h"
31-
#include "uri.h"
31+
#include "qemu/uri.h"
3232
#include "block/block_int.h"
33-
#include "module.h"
34-
#include "qemu_socket.h"
33+
#include "qemu/module.h"
34+
#include "qemu/sockets.h"
3535

3636
#include <sys/types.h>
3737
#include <unistd.h>

‎block/parallels.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
#include "qemu-common.h"
2727
#include "block/block_int.h"
28-
#include "module.h"
28+
#include "qemu/module.h"
2929

3030
/**************************************************************/
3131

‎block/qcow.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
#include "qemu-common.h"
2525
#include "block/block_int.h"
26-
#include "module.h"
26+
#include "qemu/module.h"
2727
#include <zlib.h>
2828
#include "block/aes.h"
2929
#include "migration/migration.h"

‎block/qcow2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
*/
2424
#include "qemu-common.h"
2525
#include "block/block_int.h"
26-
#include "module.h"
26+
#include "qemu/module.h"
2727
#include <zlib.h>
2828
#include "block/aes.h"
2929
#include "block/qcow2.h"
30-
#include "qemu-error.h"
30+
#include "qemu/error-report.h"
3131
#include "qapi/qmp/qerror.h"
3232
#include "trace.h"
3333

‎block/qed-table.c

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

1515
#include "trace.h"
16-
#include "qemu_socket.h" /* for EINPROGRESS on Windows */
16+
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
1717
#include "qed.h"
1818

1919
typedef struct {

‎block/qed.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*/
1414

15-
#include "qemu-timer.h"
15+
#include "qemu/timer.h"
1616
#include "trace.h"
1717
#include "qed.h"
1818
#include "qapi/qmp/qerror.h"

‎block/raw-posix.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
* THE SOFTWARE.
2323
*/
2424
#include "qemu-common.h"
25-
#include "qemu-timer.h"
26-
#include "qemu-log.h"
25+
#include "qemu/timer.h"
26+
#include "qemu/log.h"
2727
#include "block/block_int.h"
28-
#include "module.h"
28+
#include "qemu/module.h"
2929
#include "trace.h"
3030
#include "block/thread-pool.h"
31-
#include "iov.h"
31+
#include "qemu/iov.h"
3232
#include "raw-aio.h"
3333

3434
#if defined(__APPLE__) && (__MACH__)

‎block/raw-win32.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
* THE SOFTWARE.
2323
*/
2424
#include "qemu-common.h"
25-
#include "qemu-timer.h"
25+
#include "qemu/timer.h"
2626
#include "block/block_int.h"
27-
#include "module.h"
27+
#include "qemu/module.h"
2828
#include "raw-aio.h"
2929
#include "trace.h"
3030
#include "block/thread-pool.h"
31-
#include "iov.h"
31+
#include "qemu/iov.h"
3232
#include <windows.h>
3333
#include <winioctl.h>
3434

‎block/raw.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#include "qemu-common.h"
33
#include "block/block_int.h"
4-
#include "module.h"
4+
#include "qemu/module.h"
55

66
static int raw_open(BlockDriverState *bs, int flags)
77
{

‎block/rbd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <inttypes.h>
1515

1616
#include "qemu-common.h"
17-
#include "qemu-error.h"
17+
#include "qemu/error-report.h"
1818
#include "block/block_int.h"
1919

2020
#include <rbd/librbd.h>

0 commit comments

Comments
 (0)