Skip to content

Commit 9c17d61

Browse files
committed
softmmu: move include files to include/sysemu/
Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 1de7afc commit 9c17d61

File tree

296 files changed

+421
-421
lines changed

Some content is hidden

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

296 files changed

+421
-421
lines changed

Diff for: arch_init.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
#endif
3131
#include "config.h"
3232
#include "monitor/monitor.h"
33-
#include "sysemu.h"
33+
#include "sysemu/sysemu.h"
3434
#include "qemu/bitops.h"
3535
#include "qemu/bitmap.h"
36-
#include "arch_init.h"
36+
#include "sysemu/arch_init.h"
3737
#include "audio/audio.h"
3838
#include "hw/pc.h"
3939
#include "hw/pci/pci.h"
4040
#include "hw/audiodev.h"
41-
#include "kvm.h"
41+
#include "sysemu/kvm.h"
4242
#include "migration/migration.h"
4343
#include "exec/gdbstub.h"
4444
#include "hw/smbios.h"

Diff for: audio/audio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "audio.h"
2626
#include "monitor/monitor.h"
2727
#include "qemu/timer.h"
28-
#include "sysemu.h"
28+
#include "sysemu/sysemu.h"
2929

3030
#define AUDIO_CAP "audio"
3131
#include "audio_int.h"

Diff for: audio/winwaveaudio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* public domain */
22

33
#include "qemu-common.h"
4-
#include "sysemu.h"
4+
#include "sysemu/sysemu.h"
55
#include "audio.h"
66

77
#define AUDIO_CAP "winwave"

Diff for: balloon.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
#include "monitor/monitor.h"
2828
#include "exec/cpu-common.h"
29-
#include "kvm.h"
30-
#include "balloon.h"
29+
#include "sysemu/kvm.h"
30+
#include "sysemu/balloon.h"
3131
#include "trace.h"
3232
#include "qmp-commands.h"
3333
#include "qapi/qmp/qjson.h"

Diff for: block-migration.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "qemu/timer.h"
2121
#include "migration/block.h"
2222
#include "migration/migration.h"
23-
#include "blockdev.h"
23+
#include "sysemu/blockdev.h"
2424
#include <assert.h>
2525

2626
#define BLOCK_SIZE (BDRV_SECTORS_PER_DIRTY_CHUNK << BDRV_SECTOR_BITS)

Diff for: block.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "block/blockjob.h"
3030
#include "qemu/module.h"
3131
#include "qapi/qmp/qjson.h"
32-
#include "sysemu.h"
32+
#include "sysemu/sysemu.h"
3333
#include "qemu/notify.h"
3434
#include "block/coroutine.h"
3535
#include "qmp-commands.h"

Diff for: block/vdi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
#include <uuid/uuid.h>
5959
#else
6060
/* TODO: move uuid emulation to some central place in QEMU. */
61-
#include "sysemu.h" /* UUID_FMT */
61+
#include "sysemu/sysemu.h" /* UUID_FMT */
6262
typedef unsigned char uuid_t[16];
6363
#endif
6464

Diff for: blockdev-nbd.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
* later. See the COPYING file in the top-level directory.
1010
*/
1111

12-
#include "blockdev.h"
12+
#include "sysemu/blockdev.h"
1313
#include "hw/block-common.h"
1414
#include "monitor/monitor.h"
1515
#include "qapi/qmp/qerror.h"
16-
#include "sysemu.h"
16+
#include "sysemu/sysemu.h"
1717
#include "qmp-commands.h"
1818
#include "trace.h"
1919
#include "block/nbd.h"

Diff for: blockdev.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
* later. See the COPYING file in the top-level directory.
88
*/
99

10-
#include "blockdev.h"
10+
#include "sysemu/blockdev.h"
1111
#include "hw/block-common.h"
1212
#include "block/blockjob.h"
1313
#include "monitor/monitor.h"
1414
#include "qapi/qmp/qerror.h"
1515
#include "qemu/option.h"
1616
#include "qemu/config-file.h"
1717
#include "qapi/qmp/types.h"
18-
#include "sysemu.h"
18+
#include "sysemu/sysemu.h"
1919
#include "block/block_int.h"
2020
#include "qmp-commands.h"
2121
#include "trace.h"
22-
#include "arch_init.h"
22+
#include "sysemu/arch_init.h"
2323

2424
static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);
2525

Diff for: cpu-exec.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "disas/disas.h"
2222
#include "tcg.h"
2323
#include "qemu/atomic.h"
24-
#include "qtest.h"
24+
#include "sysemu/qtest.h"
2525

2626
int tb_invalidated_flag;
2727

