Skip to content

Commit 83c9089

Browse files
committed
monitor: move include files to include/monitor/
Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 022c62c commit 83c9089

Some content is hidden

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

84 files changed

+87
-87
lines changed

arch_init.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <sys/mman.h>
3030
#endif
3131
#include "config.h"
32-
#include "monitor.h"
32+
#include "monitor/monitor.h"
3333
#include "sysemu.h"
3434
#include "bitops.h"
3535
#include "bitmap.h"

audio/audio.c

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

audio/wavcapture.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "hw/hw.h"
2-
#include "monitor.h"
2+
#include "monitor/monitor.h"
33
#include "audio.h"
44

55
typedef struct {

balloon.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#include "monitor.h"
27+
#include "monitor/monitor.h"
2828
#include "exec/cpu-common.h"
2929
#include "kvm.h"
3030
#include "balloon.h"

balloon.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef _QEMU_BALLOON_H
1515
#define _QEMU_BALLOON_H
1616

17-
#include "monitor.h"
17+
#include "monitor/monitor.h"
1818
#include "qapi-types.h"
1919

2020
typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target);

block.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "config-host.h"
2525
#include "qemu-common.h"
2626
#include "trace.h"
27-
#include "monitor.h"
27+
#include "monitor/monitor.h"
2828
#include "block/block_int.h"
2929
#include "block/blockjob.h"
3030
#include "module.h"

blockdev-nbd.c

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

1212
#include "blockdev.h"
1313
#include "hw/block-common.h"
14-
#include "monitor.h"
14+
#include "monitor/monitor.h"
1515
#include "qapi/qmp/qerror.h"
1616
#include "sysemu.h"
1717
#include "qmp-commands.h"

blockdev.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "blockdev.h"
1111
#include "hw/block-common.h"
1212
#include "block/blockjob.h"
13-
#include "monitor.h"
13+
#include "monitor/monitor.h"
1414
#include "qapi/qmp/qerror.h"
1515
#include "qemu-option.h"
1616
#include "qemu-config.h"

blockjob.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "config-host.h"
2727
#include "qemu-common.h"
2828
#include "trace.h"
29-
#include "monitor.h"
29+
#include "monitor/monitor.h"
3030
#include "block/block.h"
3131
#include "block/blockjob.h"
3232
#include "block/block_int.h"

cpus.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/* Needed early for CONFIG_BSD etc. */
2626
#include "config-host.h"
2727

28-
#include "monitor.h"
28+
#include "monitor/monitor.h"
2929
#include "sysemu.h"
3030
#include "exec/gdbstub.h"
3131
#include "dma.h"

disas.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ const char *lookup_symbol(target_ulong orig_addr)
374374

375375
#if !defined(CONFIG_USER_ONLY)
376376

377-
#include "monitor.h"
377+
#include "monitor/monitor.h"
378378

379379
static int monitor_disas_is_physical;
380380

dump.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "cpu.h"
1717
#include "exec/cpu-all.h"
1818
#include "exec/hwaddr.h"
19-
#include "monitor.h"
19+
#include "monitor/monitor.h"
2020
#include "kvm.h"
2121
#include "dump.h"
2222
#include "sysemu.h"

gdbstub.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "qemu.h"
3131
#else
32-
#include "monitor.h"
32+
#include "monitor/monitor.h"
3333
#include "qemu-char.h"
3434
#include "sysemu.h"
3535
#include "exec/gdbstub.h"

hmp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "qemu-timer.h"
2121
#include "qmp-commands.h"
2222
#include "qemu_socket.h"
23-
#include "monitor.h"
23+
#include "monitor/monitor.h"
2424
#include "ui/console.h"
2525

2626
static void hmp_handle_error(Monitor *mon, Error **errp)

hw/acpi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "hw.h"
2323
#include "pc.h"
2424
#include "acpi.h"
25-
#include "monitor.h"
25+
#include "monitor/monitor.h"
2626

