Skip to content

Commit

Permalink
softmmu: move include files to include/sysemu/
Browse files Browse the repository at this point in the history
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
bonzini committed Dec 19, 2012
1 parent 1de7afc commit 9c17d61
Show file tree
Hide file tree
Showing 296 changed files with 421 additions and 421 deletions.
6 changes: 3 additions & 3 deletions arch_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
#endif
#include "config.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qemu/bitops.h"
#include "qemu/bitmap.h"
#include "arch_init.h"
#include "sysemu/arch_init.h"
#include "audio/audio.h"
#include "hw/pc.h"
#include "hw/pci/pci.h"
#include "hw/audiodev.h"
#include "kvm.h"
#include "sysemu/kvm.h"
#include "migration/migration.h"
#include "exec/gdbstub.h"
#include "hw/smbios.h"
Expand Down
2 changes: 1 addition & 1 deletion audio/audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "audio.h"
#include "monitor/monitor.h"
#include "qemu/timer.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"

#define AUDIO_CAP "audio"
#include "audio_int.h"
Expand Down
2 changes: 1 addition & 1 deletion audio/winwaveaudio.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* public domain */

#include "qemu-common.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "audio.h"

#define AUDIO_CAP "winwave"
Expand Down
4 changes: 2 additions & 2 deletions balloon.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

#include "monitor/monitor.h"
#include "exec/cpu-common.h"
#include "kvm.h"
#include "balloon.h"
#include "sysemu/kvm.h"
#include "sysemu/balloon.h"
#include "trace.h"
#include "qmp-commands.h"
#include "qapi/qmp/qjson.h"
Expand Down
2 changes: 1 addition & 1 deletion block-migration.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "qemu/timer.h"
#include "migration/block.h"
#include "migration/migration.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include <assert.h>

#define BLOCK_SIZE (BDRV_SECTORS_PER_DIRTY_CHUNK << BDRV_SECTOR_BITS)
Expand Down
2 changes: 1 addition & 1 deletion block.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "block/blockjob.h"
#include "qemu/module.h"
#include "qapi/qmp/qjson.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qemu/notify.h"
#include "block/coroutine.h"
#include "qmp-commands.h"
Expand Down
2 changes: 1 addition & 1 deletion block/vdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#include <uuid/uuid.h>
#else
/* TODO: move uuid emulation to some central place in QEMU. */
#include "sysemu.h" /* UUID_FMT */
#include "sysemu/sysemu.h" /* UUID_FMT */
typedef unsigned char uuid_t[16];
#endif

Expand Down
4 changes: 2 additions & 2 deletions blockdev-nbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
* later. See the COPYING file in the top-level directory.
*/

#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qmp-commands.h"
#include "trace.h"
#include "block/nbd.h"
Expand Down
6 changes: 3 additions & 3 deletions blockdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
* later. See the COPYING file in the top-level directory.
*/

#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "block/blockjob.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qapi/qmp/types.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "block/block_int.h"
#include "qmp-commands.h"
#include "trace.h"
#include "arch_init.h"
#include "sysemu/arch_init.h"

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

Expand Down
2 changes: 1 addition & 1 deletion cpu-exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "disas/disas.h"
#include "tcg.h"
#include "qemu/atomic.h"
#include "qtest.h"
#include "sysemu/qtest.h"

int tb_invalidated_flag;

Expand Down
10 changes: 5 additions & 5 deletions cpus.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
#include "config-host.h"

#include "monitor/monitor.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#include "dma.h"
#include "kvm.h"
#include "sysemu/dma.h"
#include "sysemu/kvm.h"
#include "qmp-commands.h"

#include "qemu/thread.h"
#include "cpus.h"
#include "qtest.h"
#include "sysemu/cpus.h"
#include "sysemu/qtest.h"
#include "qemu/main-loop.h"
#include "qemu/bitmap.h"

Expand Down
2 changes: 1 addition & 1 deletion device_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "config.h"
#include "qemu-common.h"
#include "device_tree.h"
#include "sysemu/device_tree.h"
#include "hw/loader.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
Expand Down
2 changes: 1 addition & 1 deletion dma-helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* (GNU GPL), version 2 or later.
*/

#include "dma.h"
#include "sysemu/dma.h"
#include "trace.h"
#include "qemu/range.h"
#include "qemu/thread.h"
Expand Down
2 changes: 1 addition & 1 deletion dump-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/

#include "qemu-common.h"
#include "dump.h"
#include "sysemu/dump.h"
#include "qapi/qmp/qerror.h"
#include "qmp-commands.h"