Diff for: cpus.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
#include "config-host.h"
2727

2828
#include "monitor/monitor.h"
29-
#include "sysemu.h"
29+
#include "sysemu/sysemu.h"
3030
#include "exec/gdbstub.h"
31-
#include "dma.h"
32-
#include "kvm.h"
31+
#include "sysemu/dma.h"
32+
#include "sysemu/kvm.h"
3333
#include "qmp-commands.h"
3434

3535
#include "qemu/thread.h"
36-
#include "cpus.h"
37-
#include "qtest.h"
36+
#include "sysemu/cpus.h"
37+
#include "sysemu/qtest.h"
3838
#include "qemu/main-loop.h"
3939
#include "qemu/bitmap.h"
4040

Diff for: device_tree.c

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

2121
#include "config.h"
2222
#include "qemu-common.h"
23-
#include "device_tree.h"
23+
#include "sysemu/device_tree.h"
2424
#include "hw/loader.h"
2525
#include "qemu/option.h"
2626
#include "qemu/config-file.h"

Diff for: dma-helpers.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* (GNU GPL), version 2 or later.
88
*/
99

10-
#include "dma.h"
10+
#include "sysemu/dma.h"
1111
#include "trace.h"
1212
#include "qemu/range.h"
1313
#include "qemu/thread.h"

Diff for: dump-stub.c

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

1414
#include "qemu-common.h"
15-
#include "dump.h"
15+
#include "sysemu/dump.h"
1616
#include "qapi/qmp/qerror.h"
1717
#include "qmp-commands.h"
1818

Diff for: dump.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#include "exec/cpu-all.h"
1818
#include "exec/hwaddr.h"
1919
#include "monitor/monitor.h"
20-
#include "kvm.h"
21-
#include "dump.h"
22-
#include "sysemu.h"
23-
#include "memory_mapping.h"
20+
#include "sysemu/kvm.h"
21+
#include "sysemu/dump.h"
22+
#include "sysemu/sysemu.h"
23+
#include "sysemu/memory_mapping.h"
2424
#include "qapi/error.h"
2525
#include "qmp-commands.h"
2626
#include "exec/gdbstub.h"

Diff for: exec.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
#include "hw/hw.h"
3131
#include "hw/qdev.h"
3232
#include "qemu/osdep.h"
33-
#include "kvm.h"
33+
#include "sysemu/kvm.h"
3434
#include "hw/xen.h"
3535
#include "qemu/timer.h"
3636
#include "qemu/config-file.h"
3737
#include "exec/memory.h"
38-
#include "dma.h"
38+
#include "sysemu/dma.h"
3939
#include "exec/address-spaces.h"
4040
#if defined(CONFIG_USER_ONLY)
4141
#include <qemu.h>
4242
#else /* !CONFIG_USER_ONLY */
43-
#include "xen-mapcache.h"
43+
#include "sysemu/xen-mapcache.h"
4444
#include "trace.h"
4545
#endif
4646

Diff for: gdbstub.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
#else
3232
#include "monitor/monitor.h"
3333
#include "qemu-char.h"
34-
#include "sysemu.h"
34+
#include "sysemu/sysemu.h"
3535
#include "exec/gdbstub.h"
3636
#endif
3737

3838
#define MAX_PACKET_LENGTH 4096
3939

4040
#include "cpu.h"
4141
#include "qemu/sockets.h"
42-
#include "kvm.h"
42+
#include "sysemu/kvm.h"
4343