2727
struct acpi_table_header {
2828
uint16_t _length; /* our length, not actual part of the hdr */

hw/ccid-card-emulated.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#include "qemu-thread.h"
3535
#include "qemu-char.h"
36-
#include "monitor.h"
36+
#include "monitor/monitor.h"
3737
#include "hw/ccid.h"
3838

3939
#define DPRINTF(card, lvl, fmt, ...) \

hw/ccid-card-passthru.c

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

1111
#include "qemu-char.h"
1212
#include "qemu_socket.h"
13-
#include "monitor.h"
13+
#include "monitor/monitor.h"
1414
#include "hw/ccid.h"
1515
#include "libcacard/vscard_common.h"
1616

hw/device-hotplug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "blockdev.h"
2828
#include "qemu-config.h"
2929
#include "sysemu.h"
30-
#include "monitor.h"
30+
#include "monitor/monitor.h"
3131

3232
DriveInfo *add_init_drive(const char *optstr)
3333
{

hw/i8259.c

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

hw/ide/ahci.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <hw/pci/pci.h>
2828
#include <hw/sysbus.h>
2929

30-
#include "monitor.h"
30+
#include "monitor/monitor.h"
3131
#include "dma.h"
3232
#include "exec/cpu-common.h"
3333
#include "internal.h"

hw/isa-bus.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
1818
*/
1919
#include "hw.h"
20-
#include "monitor.h"
20+
#include "monitor/monitor.h"
2121
#include "sysbus.h"
2222
#include "sysemu.h"
2323
#include "isa.h"

hw/kvm/pci-assign.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "qemu-error.h"
3232
#include "ui/console.h"
3333
#include "hw/loader.h"
34-
#include "monitor.h"
34+
#include "monitor/monitor.h"
3535
#include "range.h"
3636
#include "sysemu.h"
3737
#include "hw/pci/pci.h"

hw/lm32_pic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "hw.h"
2323
#include "pc.h"
24-
#include "monitor.h"
24+
#include "monitor/monitor.h"
2525
#include "sysbus.h"
2626
#include "trace.h"
2727
#include "lm32_pic.h"

hw/loader.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
#include "hw.h"
4646
#include "disas/disas.h"
47-
#include "monitor.h"
47+
#include "monitor/monitor.h"
4848
#include "sysemu.h"
4949
#include "uboot_image.h"
5050
#include "loader.h"

hw/pc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "fdc.h"
2929
#include "ide.h"
3030
#include "pci/pci.h"
31-
#include "monitor.h"
31+
#include "monitor/monitor.h"
3232
#include "fw_cfg.h"
3333
#include "hpet_emul.h"
3434
#include "smbios.h"

hw/pci/pci-hotplug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "hw/pci/pci.h"
2828
#include "net/net.h"
2929
#include "hw/pc.h"
30-
#include "monitor.h"
30+
#include "monitor/monitor.h"
3131
#include "hw/scsi.h"
3232
#include "hw/virtio-blk.h"
3333
#include "qemu-config.h"

hw/pci/pci-stub.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020

2121
#include "sysemu.h"
22-
#include "monitor.h"
22+
#include "monitor/monitor.h"
2323
#include "hw/pci/pci.h"
2424
#include "qmp-commands.h"
2525

hw/pci/pci.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "hw/pci/pci.h"
2626
#include "hw/pci/pci_bridge.h"
2727
#include "hw/pci/pci_bus.h"
28-
#include "monitor.h"
28+
#include "monitor/monitor.h"
2929
#include "net/net.h"
3030
#include "sysemu.h"
3131
#include "hw/loader.h"

hw/pci/pcie_aer.c

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

2121
#include "sysemu.h"
2222
#include "qapi/qmp/types.h"
23-
#include "monitor.h"
23+
#include "monitor/monitor.h"
2424
#include "hw/pci/pci_bridge.h"
2525
#include "hw/pci/pcie.h"
2626
#include "hw/pci/msix.h"

hw/qdev-monitor.c

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

2020
#include "qdev.h"
21-
#include "monitor.h"
21+
#include "monitor/monitor.h"
2222
#include "qmp-commands.h"
2323
#include "arch_init.h"
2424
#include "qemu-config.h"

hw/qdev-monitor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define QEMU_QDEV_MONITOR_H
33

44
#include "qdev-core.h"
5-
#include "monitor.h"
5+
#include "monitor/monitor.h"
66

77
/*** monitor commands ***/
88

hw/qxl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "qemu-common.h"
2424
#include "qemu-timer.h"
2525
#include "qemu-queue.h"
26-
#include "monitor.h"
26+
#include "monitor/monitor.h"
2727
#include "sysemu.h"
2828
#include "trace.h"
2929

hw/s390-virtio-bus.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "block/block.h"
2222
#include "sysemu.h"
2323
#include "boards.h"
24-
#include "monitor.h"
24+
#include "monitor/monitor.h"
2525
#include "loader.h"
2626
#include "elf.h"
2727
#include "hw/virtio.h"

hw/s390-virtio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "sysemu.h"
2424
#include "net/net.h"
2525
#include "boards.h"
26-
#include "monitor.h"
26+
#include "monitor/monitor.h"
2727
#include "loader.h"
2828
#include "elf.h"
2929
#include "hw/virtio.h"

hw/s390x/event-facility.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
#include "monitor.h"
18+
#include "monitor/monitor.h"
1919
#include "sysemu.h"
2020

2121
#include "sclp.h"

hw/slavio_intctl.c

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

2525
#include "sun4m.h"
26-
#include "monitor.h"
26+
#include "monitor/monitor.h"
2727
#include "sysbus.h"
2828
#include "trace.h"
2929

hw/spapr_vio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "hw.h"
2323
#include "sysemu.h"
2424
#include "boards.h"
25-
#include "monitor.h"
25+
#include "monitor/monitor.h"
2626
#include "loader.h"
2727
#include "elf.h"
2828
#include "hw/sysbus.h"

hw/sun4c_intctl.c

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

2525
#include "hw.h"
2626
#include "sun4m.h"
27-
#include "monitor.h"
27+
#include "monitor/monitor.h"
2828
#include "sysbus.h"
2929

3030
//#define DEBUG_IRQ_COUNT

hw/sysbus.c

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

2020
#include "sysbus.h"
21-
#include "monitor.h"
21+
#include "monitor/monitor.h"
2222
#include "exec/address-spaces.h"
2323

2424
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);

hw/usb/bus.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "hw/usb.h"
33
#include "hw/qdev.h"
44
#include "sysemu.h"
5-
#include "monitor.h"
5+
#include "monitor/monitor.h"
66
#include "trace.h"
77

88
static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent);

hw/usb/dev-smartcard-reader.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "qemu-error.h"
3939
#include "hw/usb.h"
4040
#include "hw/usb/desc.h"
41-
#include "monitor.h"
41+
#include "monitor/monitor.h"
4242

4343
#include "hw/ccid.h"
4444

hw/usb/dev-storage.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "hw/usb/desc.h"
1515
#include "hw/scsi.h"
1616
#include "ui/console.h"
17-
#include "monitor.h"
17+
#include "monitor/monitor.h"
1818
#include "sysemu.h"
1919
#include "blockdev.h"
2020

hw/usb/hcd-ehci.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "hw/hw.h"
2121
#include "qemu-timer.h"
2222
#include "hw/usb.h"
23-
#include "monitor.h"
23+
#include "monitor/monitor.h"
2424
#include "trace.h"
2525
#include "dma.h"
2626
#include "sysemu.h"

hw/usb/host-bsd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626

2727
#include "qemu-common.h"
28-
#include "monitor.h"
28+
#include "monitor/monitor.h"
2929
#include "hw/usb.h"
3030

3131
/* usb.h declares these */

0 commit comments

Comments
 (0)