Skip to content

Commit

Permalink
monitor: move include files to include/monitor/
Browse files Browse the repository at this point in the history 
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
@bonzini
bonzini committed Dec 19, 2012
1 parent 022c62c commit 83c9089
Show file tree
Hide file tree
Showing 84 changed files with 87 additions and 87 deletions.
2 changes: 1 addition & 1 deletion arch_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <sys/mman.h>
#endif
#include "config.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "bitops.h"
#include "bitmap.h"
Expand Down
2 changes: 1 addition & 1 deletion audio/audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
#include "hw/hw.h"
#include "audio.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "qemu-timer.h"
#include "sysemu.h"

Expand Down
2 changes: 1 addition & 1 deletion audio/wavcapture.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "hw/hw.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "audio.h"

typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion balloon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* THE SOFTWARE.
*/

#include "monitor.h"
#include "monitor/monitor.h"
#include "exec/cpu-common.h"
#include "kvm.h"
#include "balloon.h"
Expand Down
2 changes: 1 addition & 1 deletion balloon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef _QEMU_BALLOON_H
#define _QEMU_BALLOON_H

#include "monitor.h"
#include "monitor/monitor.h"
#include "qapi-types.h"

typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target);
Expand Down
2 changes: 1 addition & 1 deletion block.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "config-host.h"
#include "qemu-common.h"
#include "trace.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "block/block_int.h"
#include "block/blockjob.h"
#include "module.h"
Expand Down
2 changes: 1 addition & 1 deletion blockdev-nbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include "blockdev.h"
#include "hw/block-common.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
#include "sysemu.h"
#include "qmp-commands.h"
Expand Down
2 changes: 1 addition & 1 deletion blockdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "blockdev.h"
#include "hw/block-common.h"
#include "block/blockjob.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
#include "qemu-option.h"
#include "qemu-config.h"
Expand Down
2 changes: 1 addition & 1 deletion blockjob.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "config-host.h"
#include "qemu-common.h"
#include "trace.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "block/block.h"
#include "block/blockjob.h"
#include "block/block_int.h"
Expand Down
2 changes: 1 addition & 1 deletion cpus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/* Needed early for CONFIG_BSD etc. */
#include "config-host.h"

#include "monitor.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "exec/gdbstub.h"
#include "dma.h"
Expand Down
2 changes: 1 addition & 1 deletion disas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ const char *lookup_symbol(target_ulong orig_addr)

#if !defined(CONFIG_USER_ONLY)

#include "monitor.h"
#include "monitor/monitor.h"

static int monitor_disas_is_physical;

Expand Down
2 changes: 1 addition & 1 deletion dump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "cpu.h"
#include "exec/cpu-all.h"
#include "exec/hwaddr.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "kvm.h"
#include "dump.h"
#include "sysemu.h"
Expand Down
2 changes: 1 addition & 1 deletion gdbstub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include "qemu.h"
#else
#include "monitor.h"
#include "monitor/monitor.h"
#include "qemu-char.h"
#include "sysemu.h"
#include "exec/gdbstub.h"
Expand Down
2 changes: 1 addition & 1 deletion hmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "qemu-timer.h"
#include "qmp-commands.h"
#include "qemu_socket.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "ui/console.h"

static void hmp_handle_error(Monitor *mon, Error **errp)
Expand Down
2 changes: 1 addition & 1 deletion hw/acpi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "hw.h"
#include "pc.h"
#include "acpi.h"
#include "monitor.h"
#include "monitor/monitor.h"