Expand Down
8 changes: 4 additions & 4 deletions dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
#include "exec/cpu-all.h"
#include "exec/hwaddr.h"
#include "monitor/monitor.h"
#include "kvm.h"
#include "dump.h"
#include "sysemu.h"
#include "memory_mapping.h"
#include "sysemu/kvm.h"
#include "sysemu/dump.h"
#include "sysemu/sysemu.h"
#include "sysemu/memory_mapping.h"
#include "qapi/error.h"
#include "qmp-commands.h"
#include "exec/gdbstub.h"
Expand Down
6 changes: 3 additions & 3 deletions exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@
#include "hw/hw.h"
#include "hw/qdev.h"
#include "qemu/osdep.h"
#include "kvm.h"
#include "sysemu/kvm.h"
#include "hw/xen.h"
#include "qemu/timer.h"
#include "qemu/config-file.h"
#include "exec/memory.h"
#include "dma.h"
#include "sysemu/dma.h"
#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#else /* !CONFIG_USER_ONLY */
#include "xen-mapcache.h"
#include "sysemu/xen-mapcache.h"
#include "trace.h"
#endif

Expand Down
4 changes: 2 additions & 2 deletions gdbstub.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
#else
#include "monitor/monitor.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#endif

#define MAX_PACKET_LENGTH 4096

#include "cpu.h"
#include "qemu/sockets.h"
#include "kvm.h"
#include "sysemu/kvm.h"

#ifndef TARGET_CPU_MEMORY_RW_DEBUG
static inline int target_memory_rw_debug(CPUArchState *env, target_ulong addr,
Expand Down
2 changes: 1 addition & 1 deletion hw/ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "audiodev.h"
#include "audio/audio.h"
#include "pci/pci.h"
#include "dma.h"
#include "sysemu/dma.h"

enum {
AC97_Reset = 0x00,
Expand Down
2 changes: 1 addition & 1 deletion hw/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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 "sysemu.h"
#include "sysemu/sysemu.h"
#include "hw.h"
#include "pc.h"
#include "acpi.h"
Expand Down
4 changes: 2 additions & 2 deletions hw/acpi_ich9.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
#include "pc.h"
#include "pci/pci.h"
#include "qemu/timer.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "acpi.h"
#include "kvm.h"
#include "sysemu/kvm.h"
#include "exec/address-spaces.h"

#include "ich9.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/acpi_piix4.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "pm_smbus.h"
#include "pci/pci.h"
#include "acpi.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "qemu/range.h"
#include "exec/ioport.h"
#include "fw_cfg.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/alpha_dp264.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "loader.h"
#include "boards.h"
#include "alpha_sys.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "mc146818rtc.h"
#include "ide.h"
#include "i8254.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/alpha_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "config.h"
#include "alpha_sys.h"
#include "qemu/log.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"


/* PCI IO reads/writes, to byte-word addressable memory. */
Expand Down
2 changes: 1 addition & 1 deletion hw/alpha_typhoon.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "exec/exec-all.h"
#include "hw.h"
#include "devices.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/apb_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "pci/pci_bridge.h"
#include "pci/pci_bus.h"
#include "apb_pci.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"

/* debug APB */
Expand Down
2 changes: 1 addition & 1 deletion hw/apic_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "apic.h"
#include "apic_internal.h"
#include "trace.h"
#include "kvm.h"
#include "sysemu/kvm.h"

static int apic_irq_delivered;
bool apic_report_tpr_access;
Expand Down
4 changes: 2 additions & 2 deletions hw/arm_boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#include "config.h"
#include "hw.h"
#include "arm-misc.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "boards.h"
#include "loader.h"
#include "elf.h"
#include "device_tree.h"
#include "sysemu/device_tree.h"
#include "qemu/config-file.h"

#define KERNEL_ARGS_ADDR 0x100
Expand Down
2 changes: 1 addition & 1 deletion hw/arm_sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "qemu/timer.h"
#include "sysbus.h"
#include "primecell.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"

#define LOCK_VALUE 0xa05f

Expand Down
2 changes: 1 addition & 1 deletion hw/axis_dev88.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "loader.h"
#include "elf.h"
#include "cris-boot.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

#define D(x)
Expand Down
2 changes: 1 addition & 1 deletion hw/block-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* later. See the COPYING file in the top-level directory.
*/

#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "hw/block-common.h"
#include "qemu/error-report.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/boards.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#ifndef HW_BOARDS_H
#define HW_BOARDS_H

#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "qdev.h"

typedef struct QEMUMachineInitArgs {
Expand Down
2 changes: 1 addition & 1 deletion hw/bonito.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "pc.h"
#include "mips.h"
#include "pci/pci_host.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"

//#define DEBUG_BONITO
Expand Down
2 changes: 1 addition & 1 deletion hw/cbus.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "qemu-common.h"
#include "irq.h"
#include "devices.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"

//#define DEBUG

Expand Down
2 changes: 1 addition & 1 deletion hw/collie.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "strongarm.h"
#include "arm-misc.h"
#include "flash.h"
#include "blockdev.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"

static struct arm_boot_info collie_binfo = {
Expand Down
2 changes: 1 addition & 1 deletion hw/cuda.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "ppc_mac.h"
#include "adb.h"
#include "qemu/timer.h"
#include "sysemu.h"
#include "sysemu/sysemu.h"

/* XXX: implement all timer modes */

Expand Down
Loading

0 comments on commit 9c17d61

Please sign in to comment.