4444
#ifndef TARGET_CPU_MEMORY_RW_DEBUG
4545
static inline int target_memory_rw_debug(CPUArchState *env, target_ulong addr,

Diff for: hw/ac97.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "audiodev.h"
2222
#include "audio/audio.h"
2323
#include "pci/pci.h"
24-
#include "dma.h"
24+
#include "sysemu/dma.h"
2525

2626
enum {
2727
AC97_Reset = 0x00,

Diff for: hw/acpi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Contributions after 2012-01-13 are licensed under the terms of the
1919
* GNU GPL, version 2 or (at your option) any later version.
2020
*/
21-
#include "sysemu.h"
21+
#include "sysemu/sysemu.h"
2222
#include "hw.h"
2323
#include "pc.h"
2424
#include "acpi.h"

Diff for: hw/acpi_ich9.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#include "pc.h"
2828
#include "pci/pci.h"
2929
#include "qemu/timer.h"
30-
#include "sysemu.h"
30+
#include "sysemu/sysemu.h"
3131
#include "acpi.h"
32-
#include "kvm.h"
32+
#include "sysemu/kvm.h"
3333
#include "exec/address-spaces.h"
3434

3535
#include "ich9.h"

Diff for: hw/acpi_piix4.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "pm_smbus.h"
2525
#include "pci/pci.h"
2626
#include "acpi.h"
27-
#include "sysemu.h"
27+
#include "sysemu/sysemu.h"
2828
#include "qemu/range.h"
2929
#include "exec/ioport.h"
3030
#include "fw_cfg.h"

Diff for: hw/alpha_dp264.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "loader.h"
1212
#include "boards.h"
1313
#include "alpha_sys.h"
14-
#include "sysemu.h"
14+
#include "sysemu/sysemu.h"
1515
#include "mc146818rtc.h"
1616
#include "ide.h"
1717
#include "i8254.h"

Diff for: hw/alpha_pci.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "config.h"
1010
#include "alpha_sys.h"
1111
#include "qemu/log.h"
12-
#include "sysemu.h"
12+
#include "sysemu/sysemu.h"
1313

1414

1515
/* PCI IO reads/writes, to byte-word addressable memory. */

Diff for: hw/alpha_typhoon.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "exec/exec-all.h"
1111
#include "hw.h"
1212
#include "devices.h"
13-
#include "sysemu.h"
13+
#include "sysemu/sysemu.h"
1414
#include "alpha_sys.h"
1515
#include "exec/address-spaces.h"
1616

Diff for: hw/apb_pci.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "pci/pci_bridge.h"
3333
#include "pci/pci_bus.h"
3434
#include "apb_pci.h"
35-
#include "sysemu.h"
35+
#include "sysemu/sysemu.h"
3636
#include "exec/address-spaces.h"
3737

3838
/* debug APB */

Diff for: hw/apic_common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "apic.h"
2121
#include "apic_internal.h"
2222
#include "trace.h"
23-
#include "kvm.h"
23+
#include "sysemu/kvm.h"
2424

2525
static int apic_irq_delivered;
2626
bool apic_report_tpr_access;

Diff for: hw/arm_boot.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
#include "config.h"
1111
#include "hw.h"
1212
#include "arm-misc.h"
13-
#include "sysemu.h"
13+
#include "sysemu/sysemu.h"
1414
#include "boards.h"
1515
#include "loader.h"
1616
#include "elf.h"
17-
#include "device_tree.h"
17+
#include "sysemu/device_tree.h"
1818
#include "qemu/config-file.h"
1919

2020
#define KERNEL_ARGS_ADDR 0x100

Diff for: hw/arm_sysctl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "qemu/timer.h"
1212
#include "sysbus.h"
1313
#include "primecell.h"
14-
#include "sysemu.h"
14+
#include "sysemu/sysemu.h"
1515

1616
#define LOCK_VALUE 0xa05f
1717

Diff for: hw/axis_dev88.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "loader.h"
3131
#include "elf.h"
3232
#include "cris-boot.h"
33-
#include "blockdev.h"
33+
#include "sysemu/blockdev.h"
3434
#include "exec/address-spaces.h"
3535

3636
#define D(x)

Diff for: hw/block-common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* later. See the COPYING file in the top-level directory.
88
*/
99

10-
#include "blockdev.h"
10+
#include "sysemu/blockdev.h"
1111
#include "hw/block-common.h"
1212
#include "qemu/error-report.h"
1313

Diff for: hw/boards.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifndef HW_BOARDS_H
44
#define HW_BOARDS_H
55

6-
#include "blockdev.h"
6+
#include "sysemu/blockdev.h"
77
#include "qdev.h"
88

99
typedef struct QEMUMachineInitArgs {

Diff for: hw/bonito.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include "pc.h"
4545
#include "mips.h"
4646
#include "pci/pci_host.h"
47-
#include "sysemu.h"
47+
#include "sysemu/sysemu.h"
4848
#include "exec/address-spaces.h"
4949

5050
//#define DEBUG_BONITO

Diff for: hw/cbus.c

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

2828
//#define DEBUG
2929

Diff for: hw/collie.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "strongarm.h"
1616
#include "arm-misc.h"
1717
#include "flash.h"
18-
#include "blockdev.h"
18+
#include "sysemu/blockdev.h"
1919
#include "exec/address-spaces.h"
2020

2121
static struct arm_boot_info collie_binfo = {

Diff for: hw/cuda.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "ppc_mac.h"
2727
#include "adb.h"
2828
#include "qemu/timer.h"
29-
#include "sysemu.h"
29+
#include "sysemu/sysemu.h"
3030

3131
/* XXX: implement all timer modes */
3232

0 commit comments

Comments
 (0)