struct acpi_table_header {
uint16_t _length; /* our length, not actual part of the hdr */
Expand Down
2 changes: 1 addition & 1 deletion hw/ccid-card-emulated.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

#include "qemu-thread.h"
#include "qemu-char.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "hw/ccid.h"

#define DPRINTF(card, lvl, fmt, ...) \
Expand Down
2 changes: 1 addition & 1 deletion hw/ccid-card-passthru.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "qemu-char.h"
#include "qemu_socket.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "hw/ccid.h"
#include "libcacard/vscard_common.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/device-hotplug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "blockdev.h"
#include "qemu-config.h"
#include "sysemu.h"
#include "monitor.h"
#include "monitor/monitor.h"

DriveInfo *add_init_drive(const char *optstr)
{
Expand Down
2 changes: 1 addition & 1 deletion hw/i8259.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "hw.h"
#include "pc.h"
#include "isa.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "qemu-timer.h"
#include "i8259_internal.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/ide/ahci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <hw/pci/pci.h>
#include <hw/sysbus.h>

#include "monitor.h"
#include "monitor/monitor.h"
#include "dma.h"
#include "exec/cpu-common.h"
#include "internal.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/isa-bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "sysbus.h"
#include "sysemu.h"
#include "isa.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/kvm/pci-assign.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "qemu-error.h"
#include "ui/console.h"
#include "hw/loader.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "range.h"
#include "sysemu.h"
#include "hw/pci/pci.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/lm32_pic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "hw.h"
#include "pc.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "sysbus.h"
#include "trace.h"
#include "lm32_pic.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/loader.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

#include "hw.h"
#include "disas/disas.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "uboot_image.h"
#include "loader.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/pc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "fdc.h"
#include "ide.h"
#include "pci/pci.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "fw_cfg.h"
#include "hpet_emul.h"
#include "smbios.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/pci/pci-hotplug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "hw/pci/pci.h"
#include "net/net.h"
#include "hw/pc.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "hw/scsi.h"
#include "hw/virtio-blk.h"
#include "qemu-config.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/pci/pci-stub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/

#include "sysemu.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "hw/pci/pci.h"
#include "qmp-commands.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/pci/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "net/net.h"
#include "sysemu.h"
#include "hw/loader.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/pci/pcie_aer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "sysemu.h"
#include "qapi/qmp/types.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pcie.h"
#include "hw/pci/msix.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/qdev-monitor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

#include "qdev.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "qmp-commands.h"
#include "arch_init.h"
#include "qemu-config.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/qdev-monitor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define QEMU_QDEV_MONITOR_H

#include "qdev-core.h"
#include "monitor.h"
#include "monitor/monitor.h"

/*** monitor commands ***/

Expand Down
2 changes: 1 addition & 1 deletion hw/qxl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "qemu-common.h"
#include "qemu-timer.h"
#include "qemu-queue.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "trace.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/s390-virtio-bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "block/block.h"
#include "sysemu.h"
#include "boards.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "loader.h"
#include "elf.h"
#include "hw/virtio.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/s390-virtio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "sysemu.h"
#include "net/net.h"
#include "boards.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "loader.h"
#include "elf.h"
#include "hw/virtio.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/s390x/event-facility.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

#include "monitor.h"
#include "monitor/monitor.h"
#include "sysemu.h"

#include "sclp.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/slavio_intctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

#include "sun4m.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "sysbus.h"
#include "trace.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/spapr_vio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "hw.h"
#include "sysemu.h"
#include "boards.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "loader.h"
#include "elf.h"
#include "hw/sysbus.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/sun4c_intctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "hw.h"
#include "sun4m.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "sysbus.h"

//#define DEBUG_IRQ_COUNT
Expand Down
2 changes: 1 addition & 1 deletion hw/sysbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

#include "sysbus.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "exec/address-spaces.h"

static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
Expand Down
2 changes: 1 addition & 1 deletion hw/usb/bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "hw/usb.h"
#include "hw/qdev.h"
#include "sysemu.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "trace.h"

static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent);
Expand Down
2 changes: 1 addition & 1 deletion hw/usb/dev-smartcard-reader.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "qemu-error.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
#include "monitor.h"
#include "monitor/monitor.h"

#include "hw/ccid.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/usb/dev-storage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "hw/usb/desc.h"
#include "hw/scsi.h"
#include "ui/console.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "blockdev.h"

Expand Down
2 changes: 1 addition & 1 deletion hw/usb/hcd-ehci.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "hw/hw.h"
#include "qemu-timer.h"
#include "hw/usb.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "trace.h"
#include "dma.h"
#include "sysemu.h"
Expand Down
2 changes: 1 addition & 1 deletion hw/usb/host-bsd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/

#include "qemu-common.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include "hw/usb.h"

/* usb.h declares these */
Expand Down
Loading

0 comments on commit 83c9089

Please sign in to comment.